mroot/lazyvim
1
0
Fork 0
mirror of https://github.com/LazyVim/LazyVim.git synced 2026-07-24 21:41:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: preserve diff foldmethod in LSP and treesitter fold configs

Browse source 
Co-authored-by: folke <292349+folke@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2025-09-18 17:26:26 +00:00
parent 2d55258979
commit 7b76e24923
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lua/lazyvim/plugins/lsp/init.lua
View file

@ -147,8 +147,11 @@ return {
if opts.folds.enabled then if opts.folds.enabled then
LazyVim.lsp.on_supports_method("textDocument/foldingRange", function(client, buffer) LazyVim.lsp.on_supports_method("textDocument/foldingRange", function(client, buffer)
local win = vim.api.nvim_get_current_win() local win = vim.api.nvim_get_current_win()
vim.wo[win][0].foldexpr = "v:lua.vim.lsp.foldexpr()" -- Don't overwrite diff foldmethod as plugins like octo.nvim rely on it
vim.wo[win][0].foldmethod = "expr" if vim.wo[win][0].foldmethod ~= "diff" then
vim.wo[win][0].foldexpr = "v:lua.vim.lsp.foldexpr()"
vim.wo[win][0].foldmethod = "expr"
end
end) end)
end end

7
lua/lazyvim/plugins/treesitter.lua
View file

@ -100,8 +100,11 @@ return {
-- folds -- folds
if vim.tbl_get(opts, "folds", "enable") ~= false then if vim.tbl_get(opts, "folds", "enable") ~= false then
vim.wo.foldmethod = "expr" -- Don't overwrite diff foldmethod as plugins like octo.nvim rely on it
vim.wo.foldexpr = "v:lua.LazyVim.treesitter.foldexpr()" if vim.wo.foldmethod ~= "diff" then
vim.wo.foldmethod = "expr"
vim.wo.foldexpr = "v:lua.LazyVim.treesitter.foldexpr()"
end
end end
end, end,
}) })