aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Lingelbach <m.j.lbach@gmail.com>2021-01-08 19:51:08 -0800
committerGitHub <noreply@github.com>2021-01-08 19:51:08 -0800
commite0ec09fa129b00f31f4b31da3eb32e857d5cb4ff (patch)
tree6bee7f5881f4351af95d66a97efce69385d39714
parentMerge pull request #554 from mjlbach/typescript_fix_root (diff)
parentrust-analyzer: fix root pattern for multi-crate projects (diff)
downloadnvim-lspconfig-e0ec09fa129b00f31f4b31da3eb32e857d5cb4ff.tar
nvim-lspconfig-e0ec09fa129b00f31f4b31da3eb32e857d5cb4ff.tar.gz
nvim-lspconfig-e0ec09fa129b00f31f4b31da3eb32e857d5cb4ff.tar.bz2
nvim-lspconfig-e0ec09fa129b00f31f4b31da3eb32e857d5cb4ff.tar.lz
nvim-lspconfig-e0ec09fa129b00f31f4b31da3eb32e857d5cb4ff.tar.xz
nvim-lspconfig-e0ec09fa129b00f31f4b31da3eb32e857d5cb4ff.tar.zst
nvim-lspconfig-e0ec09fa129b00f31f4b31da3eb32e857d5cb4ff.zip
Merge pull request #648 from mjlbach/rust_analyzer_root
rust-analyzer: fix root pattern for multi-crate projects
-rw-r--r--lua/lspconfig/rust_analyzer.lua6
1 files changed, 5 insertions, 1 deletions
diff --git a/lua/lspconfig/rust_analyzer.lua b/lua/lspconfig/rust_analyzer.lua
index 4ea77cac..1ff1370a 100644
--- a/lua/lspconfig/rust_analyzer.lua
+++ b/lua/lspconfig/rust_analyzer.lua
@@ -5,7 +5,11 @@ configs.rust_analyzer = {
default_config = {
cmd = {"rust-analyzer"};
filetypes = {"rust"};
- root_dir = util.root_pattern("Cargo.toml", "rust-project.json");
+ root_dir = function(fname)
+ return util.find_git_ancestor(fname) or
+ util.root_pattern("rust-project.json")(fname) or
+ util.root_pattern("Cargo.toml")(fname)
+ end;
settings = {
["rust-analyzer"] = {}
};