addet make_pretty format lsp command keybind

lua/pika/plugins/lsp/lspconfig.lua

@@ -7,139 +7,87 @@ return {
     { "folke/neodev.nvim",                   opts = {} },
   },
   config = function()
-		-- import lspconfig plugin
     local lspconfig = require("lspconfig")
-
-		-- import mason_lspconfig plugin
     local mason_lspconfig = require("mason-lspconfig")
-
-		-- import cmp-nvim-lsp plugin
     local cmp_nvim_lsp = require("cmp_nvim_lsp")
+    local keymap = vim.keymap
 
-		local keymap = vim.keymap -- for conciseness
+    -- Function to make the buffer or selection pretty
+    local function make_pretty()
+      local mode = vim.api.nvim_get_mode().mode
+      if mode == "v" or mode == "V" then
+        vim.cmd("'<,'>lua vim.lsp.buf.format()")
+      else
+        vim.lsp.buf.format()
+      end
+    end
 
     vim.api.nvim_create_autocmd("LspAttach", {
       group = vim.api.nvim_create_augroup("UserLspConfig", {}),
       callback = function(ev)
-				-- Buffer local mappings.
-				-- See `:help vim.lsp.*` for documentation on any of the below functions
         local opts = { buffer = ev.buf, silent = true }
 
-				opts.desc = "See available code actions"
+        keymap.set({ "n", "v" }, "<leader>ca", vim.lsp.buf.code_action,
-				keymap.set({ "n", "v" }, "<leader>ca", vim.lsp.buf.code_action, opts) -- see available code actions, in visual mode will apply to selection
+          { buffer = ev.buf, desc = "See available code actions" })
+        keymap.set("n", "<leader>rn", vim.lsp.buf.rename, { buffer = ev.buf, desc = "Smart rename" })
+        keymap.set("n", "<leader>D", "<cmd>Telescope diagnostics bufnr=0<CR>",
+          { buffer = ev.buf, desc = "Show buffer diagnostics" })
+        keymap.set("n", "<leader>d", vim.diagnostic.open_float, { buffer = ev.buf, desc = "Show line diagnostics" })
+        keymap.set("n", "K", vim.lsp.buf.hover, { buffer = ev.buf, desc = "Show documentation for what is under cursor" })
+        keymap.set("n", "<leader>rs", ":LspRestart<CR>", { buffer = ev.buf, desc = "Restart LSP" })
 
-				opts.desc = "Smart rename"
+        -- Add the "make pretty" keymap
-				keymap.set("n", "<leader>rn", vim.lsp.buf.rename, opts) -- smart rename
+        keymap.set({ "n", "v" }, "<leader>mp", make_pretty, { buffer = ev.buf, desc = "Make pretty" })
-
-				opts.desc = "Show buffer diagnostics"
-				keymap.set("n", "<leader>D", "<cmd>Telescope diagnostics bufnr=0<CR>", opts) -- show diagnostics for file
-
-				opts.desc = "Show line diagnostics"
-				keymap.set("n", "<leader>d", vim.diagnostic.open_float, opts) -- show diagnostics for line
-
-				opts.desc = "Show documentation for what is under cursor"
-				keymap.set("n", "K", vim.lsp.buf.hover, opts) -- show documentation for what is under cursor
-
-				opts.desc = "Restart LSP"
-				keymap.set("n", "<leader>rs", ":LspRestart<CR>", opts) -- mapping to restart lsp if necessary
       end,
     })
 
-		-- used to enable autocompletion (assign to every lsp server config)
     local capabilities = cmp_nvim_lsp.default_capabilities()
 
-		-- Change the Diagnostic symbols in the sign column (gutter)
+    local signs = { Error = " ", Warn = " ", Hint = " ", Info = " " }
-		-- (not in youtube nvim video)
-		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
 
-		mason_lspconfig.setup_handlers({
+    local server_configs = {
-			-- default handler for installed servers
+      svelte = {
-			function(server_name)
-				lspconfig[server_name].setup({
-					capabilities = capabilities,
-				})
-			end,
-			["svelte"] = function()
-				-- configure svelte server
-				lspconfig["svelte"].setup({
-					capabilities = capabilities,
         on_attach = function(client, bufnr)
           vim.api.nvim_create_autocmd("BufWritePost", {
             pattern = { "*.js", "*.ts" },
             callback = function(ctx)
-								-- Here use ctx.match instead of ctx.file
               client.notify("$/onDidChangeTsOrJsFile", { uri = ctx.match })
             end,
           })
         end,
-				})
-			end,
-			["graphql"] = function()
-				-- configure graphql language server
-				lspconfig["graphql"].setup({
-					capabilities = capabilities,
-					filetypes = { "graphql", "gql", "svelte", "typescriptreact", "javascriptreact" },
-				})
-			end,
-			["emmet_ls"] = function()
-				-- configure emmet language server
-				lspconfig["emmet_ls"].setup({
-					capabilities = capabilities,
-					filetypes = {
-						"html",
-						"typescriptreact",
-						"javascriptreact",
-						"css",
-						"sass",
-						"scss",
-						"less",
-						"svelte",
       },
-				})
+      graphql = {
-			end,
+        filetypes = { "graphql", "gql", "svelte", "typescriptreact", "javascriptreact" },
-			["lua_ls"] = function()
+      },
-				-- ─< configure lua server (with special settings) >────────────────────────────────────
+      emmet_ls = {
-				lspconfig["lua_ls"].setup({
+        filetypes = { "html", "typescriptreact", "javascriptreact", "css", "sass", "scss", "less", "svelte" },
-					capabilities = capabilities,
+      },
+      lua_ls = {
         settings = {
           Lua = {
-							-- ─< make the language server recognize "vim" global >─────────────────────────────────
+            diagnostics = { globals = { "vim" } },
-							diagnostics = {
+            completion = { callSnippet = "Replace" },
-								globals = { "vim" },
-							},
-							completion = {
-								callSnippet = "Replace",
           },
         },
       },
-				})
+      cssls = {
-			end,
+        filetypes = { "html", "css", "scss", "php" },
-			["cssls"] = function()
+      },
-				-- ─< configure CSS server >────────────────────────────────────────────────────────────
+      intelephense = {},
-				lspconfig["cssls"].setup({
+      marksman = {},
-					capabilities = capabilities,
+    }
-					filetypes = {
+
-						"html",
+    mason_lspconfig.setup_handlers({
-						"css",
+      function(server_name)
-						"scss",
+        lspconfig[server_name].setup({
-						"php",
-					},
-				})
-			end,
-			["intelephense"] = function()
-				-- ─< configure PHP server >────────────────────────────────────────────────────────────
-				lspconfig["intelephense"].setup({
-					capabilities = capabilities,
-				})
-			end,
-			["marksman"] = function()
-				-- ─< configure Markdown server >───────────────────────────────────────────────────────
-				lspconfig["marksman"].setup({
           capabilities = capabilities,
+          on_attach = server_configs[server_name] and server_configs[server_name].on_attach or nil,
+          filetypes = server_configs[server_name] and server_configs[server_name].filetypes or nil,
+          settings = server_configs[server_name] and server_configs[server_name].settings or nil,
         })
       end,
     })