init.lua @ 7248ca2a213d8723efa43e45e9d1cbb5fedd8e9c

M lua/configs/lsp/attach.lua

@@ -1,26 +1,35 @@
-return function(client, bufnr)
-  vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc")
-  client.server_capabilities.documentFormattingProvider = false
+local function map(from, to)
+  vim.keymap.set("n", from, to, {
+    buffer = true,
+    noremap = true,
+    silent = true,
+  })
+end
 
-  local function buf_map(from, to)
-    vim.api.nvim_buf_set_keymap(bufnr, "n", from, to, {
-      noremap = true,
-      silent = true,
-    })
-  end
+return {
+  common = function(client, bufnr)
+    vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc")
+    client.server_capabilities.documentFormattingProvider = false
 
-  buf_map("K", "<cmd>lua vim.lsp.buf.hover()<cr>")
-  buf_map("gd", "<cmd>Telescope lsp_definitions<cr>")
-  buf_map("gD", "<cmd>lua vim.lsp.buf.declaration()<cr>")
-  buf_map("gr", "<cmd>Telescope lsp_references<cr>")
-  buf_map("gi", "<cmd>Telescope lsp_implementations<cr>")
-  buf_map("gs", "<cmd>lua vim.lsp.buf.signature_help()<cr>")
-  buf_map("gl", "<cmd>lua vim.diagnostic.open_float()<cr>")
-  buf_map("<leader>li", "<cmd>LspInfo<cr>")
-  buf_map("<leader>la", "<cmd>lua vim.lsp.buf.code_action()<cr>")
-  buf_map("<leader>lr", "<cmd>lua vim.lsp.buf.rename()<cr>")
-  buf_map("<leader>lf", "<cmd>lua vim.lsp.buf.format {async = true}<cr>")
-  buf_map("<leader>ls", "<cmd>Telescope lsp_document_symbols<cr>")
-  buf_map("<leader>lj", "<cmd>lua vim.diagnostic.goto_next()<cr>")
-  buf_map("<leader>lk", "<cmd>lua vim.diagnostic.goto_prev()<cr>")
-end
+    map("K", "<cmd>lua vim.lsp.buf.hover()<cr>")
+    map("gd", "<cmd>Telescope lsp_definitions<cr>")
+    map("gD", "<cmd>lua vim.lsp.buf.declaration()<cr>")
+    map("gr", "<cmd>Telescope lsp_references<cr>")
+    map("gi", "<cmd>Telescope lsp_implementations<cr>")
+    map("gs", "<cmd>lua vim.lsp.buf.signature_help()<cr>")
+    map("gl", "<cmd>lua vim.diagnostic.open_float()<cr>")
+    map("<leader>li", "<cmd>LspInfo<cr>")
+    map("<leader>la", "<cmd>lua vim.lsp.buf.code_action()<cr>")
+    map("<leader>lr", "<cmd>lua vim.lsp.buf.rename()<cr>")
+    map("<leader>lf", "<cmd>lua vim.lsp.buf.format {async = true}<cr>")
+    map("<leader>ls", "<cmd>Telescope lsp_document_symbols<cr>")
+    map("<leader>lj", "<cmd>lua vim.diagnostic.goto_next()<cr>")
+    map("<leader>lk", "<cmd>lua vim.diagnostic.goto_prev()<cr>")
+  end,
+  null_ls = function(_, _)
+    map("<leader>li", "<cmd>LspInfo<cr>")
+    map("<leader>lf", "<cmd>lua vim.lsp.buf.format {async = true}<cr>")
+    map("<leader>lj", "<cmd>lua vim.diagnostic.goto_next()<cr>")
+    map("<leader>lk", "<cmd>lua vim.diagnostic.goto_prev()<cr>")
+  end,
+}

M lua/configs/lsp/init.lua

@@ -6,7 +6,7 @@ }
 
 local lspconfig = require "lspconfig"
 local options = {
-  on_attach = require "configs.lsp.attach",
+  on_attach = require "configs.lsp.attach".common,
   flags = { debounce_text_changes = 150 },
   capabilities = require("cmp_nvim_lsp").update_capabilities(
     vim.lsp.protocol.make_client_capabilities()

M lua/configs/lsp/null-ls.lua

@@ -4,6 +4,7 @@ local formatting = null_ls.builtins.formatting
 local diagnostic = null_ls.builtins.diagnostics
 
 null_ls.setup {
+  on_attach = require("configs.lsp.attach").null_ls,
   sources = {
     formatting.stylua,
     diagnostic.selene,