fix(typescipt): properly check client.name in on_attach

This commit is contained in:
Folke Lemaitre
2023-01-10 19:32:02 +01:00
parent 7a68907b39
commit cce3129e99

View File

@ -11,18 +11,7 @@ return {
-- correctly setup lspconfig
{
"neovim/nvim-lspconfig",
dependencies = {
"jose-elias-alvarez/typescript.nvim",
init = function()
require("lazyvim.util").on_attach(function(server, buffer)
if server == "tsserver" then
-- stylua: ignore
vim.keymap.set( "n", "<leader>co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" })
vim.keymap.set("n", "<leader>cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer })
end
end)
end,
},
dependencies = { "jose-elias-alvarez/typescript.nvim" },
opts = {
-- make sure mason installs the server
servers = {
@ -30,6 +19,13 @@ return {
},
setup = {
tsserver = function(_, opts)
require("lazyvim.util").on_attach(function(client, buffer)
if client.name == "tsserver" then
-- stylua: ignore
vim.keymap.set( "n", "<leader>co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" })
vim.keymap.set("n", "<leader>cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer })
end
end)
require("typescript").setup({ server = opts })
return true
end,