Refactor lsp module

4 files changed, 132 insertions, 78 deletions

diff --git a/after/plugin/lsp-installer.lua b/after/plugin/lsp-installer.lua
new file mode 100644
index 0000000..1b3b06d
--- /dev/null
+++ b/after/plugin/lsp-installer.lua
@@ -0,0 +1,14 @@
+local ok, lsp_installer = pcall(require, "nvim-lsp-installer")
+if not ok then
+  return
+end
+lsp_installer.setup({
+    automatic_installation = true, -- automatically detect which servers to install (based on which servers are set up via lspconfig)
+    ui = {
+        icons = {
+            server_installed = "✓",
+            server_pending = "➜",
+            server_uninstalled = "✗"
+        }
+    }
+})
diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua
new file mode 100644
index 0000000..07861a4
--- /dev/null
+++ b/after/plugin/lsp.lua
@@ -0,0 +1,118 @@
+local telescope_mapper = require("alpha.telescope.mappings")
+
+local filetype_attach = setmetatable({
+    go = function(_)
+        vim.cmd([[
+      augroup lsp_buf_format
+        au! BufWritePre <buffer>
+        autocmd BufWritePre <buffer> :lua vim.lsp.buf.formatting_sync()
+      augroup END
+    ]]   )
+    end,
+
+    gdscript = function(_) end,
+}, {
+    __index = function()
+        return function() end
+    end,
+})
+
+local function on_attach(client)
+    local filetype = vim.api.nvim_buf_get_option(0, "filetype")
+    -- keymaps for lsp
+    vim.keymap.set("n", "K", vim.lsp.buf.hover, { buffer = 0 })
+    vim.keymap.set("n", "<c-]>", vim.lsp.buf.definition, { buffer = 0 })
+    vim.keymap.set("n", "<leader>vrn", vim.lsp.buf.rename, { buffer = 0 })
+    vim.keymap.set("n", "<leader>vf", function()
+        return vim.lsp.buf.format({ async = true })
+    end, { buffer = 0 })
+    vim.keymap.set("n", "<leader>vn", vim.diagnostic.goto_next, { buffer = 0 })
+    vim.keymap.set("n", "<leader>vp", vim.diagnostic.goto_prev, { buffer = 0 })
+    vim.keymap.set("n", "<leader>vca", vim.lsp.buf.code_action, { buffer = 0 })
+    vim.keymap.set("i", "<c-h>", vim.lsp.buf.signature_help, { buffer = 0 })
+    vim.keymap.set("n", "<leader>vo", ":LspRestart<cr>", { noremap = true })
+
+    telescope_mapper("gr", "lsp_references", nil, true)
+    telescope_mapper("<leader>pv", "find_symbol", nil, true)
+    telescope_mapper("<leader>pd", "lsp_document_symbols", nil, true)
+
+    vim.bo.omnifunc = "v:lua.vim.lsp.omnifunc"
+
+    -- Attach any filetype specific options to the client
+    filetype_attach[filetype](client)
+end
+
+vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
+    underline = true,
+    update_in_insert = false,
+    virtual_text = { spacing = 2, prefix = "●" },
+    severity_sort = true,
+})
+
+local signs = { Error = " ", Warn = " ", Hint = " ", Info = " " }
+for type, icon in pairs(signs) do
+    local hl = "DiagnosticSign" .. type
+    vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
+end
+
+-- Actual configs
+local lsp_flags = {
+    debounce_text_changes = 150,
+}
+
+require("lspconfig")["rust_analyzer"].setup({
+    on_attach = on_attach,
+    flags = lsp_flags,
+    -- Server-specific settings...
+    settings = {
+        ["rust-analyzer"] = {},
+    },
+})
+
+require("lspconfig").dockerls.setup({
+    on_attach = on_attach,
+    flags = lsp_flags,
+})
+
+require("lspconfig")["intelephense"].setup({
+    on_attach = on_attach,
+    flags = lsp_flags,
+})
+require("lspconfig").jsonls.setup({
+    flags = lsp_flags,
+})
+require("lspconfig").html.setup({
+    flags = lsp_flags,
+})
+require("lspconfig").html.setup({
+    flags = lsp_flags,
+})
+require("lspconfig").emmet_ls.setup({
+    flags = lsp_flags,
+})
+
+require("lspconfig").gopls.setup({
+    on_attach = on_attach,
+    flags = lsp_flags,
+})
+
+require("lspconfig")["sumneko_lua"].setup({
+    on_attach = on_attach,
+    flags = lsp_flags,
+    settings = {
+        Lua = {
+            runtime = {
+                version = "LuaJIT",
+            },
+            diagnostics = {
+                globals = { "vim" },
+            },
+            workspace = {
+                library = vim.api.nvim_get_runtime_file("", true),
+            },
+            telemetry = {
+                enable = false,
+            },
+        },
+    },
+})
diff --git a/init.lua b/init.lua
index 002d9e1..0affa03 100644
--- a/init.lua
+++ b/init.lua
@@ -17,6 +17,3 @@ require "alpha.plugins"
 require "alpha.telescope.setup"
 require "alpha.telescope.mappings"
 require "alpha.dap"
-
--- require "alpha.refactor"
-require "alpha.lsp"
diff --git a/lua/alpha/lsp.lua b/lua/alpha/lsp.lua
deleted file mode 100644
index ed81b81..0000000
--- a/lua/alpha/lsp.lua
+++ /dev/null
@@ -1,75 +0,0 @@
-local telescope_mapper = require("alpha.telescope.mappings")
-
-local filetype_attach = setmetatable({
-	go = function(_)
-		vim.cmd([[
-      augroup lsp_buf_format
-        au! BufWritePre <buffer>
-        autocmd BufWritePre <buffer> :lua vim.lsp.buf.formatting_sync()
-      augroup END
-    ]])
-	end,
-
-    gdscript = function (_)
-    end
-}, {
-	__index = function()
-		return function() end
-	end,
-})
-
-local function on_attach(client)
-	local filetype = vim.api.nvim_buf_get_option(0, "filetype")
-	-- keymaps for lsp
-	vim.keymap.set("n", "K", vim.lsp.buf.hover, { buffer = 0 })
-	vim.keymap.set("n", "<c-]>", vim.lsp.buf.definition, { buffer = 0 })
-	vim.keymap.set("n", "<leader>vrn", vim.lsp.buf.rename, { buffer = 0 })
-	vim.keymap.set("n", "<leader>vf", function () return vim.lsp.buf.format({async = true}) end, { buffer = 0 })
-	vim.keymap.set("n", "<leader>vn", vim.diagnostic.goto_next, { buffer = 0 })
-	vim.keymap.set("n", "<leader>vp", vim.diagnostic.goto_prev, { buffer = 0 })
-	vim.keymap.set("n", "<leader>vca", vim.lsp.buf.code_action, { buffer = 0 })
-	vim.keymap.set("i", "<c-h>", vim.lsp.buf.signature_help, { buffer = 0 })
-	vim.keymap.set("n", "<leader>vo", ":LspRestart<cr>", { noremap = true })
-
-	telescope_mapper("gr", "lsp_references", nil, true)
-	telescope_mapper("<leader>pv", "find_symbol", nil, true)
-	telescope_mapper("<leader>pd", "lsp_document_symbols", nil, true)
-
-	vim.bo.omnifunc = "v:lua.vim.lsp.omnifunc"
-
-	-- Attach any filetype specific options to the client
-	filetype_attach[filetype](client)
-end
-
-local lsp_installer = require("nvim-lsp-installer")
-
-lsp_installer.on_server_ready(function(server)
-	local opts = {}
-
-	-- (optional) Customize the options passed to the server
-	if server.name == "emmet_ls" then
-		opts.filetypes = { "html", "css", "blade", "typescriptreact" }
-	end
-
-	opts.on_attach = on_attach
-	-- This setup() function is exactly the same as lspconfig's setup function (:help lspconfig-quickstart)
-	server:setup(opts)
-	vim.cmd([[ do User LspAttachBuffers ]])
-end)
-
-require("lspconfig").gdscript.setup({
-    on_attach = on_attach,
-})
-
-vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
-	underline = true,
-	update_in_insert = false,
-	virtual_text = { spacing = 2, prefix = "●" },
-	severity_sort = true,
-})
-
-local signs = { Error = " ", Warn = " ", Hint = " ", Info = " " }
-for type, icon in pairs(signs) do
-	local hl = "DiagnosticSign" .. type
-	vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
-end