mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-08-29 18:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(lsp): only resolve LSP configs once (#38007)

Browse Source 
`lsp.config[]` resolves an LSP config the first time it is called, and
returns the cached result on subsequent calls.

The change in #37571 added an extra call to `lsp.config[]` which will
resolve the config *before* the server is added to `_enabled_configs`,
meaning the result is discarded. That means configs will be needlessly
resolved again once `lsp_enable_callback` fires for the first time. That
includes an additional `loadfile()` call which is relatively expensive
and can have unexpected side effects.

Avoid this by storing the result of the initial call to `lsp.config[]`
in `_enabled_configs` so the config is not resolved a second time once
`lsp_enable_callback` is called for the first time.
This commit is contained in:
Andrew Braxton
2026-02-23 14:15:53 -05:00
committed by GitHub
parent 4d754d2704
commit eb90f5d9e3
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/lua/vim/lsp.lua
View File

@@ -532,6 +532,7 @@ function lsp.enable(name, enable)
validate('name', name, { 'string', 'table' }) validate('name', name, { 'string', 'table' })
local names = vim._ensure_list(name) --[[@as string[] ]] local names = vim._ensure_list(name) --[[@as string[] ]]
local configs = {} --- @type table<string,{resolved_config:vim.lsp.Config?}>
-- Check for errors, and abort with no side-effects if there is one. -- Check for errors, and abort with no side-effects if there is one.
for _, nm in ipairs(names) do for _, nm in ipairs(names) do
@@ -542,13 +543,13 @@ function lsp.enable(name, enable)
-- Raise error if `lsp.config[nm]` raises an error, instead of waiting for -- Raise error if `lsp.config[nm]` raises an error, instead of waiting for
-- the error to be triggered by `lsp_enable_callback()`. -- the error to be triggered by `lsp_enable_callback()`.
if enable ~= false then if enable ~= false then
_ = lsp.config[nm] configs[nm] = { resolved_config = lsp.config[nm] }
end end
end end
-- Now that there can be no errors, enable/disable all names. -- Now that there can be no errors, enable/disable all names.
for _, nm in ipairs(names) do for _, nm in ipairs(names) do
lsp._enabled_configs[nm] = enable ~= false and {} or nil lsp._enabled_configs[nm] = enable ~= false and configs[nm] or nil
end end
if not next(lsp._enabled_configs) then if not next(lsp._enabled_configs) then