From aac44de14abf2d56dbae3af06fc2257db484f17e Mon Sep 17 00:00:00 2001 From: JafarAbdi Date: Tue, 18 Jun 2024 22:36:56 +0100 Subject: [PATCH] Update neovim configs --- neovim/.config/nvim/init.lua | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/neovim/.config/nvim/init.lua b/neovim/.config/nvim/init.lua index 67d1fdbf..9ea9ebfe 100644 --- a/neovim/.config/nvim/init.lua +++ b/neovim/.config/nvim/init.lua @@ -389,9 +389,12 @@ vim.api.nvim_create_autocmd("LspDetach", { vim.api.nvim_create_autocmd("LspAttach", { callback = function(args) vim.lsp.completion.enable(true, args.data.client_id, args.buf, { autotrigger = true }) - vim.keymap.set("i", "", function() + vim.keymap.set("i", "", function() vim.lsp.completion.trigger() end, { buffer = args.buf }) + vim.keymap.set("i", "", function() + return tonumber(vim.fn.pumvisible()) ~= 0 and "" or "" + end, { expr = true, buffer = args.buf }) vim.keymap.set({ "n", "i" }, "", function() if tonumber(vim.fn.pumvisible()) == 1 then vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes("", true, false, true), "n", true) @@ -427,7 +430,7 @@ vim.api.nvim_create_autocmd("LspAttach", { vim.lsp.buf.format({ async = true }) end, { buffer = args.buf, silent = true }) vim.keymap.set({ "i", "n" }, "", function() - return vim.lsp.inlay_hint.enable(0, not vim.lsp.inlay_hint.is_enabled()) + return vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled()) end, { buffer = args.buf, silent = true }) end, group = lsp_group, @@ -821,6 +824,10 @@ for _, server in pairs(servers) do pattern = server.filetypes, group = lsp_group, callback = function(args) + -- Don't start LSP for floating windows + if vim.api.nvim_win_get_config(0).relative ~= "" then + return + end local root_dir = root_dirs[args.match] or function(startpath) return vim.fs.root(startpath, { ".git" }) @@ -832,7 +839,7 @@ for _, server in pairs(servers) do capabilities = capabilities, settings = server.settings or vim.empty_dict(), init_options = server.init_options and server.init_options(args.file) or vim.empty_dict(), - root_dir = vim.fs.joinpath(vim.uv.cwd(), root_dir(args.file)), + root_dir = root_dir(args.file), }) end, })