From 8dd95bef24af10b3b5e1a2c9f310719a2241033b Mon Sep 17 00:00:00 2001
From: Dinesh Salunke <dineshsalunke@consultbop.com>
Date: Mon, 26 Jun 2023 23:24:53 +0530
Subject: [PATCH] refactor: replace the tsserver setup with typescript package

---
 lua/plugins/lsp.lua | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index eaaf33d..c917968 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -28,7 +28,7 @@ return {
             local lsp = require("lsp-zero")
 
             lsp.on_attach(function(_, bufnr)
-                lsp.default_keymaps({ buffer = bufnr })
+                lsp.default_keymaps({ buffer = bufnr, preserve_mappings = false })
             end)
 
             lsp.format_on_save({
@@ -40,6 +40,7 @@ return {
                     ["null-ls"] = {
                         "javascript",
                         "typescript",
+                        "typescriptreact",
                         "lua",
                     },
                 },
@@ -51,28 +52,16 @@ return {
             })
 
             require("lspconfig").lua_ls.setup(lsp.nvim_lua_ls())
-            require("lspconfig").tsserver.setup({
-                commands = {
-                    OrganizeImports = {
-                        function()
-                            local params = {
-                                command = "_typescript.organizeImports",
-                                arguments = { vim.api.nvim_buf_get_name(0) },
-                                title = "OrganizeImports",
-                            }
-                            vim.lsp.buf.execute_command(params)
-                        end,
-                        description = "Organize Imports",
-                    },
-                },
-            })
-            require("lspconfig").jsonls.setup({})
-
-            vim.keymap.set("n", "<leader>oi", ":OrganizeImports<CR>")
 
             lsp.setup()
         end,
     },
+    {
+        "jose-elias-alvarez/typescript.nvim",
+        config = function()
+            require("typescript").setup({})
+        end,
+    },
 
     {
         "jose-elias-alvarez/null-ls.nvim",
@@ -85,6 +74,7 @@ return {
                     null_ls.builtins.formatting.stylua,
                     null_ls.builtins.formatting.prettierd,
                     null_ls.builtins.formatting.eslint_d,
+                    require("typescript.extensions.null-ls.code-actions"),
                 },
             })
         end,