Updated ts_ls

lua/taken/plugins/lsp/lspconfig.lua

@@ -11,7 +11,6 @@ return {
     event = { "BufReadPre", "BufNewFile" },
     config = function()
         local lspconfig = require("lspconfig")
-        local typescript_tools = require("typescript-tools")
         local tserrortranslator = require("ts-error-translator")
         local cmp_nvim_lsp = require("cmp_nvim_lsp")
 
@@ -34,7 +33,6 @@ return {
             "eslint",
             "bashls",
             "tailwindcss",
-            "ts_ls",
         }
 
         for _, lsp in ipairs(defaultLsps) do
@@ -69,6 +67,38 @@ return {
             },
         })
 
+        -- typescript
+        lspconfig["ts_ls"].setup({
+            capabilities = capabilities,
+            on_attach = on_attach,
+            settings = {
+                typescript = {
+                    inlayHints = {
+                        includeInlayParameterNameHints = "all",
+                        includeInlayParameterNameHintsWhenArgumentMatchesName = true,
+                        includeInlayFunctionParameterTypeHints = true,
+                        includeInlayVariableTypeHints = true,
+                        includeInlayVariableTypeHintsWhenTypeMatchesName = true,
+                        includeInlayPropertyDeclarationTypeHints = true,
+                        includeInlayFunctionLikeReturnTypeHints = true,
+                        includeInlayEnumMemberValueHints = true,
+                    },
+                },
+                javascript = {
+                    inlayHints = {
+                        includeInlayParameterNameHints = "all",
+                        includeInlayParameterNameHintsWhenArgumentMatchesName = true,
+                        includeInlayFunctionParameterTypeHints = true,
+                        includeInlayVariableTypeHints = true,
+                        includeInlayVariableTypeHintsWhenTypeMatchesName = true,
+                        includeInlayPropertyDeclarationTypeHints = true,
+                        includeInlayFunctionLikeReturnTypeHints = true,
+                        includeInlayEnumMemberValueHints = true,
+                    },
+                },
+            },
+        })
+
         -- powershell
         lspconfig["powershell_es"].setup({
             capabilities = capabilities,
@@ -76,42 +106,6 @@ return {
             bundle_path = vim.fn.stdpath("data") .. "/mason/packages/powershell-editor-services",
         })
 
-        -- typescript tools
-        -- local cwd = vim.fn.getcwd()
-        -- local tsserver_path = cwd .. "/node_modules/.bin/tsserver"
-        --
-        -- local cmd = ""
-        -- if vim.loop.fs_stat(tsserver_path) then
-        --     cmd = tsserver_path
-        -- else
-        --     cmd = "typescript-language-server"
-        -- end
-
-        --[[ typescript_tools.setup({
-            capabilities = capabilities,
-            -- on_attach = function(client, bufnr)
-            --     on_attach(client, bufnr)
-            --     if cmd == "typescript-language-server" then
-            --         vim.notify("Using global tsserver")
-            --     end
-            -- end,
-            on_attach = on_attach,
-            settings = {
-                -- cmd = { cmd, "--stdio" },
-                tsserver_file_preferences = {
-                    includeInlayParameterNameHints = "all",
-                    includeInlayParameterNameHintsWhenArgumentMatchesName = true,
-                    includeInlayFunctionParameterTypeHints = true,
-                    includeInlayVariableTypeHints = true,
-                    includeInlayVariableTypeHintsWhenTypeMatchesName = true,
-                    includeInlayPropertyDeclarationTypeHints = true,
-                    includeInlayFunctionLikeReturnTypeHints = true,
-                    includeInlayEnumMemberValueHints = true,
-                    quotePreference = "auto",
-                },
-            },
-        }) ]]
-
         tserrortranslator.setup()
     end,
 }