From 841f839bb626177199b9e68177e77bc6c1cd472f Mon Sep 17 00:00:00 2001 From: siduck Date: Sun, 1 May 2022 18:24:40 +0530 Subject: [PATCH] Revert "fix: set LSP mappings only for buffers that have a configured language server (#1004)" This reverts commit a8466ccf4cd0f609e794140663fdcb4163407296. --- lua/core/mappings.lua | 42 +++++++++++++------------------ lua/plugins/configs/lspconfig.lua | 2 +- 2 files changed, 19 insertions(+), 25 deletions(-) diff --git a/lua/core/mappings.lua b/lua/core/mappings.lua index 99a3d26..6f5215d 100644 --- a/lua/core/mappings.lua +++ b/lua/core/mappings.lua @@ -112,79 +112,73 @@ M.comment = function() map("v", "/", " :lua require('Comment.api').toggle_linewise_op(vim.fn.visualmode())") end -M.lspconfig = function(bufnr) +M.lspconfig = function() -- See ` :help vim.lsp.*` for documentation on any of the below functions - - local buf_map = function(...) - local key, lhs, rhs = ... - map(key, lhs, rhs, { buffer = bufnr }) - end - - buf_map("n", "gD", function() + map("n", "gD", function() vim.lsp.buf.declaration() end) - buf_map("n", "gd", function() + map("n", "gd", function() vim.lsp.buf.definition() end) - buf_map("n", "K", function() + map("n", "K", function() vim.lsp.buf.hover() end) - buf_map("n", "gi", function() + map("n", "gi", function() vim.lsp.buf.implementation() end) - buf_map("n", "", function() + map("n", "", function() vim.lsp.buf.signature_help() end) - buf_map("n", "D", function() + map("n", "D", function() vim.lsp.buf.type_definition() end) - buf_map("n", "ra", function() + map("n", "ra", function() vim.lsp.buf.rename() end) - buf_map("n", "ca", function() + map("n", "ca", function() vim.lsp.buf.code_action() end) - buf_map("n", "gr", function() + map("n", "gr", function() vim.lsp.buf.references() end) - buf_map("n", "f", function() + map("n", "f", function() vim.diagnostic.open_float() end) - buf_map("n", "[d", function() + map("n", "[d", function() vim.diagnostic.goto_prev() end) - buf_map("n", "d]", function() + map("n", "d]", function() vim.diagnostic.goto_next() end) - buf_map("n", "q", function() + map("n", "q", function() vim.diagnostic.setloclist() end) - buf_map("n", "fm", function() + map("n", "fm", function() vim.lsp.buf.formatting() end) - buf_map("n", "wa", function() + map("n", "wa", function() vim.lsp.buf.add_workspace_folder() end) - buf_map("n", "wr", function() + map("n", "wr", function() vim.lsp.buf.remove_workspace_folder() end) - buf_map("n", "wl", function() + map("n", "wl", function() print(vim.inspect(vim.lsp.buf.list_workspace_folders())) end) end diff --git a/lua/plugins/configs/lspconfig.lua b/lua/plugins/configs/lspconfig.lua index ce4553a..4c375ed 100644 --- a/lua/plugins/configs/lspconfig.lua +++ b/lua/plugins/configs/lspconfig.lua @@ -10,7 +10,7 @@ function M.on_attach(client, bufnr) client.resolved_capabilities.document_formatting = false client.resolved_capabilities.document_range_formatting = false - require("core.mappings").lspconfig(bufnr) + require("core.mappings").lspconfig() end local capabilities = vim.lsp.protocol.make_client_capabilities()