aboutsummaryrefslogtreecommitdiffstats
path: root/lua
diff options
context:
space:
mode:
authorMichael Lingelbach <m.j.lbach@gmail.com>2021-01-08 18:43:37 -0800
committerMichael Lingelbach <m.j.lbach@gmail.com>2021-01-08 18:43:37 -0800
commitaef96ddf83c14c12793dafcd6a15425010bbfaf2 (patch)
tree95b65fcfdab13018c8babbe142fb0f7bae3ff5f0 /lua
parentMerge pull request #559 from pierreprinetti/readme_typo (diff)
downloadnvim-lspconfig-aef96ddf83c14c12793dafcd6a15425010bbfaf2.tar
nvim-lspconfig-aef96ddf83c14c12793dafcd6a15425010bbfaf2.tar.gz
nvim-lspconfig-aef96ddf83c14c12793dafcd6a15425010bbfaf2.tar.bz2
nvim-lspconfig-aef96ddf83c14c12793dafcd6a15425010bbfaf2.tar.lz
nvim-lspconfig-aef96ddf83c14c12793dafcd6a15425010bbfaf2.tar.xz
nvim-lspconfig-aef96ddf83c14c12793dafcd6a15425010bbfaf2.tar.zst
nvim-lspconfig-aef96ddf83c14c12793dafcd6a15425010bbfaf2.zip
rust-analyzer: fix root pattern for multi-crate projects
Diffstat (limited to 'lua')
-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"] = {}
};