From 265cc9f64299f4a728ce4b52f589ab5a5b899abc Mon Sep 17 00:00:00 2001
From: Janis Hutz <info@janishutz.com>
Date: Mon, 17 Feb 2025 14:48:13 +0100
Subject: [PATCH] Fixes

---
 nvim/lazy-lock.json                   |  1 +
 nvim/lua/plugins/lspconfig.lua        | 24 +++++++++++----------
 nvim/lua/plugins/typescript-tools.lua | 30 +++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 11 deletions(-)
 create mode 100755 nvim/lua/plugins/typescript-tools.lua

diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index e212d5d..3274a27 100755
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -50,6 +50,7 @@
   "telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" },
   "telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" },
   "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
+  "typescript-tools.nvim": { "branch": "master", "commit": "35e397ce467bedbbbb5bfcd0aa79727b59a08d4a" },
   "vimtex": { "branch": "master", "commit": "3f0bdcfbe8167c081cd83153910c871b681c1d8f" },
   "which-key.nvim": { "branch": "main", "commit": "6cebd86917df559a88de0f806b2989799c6e6423" },
   "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" }
diff --git a/nvim/lua/plugins/lspconfig.lua b/nvim/lua/plugins/lspconfig.lua
index 74a2753..64bc0e2 100755
--- a/nvim/lua/plugins/lspconfig.lua
+++ b/nvim/lua/plugins/lspconfig.lua
@@ -130,24 +130,26 @@ return {
             on_attach = on_attach,
         })
 
-        lspconfig.ts_ls.setup({
-            capabilities = capabilities,
-            on_attach = on_attach,
-        })
+        -- lspconfig.ts_ls.setup({
+        --     capabilities = capabilities,
+        --     on_attach = on_attach,
+        -- })
 
+        -- local mason_registry = require('mason-registry')
+        -- local vue_language_server_path = mason_registry.get_package('vue-language-server'):get_install_path() .. '/node_modules/@vue/language-server'
+        --
         -- lspconfig.volar.setup({
         --     capabilities = capabilities,
         --     on_attach = on_attach,
-        --     cmd = { "vue-language-server", "--stdio" },
+        --     -- cmd = { "vue-language-server", "--stdio" },
         --     filetypes = { "vue" },
-        --     settings = {
-        --         typescript = {
-        --             tsdk = '/usr/lib/node_modules/typescript/lib'
-        --         }
-        --     }
+        --     -- settings = {
+        --     --     typescript = {
+        --     --         tsdk = '/usr/lib/node_modules/typescript/lib'
+        --     --     }
+        --     -- }
         -- })
 
-        -- done in ftplugin
         lspconfig.jdtls.setup({
             capabilities = capabilities,
             on_attach = on_attach,
diff --git a/nvim/lua/plugins/typescript-tools.lua b/nvim/lua/plugins/typescript-tools.lua
new file mode 100755
index 0000000..03f4945
--- /dev/null
+++ b/nvim/lua/plugins/typescript-tools.lua
@@ -0,0 +1,30 @@
+return {
+  'pmizio/typescript-tools.nvim',
+  dependencies = { 'nvim-lua/plenary.nvim', 'neovim/nvim-lspconfig' },
+  opts = {},
+  ft = { 'javascript', 'javascriptreact', 'typescript', 'typescriptreact', 'vue' },
+  config = function()
+    require('typescript-tools').setup {
+      on_attach = function(client, bufnr)
+        client.server_capabilities.documentFormattingProvider = false
+        client.server_capabilities.documentRangeFormattingProvider = false
+      end,
+      filetypes = {
+        'javascript',
+        'javascriptreact',
+        'typescript',
+        'typescriptreact',
+        'vue',
+      },
+      settings = {
+        tsserver_plugins = {
+          '@vue/typescript-plugin',
+        },
+        jsx_close_tag = {
+          enable = true,
+          filetypes = { 'javascriptreact', 'typescriptreact' },
+        },
+      },
+    }
+  end,
+}