neovim

commit 6162269fa3107b23fd18c6c6d0e3e8fb73cfb45e
parent accdb0104eb607a66a9908f24fbd13552d058765
Author: August Masquelier <31262046+levouh@users.noreply.github.com>
Date:   Fri, 17 Mar 2023 05:26:13 -0600

fix(lsp): avoid switching buffers on lsp attach (#22689)


Diffstat:
M
runtime/lua/vim/lsp.lua
 | 
16
++++++++--------

1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
@@ -1101,21 +1101,21 @@ function lsp.start_client(config)
       return true
     end
 
-    local old_bufnr = vim.fn.bufnr('')
     local last_set_from = vim.fn.gettext('\n\tLast set from ')
     local line = vim.fn.gettext(' line ')
+    local scriptname
 
-    vim.cmd.buffer(bufnr)
-    local scriptname = vim.fn
-      .execute('verbose set ' .. option .. '?')
-      :match(last_set_from .. '(.*)' .. line .. '%d+')
-    vim.cmd.buffer(old_bufnr)
+    vim.api.nvim_buf_call(bufnr, function()
+      scriptname = vim.fn
+        .execute('verbose set ' .. option .. '?')
+        :match(last_set_from .. '(.*)' .. line .. '%d+')
+    end)
 
     if not scriptname then
       return false
     end
-    local vimruntime = vim.fn.getenv('VIMRUNTIME')
-    return vim.startswith(vim.fn.expand(scriptname), vim.fn.expand(vimruntime))
+
+    return vim.startswith(vim.fn.expand(scriptname), vim.fn.expand('$VIMRUNTIME'))
   end
 
   ---@private