mirror of
https://github.com/LunarVim/LunarVim.git
synced 2025-09-01 08:15:20 +02:00
Refactor tsserver-ls as a shared module (#806)
This commit is contained in:
parent
2866ba528c
commit
8717f4f9a9
5 changed files with 45 additions and 156 deletions
|
@ -1,41 +1,3 @@
|
||||||
if not require("lv-utils").check_lsp_client_active "tsserver" then
|
require "lsp.tsserver-ls"
|
||||||
-- npm install -g typescript typescript-language-server
|
|
||||||
-- require'snippets'.use_suggested_mappings()
|
|
||||||
-- local capabilities = vim.lsp.protocol.make_client_capabilities()
|
|
||||||
-- capabilities.textDocument.completion.completionItem.snippetSupport = true;
|
|
||||||
-- local on_attach_common = function(client)
|
|
||||||
-- print("LSP Initialized")
|
|
||||||
-- require'completion'.on_attach(client)
|
|
||||||
-- require'illuminate'.on_attach(client)
|
|
||||||
-- end
|
|
||||||
require("lspconfig").tsserver.setup {
|
|
||||||
cmd = {
|
|
||||||
DATA_PATH .. "/lspinstall/typescript/node_modules/.bin/typescript-language-server",
|
|
||||||
"--stdio",
|
|
||||||
},
|
|
||||||
filetypes = {
|
|
||||||
"javascript",
|
|
||||||
"javascriptreact",
|
|
||||||
"javascript.jsx",
|
|
||||||
"typescript",
|
|
||||||
"typescriptreact",
|
|
||||||
"typescript.tsx",
|
|
||||||
},
|
|
||||||
on_attach = require("lsp").tsserver_on_attach,
|
|
||||||
-- This makes sure tsserver is not used for formatting (I prefer prettier)
|
|
||||||
-- on_attach = require'lsp'.common_on_attach,
|
|
||||||
root_dir = require("lspconfig/util").root_pattern("package.json", "tsconfig.json", "jsconfig.json", ".git"),
|
|
||||||
settings = { documentFormatting = false },
|
|
||||||
handlers = {
|
|
||||||
["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
|
|
||||||
virtual_text = O.lang.tsserver.diagnostics.virtual_text,
|
|
||||||
signs = O.lang.tsserver.diagnostics.signs,
|
|
||||||
underline = O.lang.tsserver.diagnostics.underline,
|
|
||||||
update_in_insert = true,
|
|
||||||
}),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
require("lsp.ts-fmt-lint").setup()
|
|
||||||
end
|
|
||||||
|
|
||||||
vim.cmd "setl ts=2 sw=2"
|
vim.cmd "setl ts=2 sw=2"
|
||||||
|
|
|
@ -1,41 +1,3 @@
|
||||||
if not require("lv-utils").check_lsp_client_active "tsserver" then
|
require "lsp.tsserver-ls"
|
||||||
-- npm install -g typescript typescript-language-server
|
|
||||||
-- require'snippets'.use_suggested_mappings()
|
|
||||||
-- local capabilities = vim.lsp.protocol.make_client_capabilities()
|
|
||||||
-- capabilities.textDocument.completion.completionItem.snippetSupport = true;
|
|
||||||
-- local on_attach_common = function(client)
|
|
||||||
-- print("LSP Initialized")
|
|
||||||
-- require'completion'.on_attach(client)
|
|
||||||
-- require'illuminate'.on_attach(client)
|
|
||||||
-- end
|
|
||||||
require("lspconfig").tsserver.setup {
|
|
||||||
cmd = {
|
|
||||||
DATA_PATH .. "/lspinstall/typescript/node_modules/.bin/typescript-language-server",
|
|
||||||
"--stdio",
|
|
||||||
},
|
|
||||||
filetypes = {
|
|
||||||
"javascript",
|
|
||||||
"javascriptreact",
|
|
||||||
"javascript.jsx",
|
|
||||||
"typescript",
|
|
||||||
"typescriptreact",
|
|
||||||
"typescript.tsx",
|
|
||||||
},
|
|
||||||
on_attach = require("lsp").tsserver_on_attach,
|
|
||||||
-- This makes sure tsserver is not used for formatting (I prefer prettier)
|
|
||||||
-- on_attach = require'lsp'.common_on_attach,
|
|
||||||
root_dir = require("lspconfig/util").root_pattern("package.json", "tsconfig.json", "jsconfig.json", ".git"),
|
|
||||||
settings = { documentFormatting = false },
|
|
||||||
handlers = {
|
|
||||||
["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
|
|
||||||
virtual_text = O.lang.tsserver.diagnostics.virtual_text,
|
|
||||||
signs = O.lang.tsserver.diagnostics.signs,
|
|
||||||
underline = O.lang.tsserver.diagnostics.underline,
|
|
||||||
update_in_insert = true,
|
|
||||||
}),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
require("lsp.ts-fmt-lint").setup()
|
|
||||||
end
|
|
||||||
|
|
||||||
vim.cmd "setl ts=2 sw=2"
|
vim.cmd "setl ts=2 sw=2"
|
||||||
|
|
|
@ -1,41 +1,3 @@
|
||||||
if not require("lv-utils").check_lsp_client_active "tsserver" then
|
require "lsp.tsserver-ls"
|
||||||
-- npm install -g typescript typescript-language-server
|
|
||||||
-- require'snippets'.use_suggested_mappings()
|
|
||||||
-- local capabilities = vim.lsp.protocol.make_client_capabilities()
|
|
||||||
-- capabilities.textDocument.completion.completionItem.snippetSupport = true;
|
|
||||||
-- local on_attach_common = function(client)
|
|
||||||
-- print("LSP Initialized")
|
|
||||||
-- require'completion'.on_attach(client)
|
|
||||||
-- require'illuminate'.on_attach(client)
|
|
||||||
-- end
|
|
||||||
require("lspconfig").tsserver.setup {
|
|
||||||
cmd = {
|
|
||||||
DATA_PATH .. "/lspinstall/typescript/node_modules/.bin/typescript-language-server",
|
|
||||||
"--stdio",
|
|
||||||
},
|
|
||||||
filetypes = {
|
|
||||||
"javascript",
|
|
||||||
"javascriptreact",
|
|
||||||
"javascript.jsx",
|
|
||||||
"typescript",
|
|
||||||
"typescriptreact",
|
|
||||||
"typescript.tsx",
|
|
||||||
},
|
|
||||||
on_attach = require("lsp").tsserver_on_attach,
|
|
||||||
-- This makes sure tsserver is not used for formatting (I prefer prettier)
|
|
||||||
-- on_attach = require'lsp'.common_on_attach,
|
|
||||||
root_dir = require("lspconfig/util").root_pattern("package.json", "tsconfig.json", "jsconfig.json", ".git"),
|
|
||||||
settings = { documentFormatting = false },
|
|
||||||
handlers = {
|
|
||||||
["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
|
|
||||||
virtual_text = O.lang.tsserver.diagnostics.virtual_text,
|
|
||||||
signs = O.lang.tsserver.diagnostics.signs,
|
|
||||||
underline = O.lang.tsserver.diagnostics.underline,
|
|
||||||
update_in_insert = true,
|
|
||||||
}),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
require("lsp.ts-fmt-lint").setup()
|
|
||||||
end
|
|
||||||
|
|
||||||
vim.cmd "setl ts=2 sw=2"
|
vim.cmd "setl ts=2 sw=2"
|
||||||
|
|
|
@ -1,41 +1,3 @@
|
||||||
if not require("lv-utils").check_lsp_client_active "tsserver" then
|
require "lsp.tsserver-ls"
|
||||||
-- npm install -g typescript typescript-language-server
|
|
||||||
-- require'snippets'.use_suggested_mappings()
|
|
||||||
-- local capabilities = vim.lsp.protocol.make_client_capabilities()
|
|
||||||
-- capabilities.textDocument.completion.completionItem.snippetSupport = true;
|
|
||||||
-- local on_attach_common = function(client)
|
|
||||||
-- print("LSP Initialized")
|
|
||||||
-- require'completion'.on_attach(client)
|
|
||||||
-- require'illuminate'.on_attach(client)
|
|
||||||
-- end
|
|
||||||
require("lspconfig").tsserver.setup {
|
|
||||||
cmd = {
|
|
||||||
DATA_PATH .. "/lspinstall/typescript/node_modules/.bin/typescript-language-server",
|
|
||||||
"--stdio",
|
|
||||||
},
|
|
||||||
filetypes = {
|
|
||||||
"javascript",
|
|
||||||
"javascriptreact",
|
|
||||||
"javascript.jsx",
|
|
||||||
"typescript",
|
|
||||||
"typescriptreact",
|
|
||||||
"typescript.tsx",
|
|
||||||
},
|
|
||||||
on_attach = require("lsp").tsserver_on_attach,
|
|
||||||
-- This makes sure tsserver is not used for formatting (I prefer prettier)
|
|
||||||
-- on_attach = require'lsp'.common_on_attach,
|
|
||||||
root_dir = require("lspconfig/util").root_pattern("package.json", "tsconfig.json", "jsconfig.json", ".git"),
|
|
||||||
settings = { documentFormatting = false },
|
|
||||||
handlers = {
|
|
||||||
["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
|
|
||||||
virtual_text = O.lang.tsserver.diagnostics.virtual_text,
|
|
||||||
signs = O.lang.tsserver.diagnostics.signs,
|
|
||||||
underline = O.lang.tsserver.diagnostics.underline,
|
|
||||||
update_in_insert = true,
|
|
||||||
}),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
require("lsp.ts-fmt-lint").setup()
|
|
||||||
end
|
|
||||||
|
|
||||||
vim.cmd "setl ts=2 sw=2"
|
vim.cmd "setl ts=2 sw=2"
|
||||||
|
|
41
lua/lsp/tsserver-ls.lua
Normal file
41
lua/lsp/tsserver-ls.lua
Normal file
|
@ -0,0 +1,41 @@
|
||||||
|
if require("lv-utils").check_lsp_client_active "tsserver" then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
-- npm install -g typescript typescript-language-server
|
||||||
|
-- require'snippets'.use_suggested_mappings()
|
||||||
|
-- local capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||||
|
-- capabilities.textDocument.completion.completionItem.snippetSupport = true;
|
||||||
|
-- local on_attach_common = function(client)
|
||||||
|
-- print("LSP Initialized")
|
||||||
|
-- require'completion'.on_attach(client)
|
||||||
|
-- require'illuminate'.on_attach(client)
|
||||||
|
-- end
|
||||||
|
require("lspconfig").tsserver.setup {
|
||||||
|
cmd = {
|
||||||
|
DATA_PATH .. "/lspinstall/typescript/node_modules/.bin/typescript-language-server",
|
||||||
|
"--stdio",
|
||||||
|
},
|
||||||
|
filetypes = {
|
||||||
|
"javascript",
|
||||||
|
"javascriptreact",
|
||||||
|
"javascript.jsx",
|
||||||
|
"typescript",
|
||||||
|
"typescriptreact",
|
||||||
|
"typescript.tsx",
|
||||||
|
},
|
||||||
|
on_attach = require("lsp").tsserver_on_attach,
|
||||||
|
-- This makes sure tsserver is not used for formatting (I prefer prettier)
|
||||||
|
-- on_attach = require'lsp'.common_on_attach,
|
||||||
|
root_dir = require("lspconfig/util").root_pattern("package.json", "tsconfig.json", "jsconfig.json", ".git"),
|
||||||
|
settings = { documentFormatting = false },
|
||||||
|
handlers = {
|
||||||
|
["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
|
||||||
|
virtual_text = O.lang.tsserver.diagnostics.virtual_text,
|
||||||
|
signs = O.lang.tsserver.diagnostics.signs,
|
||||||
|
underline = O.lang.tsserver.diagnostics.underline,
|
||||||
|
update_in_insert = true,
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
require("lsp.ts-fmt-lint").setup()
|
Loading…
Add table
Add a link
Reference in a new issue