fix: keep window position stable when LSP formatting

2 files changed, 22 insertions, 4 deletions

diff --git a/lua/conform/init.lua b/lua/conform/init.lua
index dcc8143..21c1d1f 100644
--- a/lua/conform/init.lua
+++ b/lua/conform/init.lua
@@ -74,6 +74,17 @@ M.setup = function(opts)
       end,
     })
   end
+
+  ---@diagnostic disable-next-line: duplicate-set-field
+  vim.lsp.handlers["textDocument/formatting"] = function(_, result, ctx, _)
+    if not result then
+      return
+    end
+    local client = vim.lsp.get_client_by_id(ctx.client_id)
+    local restore = require("conform.util").save_win_positions(ctx.bufnr)
+    vim.lsp.util.apply_text_edits(result, ctx.bufnr, client.offset_encoding)
+    restore()
+  end
 end
 
 ---Format a buffer
@@ -130,7 +141,9 @@ M.format = function(opts)
       if supports_lsp_formatting then
         local restore = require("conform.util").save_win_positions(opts.bufnr)
         vim.lsp.buf.format(opts)
-        restore()
+        if not opts.async then
+          restore()
+        end
       end
     else
       vim.notify("No formatters found for buffer. See :checkhealth conform", vim.log.levels.WARN)
diff --git a/lua/conform/util.lua b/lua/conform/util.lua
index 8cbc013..353c447 100644
--- a/lua/conform/util.lua
+++ b/lua/conform/util.lua
@@ -46,9 +46,14 @@ M.save_win_positions = function(bufnr)
 
   return function()
     for winid, view in pairs(win_positions) do
-      vim.api.nvim_win_call(winid, function()
-        pcall(vim.fn.winrestview, view)
-      end)
+      if
+        vim.api.nvim_win_is_valid(winid)
+        and vim.deep_equal(vim.api.nvim_win_get_cursor(winid), { 1, 0 })
+      then
+        vim.api.nvim_win_call(winid, function()
+          pcall(vim.fn.winrestview, view)
+        end)
+      end
     end
   end
 end