From 852ff540b2bb3cbceb780b83b07e2762331de24c Mon Sep 17 00:00:00 2001 From: Tibeuleu <> Date: Wed, 24 Sep 2025 22:58:26 +0200 Subject: [PATCH] correct order for tresitter/lsp folding --- .config/nvim/after/plugin/treesitter.lua | 26 ++++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.config/nvim/after/plugin/treesitter.lua b/.config/nvim/after/plugin/treesitter.lua index 663d4e3..c70a7d5 100644 --- a/.config/nvim/after/plugin/treesitter.lua +++ b/.config/nvim/after/plugin/treesitter.lua @@ -25,19 +25,6 @@ require'nvim-treesitter.configs'.setup { } local vim = vim -vim.o.foldmethod = 'expr' --- Default to treesitter folding -vim.o.foldexpr = 'v:lua.vim.treesitter.foldexpr()' --- Prefer LSP folding if client supports it -vim.api.nvim_create_autocmd('LspAttach', { - callback = function(args) - local client = vim.lsp.get_client_by_id(args.data.client_id) - if client:supports_method('textDocument/foldingRange') then - local win = vim.api.nvim_get_current_win() - vim.wo[win][0].foldexpr = 'v:lua.vim.lsp.foldexpr()' - end - end, -}) local opt = vim.opt local api = vim.api local M = {} @@ -68,3 +55,16 @@ local autoCommands = { } M.nvim_create_augroups(autoCommands) +vim.o.foldmethod = 'expr' +-- Default to treesitter folding +vim.o.foldexpr = 'v:lua.vim.treesitter.foldexpr()' +-- Prefer LSP folding if client supports it +vim.api.nvim_create_autocmd('LspAttach', { + callback = function(args) + local client = vim.lsp.get_client_by_id(args.data.client_id) + if client:supports_method('textDocument/foldingRange') then + local win = vim.api.nvim_get_current_win() + vim.wo[win][0].foldexpr = 'v:lua.vim.lsp.foldexpr()' + end + end, +})