diff options
| author | Michael Lingelbach <m.j.lbach@gmail.com> | 2021-01-08 19:50:53 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-08 19:50:53 -0800 |
| commit | e0dc9869d348819c50a3732ff55a5c8459dd9956 (patch) | |
| tree | 4ffabd782f70790a3de3819004e8f4778b68274a /lua | |
| parent | Merge pull request #649 from mjlbach/fix_custom_config (diff) | |
| parent | [docgen] Update README.md (diff) | |
| download | nvim-lspconfig-e0dc9869d348819c50a3732ff55a5c8459dd9956.tar nvim-lspconfig-e0dc9869d348819c50a3732ff55a5c8459dd9956.tar.gz nvim-lspconfig-e0dc9869d348819c50a3732ff55a5c8459dd9956.tar.bz2 nvim-lspconfig-e0dc9869d348819c50a3732ff55a5c8459dd9956.tar.lz nvim-lspconfig-e0dc9869d348819c50a3732ff55a5c8459dd9956.tar.xz nvim-lspconfig-e0dc9869d348819c50a3732ff55a5c8459dd9956.tar.zst nvim-lspconfig-e0dc9869d348819c50a3732ff55a5c8459dd9956.zip | |
Merge pull request #554 from mjlbach/typescript_fix_root
tsserver: fix root detection to prefer tsconfig.json
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/lspconfig/tsserver.lua | 5 |
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 = [[ |