restucture lsp-setup

lua/plugin/lspconfig.lua

@@ -15,33 +15,13 @@ return {
       local on_attach = function(client, bufnr)
         -- enable completion triggered by <c-x><c-o>
         vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
-
-                -- Mappings.
-                -- See `:help vim.lsp.*` for documentation on any of the below functions
-                local bufopts = { noremap = true, silent = true, buffer = bufnr }
-                vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
-                vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
-                vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
-                -- vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
-                vim.keymap.set('n', 'gK', vim.lsp.buf.signature_help, bufopts)
-                vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts)
-                vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, bufopts)
-                vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, bufopts)
-                vim.keymap.set('n', '<space>wl', function()
-                    print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-                end, bufopts)
-                vim.keymap.set('n', '<space>gt', vim.lsp.buf.type_definition, bufopts)
-                vim.keymap.set('n', '<space>cf', function() vim.lsp.buf.format { async = true } end, bufopts)
-                vim.keymap.set('v', '<space>cf', function() vim.lsp.buf.format { async = true } end, bufopts)
       end
-
       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 })
       end
 
-
       local border = {
         { "╭", "FloatBorder" },
         { "─", "FloatBorder" },
@@ -56,7 +36,7 @@ return {
       vim.diagnostic.config({
         float = { border = border },
         virtual_text = {
-                    prefix = '●', -- Could be '●', '■', 'x', '▎'
+          prefix = '●', -- Could be '●', '■', 'x', '▎', or anything else
         },
         update_in_insert = true,
       })
@@ -67,6 +47,7 @@ return {
     end,
   },
 
+  -- pretty ui
   {
     'nvimdev/lspsaga.nvim',
     event = 'LspAttach',
@@ -79,7 +60,7 @@ return {
         finder = {
           keys = {
             toggle_or_open = "<cr>",
-                quit = {'<Esc>', 'q'}
+            quit = { '<Esc>', 'q' }
           }
         },
         outline = {
@@ -90,12 +71,13 @@ return {
           enable = false
         },
         ui = {
-              code_action = '󰌶 '
+          code_action = '󰌶',
+          border = 'rounded',
         },
         rename = {
           in_select = false,
           keys = {
-                quit = {'<Esc>', 'q'},
+            quit = { '<Esc>', 'q' },
             select = '<Space>'
           }
         },
@@ -104,13 +86,22 @@ return {
         },
         code_action = {
           keys = {
-                quit = {'<Esc>', 'q'}
+            quit = { '<Esc>', 'q' }
-              }
+          },
+          extend_gitsigns = false,
         },
         definition = {
           keys = {
-                quit = {'<Esc>', 'q'},
+            quit = { '<Esc>', 'q' },
           },
+        },
+        diagnostic = {
+          border_follow = false,
+          extend_relatedInformation = true,
+          keys = {
+            quit = { '<Esc>', 'q' },
+            quit_in_show = { '<Esc>', 'q' },
+          }
         }
       })
 
@@ -126,7 +117,10 @@ return {
       vim.keymap.set('n', '<space>ca', '<cmd>Lspsaga code_action<cr>', bufopts)
       vim.keymap.set('n', '<space>sd', '<cmd>Lspsaga peek_definition<cr>', bufopts)
       vim.keymap.set('n', '<space>st', '<cmd>Lspsaga peek_type_definition<cr>', bufopts)
-
+      vim.keymap.set('n', '<space>cw', "<cmd>Lspsaga rename mode=n<cr>", bufopts)
+      vim.keymap.set('n', '<space>ca', '<cmd>Lspsaga code_action<cr>', bufopts)
+      vim.keymap.set('n', '[e', '<cmd>Lspsaga diagnostic_jump_next<cr>', bufopts)
+      vim.keymap.set('n', ']e', '<cmd>Lspsaga diagnostic_jump_prev<cr>', bufopts)
     end,
     depedencies = {
       'nvim-treesitter/nvim-treesitter',
@@ -176,4 +170,60 @@ return {
       }
     end,
   },
+  {
+    "nvimtools/none-ls.nvim",
+    -- event = "BufReadPost",
+    dependencies = {
+      {
+        "nvim-telescope/telescope-ui-select.nvim",
+        lazy = true,
+        config = function()
+          -- This is your opts table
+          require("telescope").setup {
+            extensions = {
+              ["ui-select"] = {
+                -- require("telescope.themes").get_dropdown {
+                --     -- even more opts
+                -- }
+              }
+            }
+          }
+          require("telescope").load_extension("ui-select")
+        end,
+      },
+    },
+    opts = function()
+      local null_ls = require('null-ls')
+      return {
+        border = 'rounded',
+        on_attach = function(client, bufnr)
+          local bufopts = { noremap = true, silent = true, buffer = bufnr }
+          vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
+          vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
+          vim.keymap.set('n', '<leader>K', vim.lsp.buf.hover, bufopts)
+          vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
+          vim.keymap.set('n', '<space>gt', vim.lsp.buf.type_definition, bufopts)
+          vim.keymap.set('n', '<space>cA', vim.lsp.buf.code_action, bufopts)
+          vim.keymap.set('n', '<space>gr', vim.lsp.buf.references, bufopts)
+          vim.keymap.set('n', '<space>cf', function() vim.lsp.buf.format { async = true } end, bufopts)
+          vim.keymap.set('v', '<space>cf', function() vim.lsp.buf.format { async = true } end, bufopts)
+        end,
+        sources = {
+          null_ls.builtins.diagnostics.trail_space.with {
+            disabled_filetypes = { "lua" }
+          },
+          null_ls.builtins.diagnostics.shellcheck,
+          null_ls.builtins.code_actions.shellcheck,
+          null_ls.builtins.formatting.jq,
+          null_ls.builtins.code_actions.gitsigns,
+          null_ls.builtins.diagnostics.flake8,
+          null_ls.builtins.diagnostics.yamllint,
+          null_ls.builtins.formatting.yamlfmt,
+          null_ls.builtins.formatting.shfmt,
+          null_ls.builtins.formatting.shellharden,
+          null_ls.builtins.formatting.beautysh,
+        },
+      }
+    end,
+  }
 }

lua/plugin/none-ls.lua

@@ -1,60 +0,0 @@
-return {
-    {
-        "nvimtools/none-ls.nvim",
-        -- event = "BufReadPost",
-        dependencies = {
-            {
-                "nvim-telescope/telescope-ui-select.nvim",
-                lazy = true,
-                config = function()
-                    -- This is your opts table
-                    require("telescope").setup {
-                        extensions = {
-                            ["ui-select"] = {
-                                -- require("telescope.themes").get_dropdown {
-                                --     -- even more opts
-                                -- }
-                            }
-                        }
-                    }
-                    require("telescope").load_extension("ui-select")
-                end,
-            },
-        },
-        opts = function()
-            local null_ls = require('null-ls')
-            return {
-                border = 'rounded',
-                on_attach = function(client, bufnr)
-                    local bufopts = { noremap = true, silent = true, buffer = bufnr }
-                    vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
-                    vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
-                    vim.keymap.set('n', '<leader>k', vim.lsp.buf.hover, bufopts)
-                    vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
-                    vim.keymap.set('n', '<space>gt', vim.lsp.buf.type_definition, bufopts)
-                    vim.keymap.set('n', '<space>cw', "<cmd>Lspsaga rename mode=n<cr>", bufopts)
-                    -- vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
-                    vim.keymap.set('n', '<space>ca', '<cmd>Lspsaga code_action<cr>', bufopts)
-                    -- vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
-                    vim.keymap.set('n', '<space>cf', function() vim.lsp.buf.format { async = true } end, bufopts)
-                    vim.keymap.set('v', '<space>cf', function() vim.lsp.buf.format { async = true } end, bufopts)
-                end,
-                sources = {
-                    null_ls.builtins.diagnostics.trail_space.with {
-                        disabled_filetypes = { "lua" }
-                    },
-                    null_ls.builtins.diagnostics.shellcheck,
-                    null_ls.builtins.code_actions.shellcheck,
-                    null_ls.builtins.formatting.jq,
-                    null_ls.builtins.code_actions.gitsigns,
-                    null_ls.builtins.diagnostics.flake8,
-                    null_ls.builtins.diagnostics.yamllint,
-                    null_ls.builtins.formatting.yamlfmt,
-                    null_ls.builtins.formatting.shfmt,
-                    null_ls.builtins.formatting.shellharden,
-                    null_ls.builtins.formatting.beautysh,
-                },
-            }
-        end,
-    },
-}