kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-29 14:41:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

feat(lsp): allow root_dir to be nil (#15430)

Browse Source 
According to the protocol definition `rootPath`, `rootUri` and
`workspaceFolders` are allowed to be null.

Some language servers utilize this to provide "single file" support.
If all three are null, they don't attempt to index a directory but
instead only provide capabilities for a single file.
This commit is contained in:
Mathias Fußenegger 2021-08-19 18:15:18 +02:00 committed by GitHub
parent ea39ff5732
commit ff0833cb4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,7 +218,7 @@ local function validate_client_config(config)
config = { config, 't' }; config = { config, 't' };
} }
validate { validate {
root_dir = { config.root_dir, is_dir, "directory" }; root_dir = { config.root_dir, optional_validator(is_dir), "directory" };
handlers = { config.handlers, "t", true }; handlers = { config.handlers, "t", true };
capabilities = { config.capabilities, "t", true }; capabilities = { config.capabilities, "t", true };
cmd_cwd = { config.cmd_cwd, optional_validator(is_dir), "directory" }; cmd_cwd = { config.cmd_cwd, optional_validator(is_dir), "directory" };
@ -548,7 +548,7 @@ end
--- ---
--- The following parameters describe fields in the {config} table. --- The following parameters describe fields in the {config} table.
--- ---
--@param root_dir: (required, string) Directory where the LSP server will base --@param root_dir: (string) Directory where the LSP server will base
--- its rootUri on initialization. --- its rootUri on initialization.
--- ---
--@param cmd: (required, string or list treated like |jobstart()|) Base command --@param cmd: (required, string or list treated like |jobstart()|) Base command
@ -773,7 +773,7 @@ function lsp.start_client(config)
} }
local version = vim.version() local version = vim.version()
if not config.workspace_folders then if config.root_dir and not config.workspace_folders then
config.workspace_folders = {{ config.workspace_folders = {{
uri = vim.uri_from_fname(config.root_dir); uri = vim.uri_from_fname(config.root_dir);
name = string.format("%s", config.root_dir); name = string.format("%s", config.root_dir);
@ -798,7 +798,7 @@ function lsp.start_client(config)
rootPath = config.root_dir; rootPath = config.root_dir;
-- The rootUri of the workspace. Is null if no folder is open. If both -- The rootUri of the workspace. Is null if no folder is open. If both
-- `rootPath` and `rootUri` are set `rootUri` wins. -- `rootPath` and `rootUri` are set `rootUri` wins.
rootUri = vim.uri_from_fname(config.root_dir); rootUri = config.root_dir and vim.uri_from_fname(config.root_dir);
-- User provided initialization options. -- User provided initialization options.
initializationOptions = config.init_options; initializationOptions = config.init_options;
-- The capabilities provided by the client (editor or tool) -- The capabilities provided by the client (editor or tool)