♻️ refactor(nvim): moved typescript inlayhints to the typescript extra and changed some maps for the lsp

.config/nvim/lazy-lock.json

@@ -2,7 +2,7 @@
   "LazyVim": { "branch": "main", "commit": "879e29504d43e9f178d967ecc34d482f902e5a91" },
   "LuaSnip": { "branch": "master", "commit": "2f0db89fcb22d27b908b3609d2441c02798106ab" },
   "SchemaStore.nvim": { "branch": "main", "commit": "7ccffe69a8c24fcd8637788955e13d7fd8aa2f46" },
-  "actions-preview.nvim": { "branch": "master", "commit": "8f79029a36ab6807478f157538a91ccd4af5858f" },
+  "actions-preview.nvim": { "branch": "master", "commit": "dd63df1a4ed0ffe1458945ee50ecb1dd02b605ab" },
   "animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" },
   "autolist.nvim": { "branch": "main", "commit": "5f70a5f99e96c8fe3069de042abd2a8ed2deb855" },
   "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" },

.config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua

@@ -1,6 +1,39 @@
+local inlayHints = {
+  includeInlayParameterNameHints = "all",
+  includeInlayParameterNameHintsWhenArgumentMatchesName = true,
+  includeInlayFunctionParameterTypeHints = true,
+  includeInlayVariableTypeHints = true,
+  includeInlayVariableTypeHintsWhenTypeMatchesName = true,
+  includeInlayPropertyDeclarationTypeHints = true,
+  includeInlayFunctionLikeReturnTypeHints = true,
+  includeInlayEnumMemberValueHints = true,
+}
+
 return {
   { import = "lazyvim.plugins.extras.lang.typescript" },
   { import = "lazyvim.plugins.extras.lang.json" },
+  {
+    "neovim/nvim-lspconfig",
+    opts = {
+      servers = {
+        tsserver = {
+          init_options = {
+            preferences = {
+              disableSuggestions = true,
+            },
+          },
+          settings = {
+            typescript = {
+              inlayHints = inlayHints,
+            },
+            javascript = {
+              inlayHints = inlayHints,
+            },
+          },
+        },
+      },
+    },
+  },
   {
     "nvim-treesitter/nvim-treesitter",
     opts = function(_, opts)

.config/nvim/lua/plugins/lspconfig.lua

@@ -1,23 +1,5 @@
 local nvim_0_10 = vim.fn.has("nvim-0.10")
 
-local function toggle_diag_virtext()
-  local virtual_text = { -- Default virtual_text opts from Lazy.Nvim
-    spacing = 4,
-    source = "if_many",
-    prefix = "●",
-  }
-  local config = vim.diagnostic.config()
-  if type(config.virtual_text) == "table" then
-    config.virtual_text = false
-    vim.diagnostic.config(config)
-    vim.notify("Disable diagnostics virtualtext", 5, { title = "Diagnostics" })
-  else
-    config.virtual_text = virtual_text
-    vim.diagnostic.config(config)
-    vim.notify("Enabled diagnostics virtualtext", 5, { title = "Diagnostics" })
-  end
-end
-
 return {
   {
     "neovim/nvim-lspconfig",
@@ -26,7 +8,9 @@ return {
 
       keys[#keys + 1] = { "<leader>cl", false }
       keys[#keys + 1] = { "<leader>cil", "<cmd>LspInfo<cr>", desc = "Lsp" }
-      keys[#keys + 1] = { "<leader>uv", toggle_diag_virtext, desc = "Toggle Diagnostic VirtualText" }
+      keys[#keys + 1] = { "<leader>clr", "<cmd>LspRestart<cr>", desc = "Restart Lsp" }
+      keys[#keys + 1] = { "<leader>cls", "<cmd>LspStart<cr>", desc = "Start Lsp" }
+      keys[#keys + 1] = { "<leader>clS", "<cmd>LspStop<cr>", desc = "Stop Lsp" }
 
       -- stylua: ignore
       keys[#keys + 1] = { "<leader>cll", "<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<cr>", desc = "List Workspace" }
@@ -37,9 +21,6 @@ return {
 
       keys[#keys + 1] = { "<leader>clh", vim.lsp.codelens.run, desc = "Run Code Lens" }
       keys[#keys + 1] = { "<leader>cld", vim.lsp.codelens.refresh, desc = "Refresh Code Lens" }
-      keys[#keys + 1] = { "<leader>clr", "<cmd>LspRestart<cr>", desc = "Restart Lsp" }
-      keys[#keys + 1] = { "<leader>cls", "<cmd>LspStart<cr>", desc = "Start Lsp" }
-      keys[#keys + 1] = { "<leader>clS", "<cmd>LspStop<cr>", desc = "Stop Lsp" }
     end,
     opts = {
       -- options for vim.diagnostic.config()
@@ -71,80 +52,18 @@ return {
         enabled = nvim_0_10,
       },
       servers = {
-        -- typos_lsp = {
-        --   settings = {
-        --     diagnosticSeverity = "Warning", TODO: Look at this
-        --   },
-        -- },
         lua_ls = {
           settings = {
             Lua = {
               hint = {
-                enable = true,
+                enable = nvim_0_10,
-                setType = true,
+                setType = nvim_0_10,
-              },
-            },
-          },
-        },
-        tsserver = {
-          init_options = {
-            preferences = {
-              disableSuggestions = true,
-            },
-          },
-          settings = {
-            typescript = {
-              format = {
-                indentSize = vim.o.shiftwidth,
-                convertTabsToSpaces = vim.o.expandtab,
-                tabSize = vim.o.tabstop,
-              },
-              inlayHints = {
-                includeInlayParameterNameHints = "all",
-                includeInlayParameterNameHintsWhenArgumentMatchesName = true,
-                includeInlayFunctionParameterTypeHints = true,
-                includeInlayVariableTypeHints = true,
-                includeInlayVariableTypeHintsWhenTypeMatchesName = true,
-                includeInlayPropertyDeclarationTypeHints = true,
-                includeInlayFunctionLikeReturnTypeHints = true,
-                includeInlayEnumMemberValueHints = true,
-              },
-            },
-            javascript = {
-              format = {
-                indentSize = vim.o.shiftwidth,
-                convertTabsToSpaces = vim.o.expandtab,
-                tabSize = vim.o.tabstop,
-              },
-              inlayHints = {
-                includeInlayParameterNameHints = "all",
-                includeInlayParameterNameHintsWhenArgumentMatchesName = true,
-                includeInlayFunctionParameterTypeHints = true,
-                includeInlayVariableTypeHints = true,
-                includeInlayVariableTypeHintsWhenTypeMatchesName = true,
-                includeInlayPropertyDeclarationTypeHints = true,
-                includeInlayFunctionLikeReturnTypeHints = true,
-                includeInlayEnumMemberValueHints = true,
-              },
-            },
-            completions = {
-              completeFunctionCalls = true,
               },
             },
           },
         },
       },
     },
-  {
-    "simrat39/rust-tools.nvim",
-    optional = true,
-    opts = function(_, opts)
-      opts.tools = {
-        inlay_hints = {
-          auto = not nvim_0_10,
-        },
-      }
-    end,
   },
   {
     "folke/which-key.nvim",