some bugfixes for the upcomming version of neovim (0.12.0)

lua/pika/plugins/lsp/lspconfig.lua

@@ -7,16 +7,10 @@ return {
 		{ "folke/neodev.nvim", opts = {} },
 	},
 	config = function()
-		-- import lspconfig plugin
 		local lspconfig = require("lspconfig")
-
-		-- import mason_lspconfig plugin
 		local mason_lspconfig = require("mason-lspconfig")
-
-		-- import cmp-nvim-lsp plugin
 		local cmp_nvim_lsp = require("cmp_nvim_lsp")
-
-		local keymap = vim.keymap -- for conciseness
+		local keymap = vim.keymap
 
 		vim.api.nvim_create_autocmd("LspAttach", {
 			group = vim.api.nvim_create_augroup("UserLspConfig", {}),
@@ -57,21 +51,18 @@ return {
 		end
 
 		mason_lspconfig.setup_handlers({
-			-- default handler for installed servers
 			function(server_name)
 				lspconfig[server_name].setup({
 					capabilities = capabilities,
 				})
 			end,
 			["svelte"] = function()
-				-- configure svelte server
 				lspconfig["svelte"].setup({
 					capabilities = capabilities,
 					on_attach = function(client, bufnr)
 						vim.api.nvim_create_autocmd("BufWritePost", {
 							pattern = { "*.js", "*.ts" },
 							callback = function(ctx)
-								-- Here use ctx.match instead of ctx.file
 								client.notify("$/onDidChangeTsOrJsFile", { uri = ctx.match })
 							end,
 						})
@@ -79,14 +70,12 @@ return {
 				})
 			end,
 			["graphql"] = function()
-				-- configure graphql language server
 				lspconfig["graphql"].setup({
 					capabilities = capabilities,
 					filetypes = { "graphql", "gql", "svelte", "typescriptreact", "javascriptreact" },
 				})
 			end,
 			["emmet_ls"] = function()
-				-- configure emmet language server
 				lspconfig["emmet_ls"].setup({
 					capabilities = capabilities,
 					filetypes = {
@@ -102,12 +91,10 @@ return {
 				})
 			end,
 			["lua_ls"] = function()
-				-- ─< configure lua server (with special settings) >────────────────────────────────────
 				lspconfig["lua_ls"].setup({
 					capabilities = capabilities,
 					settings = {
 						Lua = {
-							-- ─< make the language server recognize "vim" global >─────────────────────────────────
 							diagnostics = {
 								globals = { "vim" },
 							},
@@ -119,25 +106,22 @@ return {
 				})
 			end,
 			["cssls"] = function()
-				-- ─< configure CSS server >────────────────────────────────────────────────────────────
 				lspconfig["cssls"].setup({
 					capabilities = capabilities,
-					filetypes = {
-						-- "html",
-						"css",
-						"scss",
-						-- "php",
-					},
+					filetypes = { "css", "scss" },
 				})
 			end,
 			["intelephense"] = function()
-				-- ─< configure PHP server >────────────────────────────────────────────────────────────
 				lspconfig["intelephense"].setup({
 					capabilities = capabilities,
-					filetypes = {
-						"php",
-						"blade.php",
-					},
+					filetypes = { "php", "blade.php" },
+				})
+			end,
+			["tsserver"] = function()
+				-- Replace tsserver with typescript-language-server
+				lspconfig["typescript-language-server"].setup({
+					capabilities = capabilities,
+					filetypes = { "typescript", "typescriptreact", "javascript", "javascriptreact" },
 				})
 			end,
 		})