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
No known key found for this signature in database
GPG key ID: 41F8B1FBACAE2040

View file

@ -11,18 +11,7 @@ return {
-- correctly setup lspconfig -- correctly setup lspconfig
{ {
"neovim/nvim-lspconfig", "neovim/nvim-lspconfig",
dependencies = { dependencies = { "jose-elias-alvarez/typescript.nvim" },
"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,
},
opts = { opts = {
-- make sure mason installs the server -- make sure mason installs the server
servers = { servers = {
@ -30,6 +19,13 @@ return {
}, },
setup = { setup = {
tsserver = function(_, opts) 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 }) require("typescript").setup({ server = opts })
return true return true
end, end,