From 88bc0a7976a5ef8bf9000299ea9930f5e48557e9 Mon Sep 17 00:00:00 2001 From: Oscar Wallberg Date: Wed, 6 May 2026 15:42:04 +0200 Subject: [PATCH] fix(ts): preserve diff foldmethod in start_treesitter --- lua/ts.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lua/ts.lua b/lua/ts.lua index 9b4610a..7331c05 100644 --- a/lua/ts.lua +++ b/lua/ts.lua @@ -46,8 +46,10 @@ local function start_treesitter(buf) return end for _, win in ipairs(vim.fn.win_findbuf(buf)) do - vim.wo[win].foldmethod = "expr" - vim.wo[win].foldexpr = "v:lua.vim.treesitter.foldexpr()" + if not vim.wo[win].diff then + vim.wo[win].foldmethod = "expr" + vim.wo[win].foldexpr = "v:lua.vim.treesitter.foldexpr()" + end end end