From 8f2b91ea5ce1e9326d264b8fdfde153bbdee1c10 Mon Sep 17 00:00:00 2001 From: Taken Date: Sun, 6 Oct 2024 20:00:57 +0200 Subject: [PATCH] Removing svelte --- lua/taken/plugins/lsp/lspconfig.lua | 39 +++++++++++++++-------------- lua/taken/plugins/lsp/mason.lua | 1 - 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lua/taken/plugins/lsp/lspconfig.lua b/lua/taken/plugins/lsp/lspconfig.lua index da9a3fc..2b5c7a2 100644 --- a/lua/taken/plugins/lsp/lspconfig.lua +++ b/lua/taken/plugins/lsp/lspconfig.lua @@ -33,8 +33,8 @@ return { "yamlls", "eslint", "bashls", - "svelte", "tailwindcss", + "ts_ls", } for _, lsp in ipairs(defaultLsps) do @@ -77,26 +77,27 @@ return { }) -- typescript tools - local cwd = vim.fn.getcwd() - local tsserver_path = cwd .. "/node_modules/.bin/tsserver" + -- 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 - local cmd = "" - if vim.loop.fs_stat(tsserver_path) then - cmd = tsserver_path - else - cmd = "typescript-language-server" - end - - typescript_tools.setup({ + --[[ 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 = 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" }, + -- cmd = { cmd, "--stdio" }, tsserver_file_preferences = { includeInlayParameterNameHints = "all", includeInlayParameterNameHintsWhenArgumentMatchesName = true, @@ -109,7 +110,7 @@ return { quotePreference = "auto", }, }, - }) + }) ]] tserrortranslator.setup() end, diff --git a/lua/taken/plugins/lsp/mason.lua b/lua/taken/plugins/lsp/mason.lua index 7793978..3d984f8 100644 --- a/lua/taken/plugins/lsp/mason.lua +++ b/lua/taken/plugins/lsp/mason.lua @@ -35,7 +35,6 @@ return { "rust_analyzer", "yamlls", "bashls", - "svelte", "tailwindcss", }, automatic_installation = true,