|
@@ -47,6 +47,13 @@ end
|
|
-- require'completion'.on_attach(client)
|
|
-- require'completion'.on_attach(client)
|
|
-- require'illuminate'.on_attach(client)
|
|
-- require'illuminate'.on_attach(client)
|
|
-- end
|
|
-- end
|
|
|
|
+
|
|
|
|
+local on_attach = function(client, bufnr)
|
|
|
|
+ local lsp = require "lsp"
|
|
|
|
+ lsp.common_on_attach(client, bufnr)
|
|
|
|
+ lsp.tsserver_on_attach(client, bufnr)
|
|
|
|
+end
|
|
|
|
+
|
|
require("lspconfig").tsserver.setup {
|
|
require("lspconfig").tsserver.setup {
|
|
cmd = {
|
|
cmd = {
|
|
DATA_PATH .. "/lspinstall/typescript/node_modules/.bin/typescript-language-server",
|
|
DATA_PATH .. "/lspinstall/typescript/node_modules/.bin/typescript-language-server",
|
|
@@ -60,8 +67,7 @@ require("lspconfig").tsserver.setup {
|
|
"typescriptreact",
|
|
"typescriptreact",
|
|
"typescript.tsx",
|
|
"typescript.tsx",
|
|
},
|
|
},
|
|
- on_attach = require("lsp").tsserver_on_attach,
|
|
|
|
- -- on_attach = require'lsp'.common_on_attach,
|
|
|
|
|
|
+ on_attach = on_attach,
|
|
-- This makes sure tsserver is not used for formatting (I prefer prettier)
|
|
-- This makes sure tsserver is not used for formatting (I prefer prettier)
|
|
settings = { documentFormatting = false },
|
|
settings = { documentFormatting = false },
|
|
handlers = {
|
|
handlers = {
|