From 77e1951e12995b145c8a7f785061fcabd0ff7c97 Mon Sep 17 00:00:00 2001
From: Taken <taken@mairimashita.org>
Date: Sat, 23 Mar 2024 18:02:44 +0100
Subject: [PATCH] Fixed ts formatting with tsserver

---
 lua/taken/plugins/lsp/lspconfig.lua |  8 +-------
 lua/taken/plugins/lsp/null-ls.lua   | 13 -------------
 lua/taken/plugins/lsp/ts-tools.lua  | 13 ++++++++++++-
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/lua/taken/plugins/lsp/lspconfig.lua b/lua/taken/plugins/lsp/lspconfig.lua
index 96017db..458a2bd 100644
--- a/lua/taken/plugins/lsp/lspconfig.lua
+++ b/lua/taken/plugins/lsp/lspconfig.lua
@@ -45,13 +45,7 @@ return {
 
         lspconfig["eslint"].setup({
             capabilities = capabilities,
-            on_attach = function(client, bufnr)
-                on_attach(client, bufnr)
-                vim.api.nvim_create_autocmd("BufWritePre", {
-                    buffer = bufnr,
-                    command = "EslintFixAll",
-                })
-            end,
+            on_attach = on_attach,
         })
 
         lspconfig["lua_ls"].setup({
diff --git a/lua/taken/plugins/lsp/null-ls.lua b/lua/taken/plugins/lsp/null-ls.lua
index f548e52..31aac1c 100644
--- a/lua/taken/plugins/lsp/null-ls.lua
+++ b/lua/taken/plugins/lsp/null-ls.lua
@@ -1,6 +1,5 @@
 --- @type LazyPluginSpec
 return {
-    -- "jose-elias-alvarez/null-ls.nvim",
     "nvimtools/none-ls.nvim",
     event = { "BufReadPre", "BufNewFile" },
     config = function()
@@ -14,7 +13,6 @@ return {
             sources = {
                 formatting.stylua,
             },
-
             on_attach = function(client, bufnr)
                 if client.supports_method("textDocument/formatting") then
                     vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
@@ -25,17 +23,6 @@ return {
                             vim.lsp.buf.format({ async = false })
                         end,
                     })
-                elseif client.server_capabilities.documentFormattingProvider then
-                    vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
-                    vim.api.nvim_create_autocmd("BufWritePre", {
-                        group = augroup,
-                        buffer = bufnr,
-                        callback = function()
-                            vim.lsp.buf.format({ async = false })
-                        end,
-                    })
-                else
-                    vim.notify("Formatting not supported")
                 end
             end,
         })
diff --git a/lua/taken/plugins/lsp/ts-tools.lua b/lua/taken/plugins/lsp/ts-tools.lua
index 4da409b..ce32a9a 100644
--- a/lua/taken/plugins/lsp/ts-tools.lua
+++ b/lua/taken/plugins/lsp/ts-tools.lua
@@ -18,10 +18,21 @@ return {
 
         local on_attach = require("taken.utils.on_attach")
         local capabilities = cmp_nvim_lsp.default_capabilities()
+        local augroup = vim.api.nvim_create_augroup("Typescript_tools", {})
 
         typescript_tools.setup({
             capabilities = capabilities,
-            on_attach = on_attach,
+            on_attach = function(client, bufnr)
+                on_attach(client, bufnr)
+                vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
+                vim.api.nvim_create_autocmd("BufWritePre", {
+                    group = augroup,
+                    buffer = bufnr,
+                    callback = function()
+                        vim.lsp.buf.format({ async = false })
+                    end,
+                })
+            end,
             settings = {
                 tsserver_file_preferences = {
                     includeCompletionsForModuleExports = true,