From 6b98bc137894492ecbe5dfa03bc149e8760a6453 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Mon, 9 Aug 2021 07:58:22 +0200 Subject: avoid using smart_cwd if root_dir is not found --- lua/lsp/init.lua | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'lua/lsp/init.lua') diff --git a/lua/lsp/init.lua b/lua/lsp/init.lua index 29676214..020c4313 100644 --- a/lua/lsp/init.lua +++ b/lua/lsp/init.lua @@ -51,6 +51,14 @@ local function add_lsp_buffer_keybindings(bufnr) wk.register(keys, { mode = "n", buffer = bufnr }) end +local function set_smart_cwd(client) + local proj_dir = client.config.root_dir + if lvim.lsp.smart_cwd and proj_dir ~= "/" then + vim.api.nvim_set_current_dir(proj_dir) + require("core.nvimtree").change_tree_dir(proj_dir) + end +end + function M.common_capabilities() local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities.textDocument.completion.completionItem.snippetSupport = true @@ -113,10 +121,7 @@ function M.common_on_attach(client, bufnr) end lsp_highlight_document(client) add_lsp_buffer_keybindings(bufnr) - if lvim.lsp.smart_cwd then - vim.api.nvim_set_current_dir(client.config.root_dir) - require("core.nvimtree").change_tree_dir(client.config.root_dir) - end + set_smart_cwd(client) require("lsp.null-ls").setup(vim.bo.filetype) end -- cgit v1.2.3