aboutsummaryrefslogtreecommitdiffstats
path: root/lua
diff options
context:
space:
mode:
authorMichael Lingelbach <m.j.lbach@gmail.com>2021-01-07 22:41:43 -0800
committerMichael Lingelbach <m.j.lbach@gmail.com>2021-01-08 18:56:59 -0800
commitbdaa7009fe1ba56b309236c11262b2cb9da5d0d9 (patch)
treeba25d3c7e149adcb3537f868fdc01e12dd05b76f /lua
parentMerge pull request #546 from mjlbach/remove_vscode_doc_ccls (diff)
downloadnvim-lspconfig-bdaa7009fe1ba56b309236c11262b2cb9da5d0d9.tar
nvim-lspconfig-bdaa7009fe1ba56b309236c11262b2cb9da5d0d9.tar.gz
nvim-lspconfig-bdaa7009fe1ba56b309236c11262b2cb9da5d0d9.tar.bz2
nvim-lspconfig-bdaa7009fe1ba56b309236c11262b2cb9da5d0d9.tar.lz
nvim-lspconfig-bdaa7009fe1ba56b309236c11262b2cb9da5d0d9.tar.xz
nvim-lspconfig-bdaa7009fe1ba56b309236c11262b2cb9da5d0d9.tar.zst
nvim-lspconfig-bdaa7009fe1ba56b309236c11262b2cb9da5d0d9.zip
tsserver: fix root detection to prefer tsconfig.json
Diffstat (limited to 'lua')
-rw-r--r--lua/lspconfig/tsserver.lua5
1 files changed, 4 insertions, 1 deletions
diff --git a/lua/lspconfig/tsserver.lua b/lua/lspconfig/tsserver.lua
index d95e7d54..a3a78a71 100644
--- a/lua/lspconfig/tsserver.lua
+++ b/lua/lspconfig/tsserver.lua
@@ -11,7 +11,10 @@ configs[server_name] = {
default_config = {
cmd = {bin_name, "--stdio"};
filetypes = {"javascript", "javascriptreact", "javascript.jsx", "typescript", "typescriptreact", "typescript.tsx"};
- root_dir = util.root_pattern("package.json", "tsconfig.json", "jsconfig.json", ".git");
+ root_dir = function(fname)
+ return util.root_pattern("tsconfig.json")(fname) or
+ util.root_pattern("package.json", "jsconfig.json", ".git")(fname);
+ end
};
docs = {
description = [[