diff options
| author | Mathias Fußenegger <mfussenegger@users.noreply.github.com> | 2021-08-19 18:15:18 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2021-09-26 11:28:28 -0700 |
| commit | 7b0ae589f0a703359db4e52733e3998987de4123 (patch) | |
| tree | 1191959dbad8632daec4a3c106aa1359c76c8017 | |
| parent | 8ec5bc91262a73192cc63fe1ab25719cba139caa (diff) | |
| download | rneovim-7b0ae589f0a703359db4e52733e3998987de4123.tar.gz rneovim-7b0ae589f0a703359db4e52733e3998987de4123.tar.bz2 rneovim-7b0ae589f0a703359db4e52733e3998987de4123.zip | |
feat(lsp): allow root_dir to be nil (#15430)
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.
| -rw-r--r-- | runtime/lua/vim/lsp.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua index c9d7f6b59d..3783902941 100644 --- a/runtime/lua/vim/lsp.lua +++ b/runtime/lua/vim/lsp.lua @@ -218,7 +218,7 @@ local function validate_client_config(config) config = { config, 't' }; } validate { - root_dir = { config.root_dir, is_dir, "directory" }; + root_dir = { config.root_dir, optional_validator(is_dir), "directory" }; handlers = { config.handlers, "t", true }; capabilities = { config.capabilities, "t", true }; cmd_cwd = { config.cmd_cwd, optional_validator(is_dir), "directory" }; @@ -555,7 +555,7 @@ end --- --- 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. --- --@param cmd: (required, string or list treated like |jobstart()|) Base command @@ -780,7 +780,7 @@ function lsp.start_client(config) } local version = vim.version() - if not config.workspace_folders then + if config.root_dir and not config.workspace_folders then config.workspace_folders = {{ uri = vim.uri_from_fname(config.root_dir); name = string.format("%s", config.root_dir); @@ -805,7 +805,7 @@ function lsp.start_client(config) rootPath = config.root_dir; -- The rootUri of the workspace. Is null if no folder is open. If both -- `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. initializationOptions = config.init_options; -- The capabilities provided by the client (editor or tool) |