From e959244071dca8ec4ce488a7055d72d185471f15 Mon Sep 17 00:00:00 2001 From: Damien DeVille Date: Sat, 3 Jul 2021 13:46:15 -0700 Subject: fix(rust-analyzer): improve root directory detection --- lua/lspconfig/rust_analyzer.lua | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'lua/lspconfig/rust_analyzer.lua') diff --git a/lua/lspconfig/rust_analyzer.lua b/lua/lspconfig/rust_analyzer.lua index 8e567b0f..20f35706 100644 --- a/lua/lspconfig/rust_analyzer.lua +++ b/lua/lspconfig/rust_analyzer.lua @@ -16,15 +16,20 @@ configs.rust_analyzer = { cmd = {"rust-analyzer"}; filetypes = {"rust"}; root_dir = function(fname) - local cargo_metadata = vim.fn.system("cargo metadata --no-deps --format-version 1") - local cargo_root = nil + local cargo_crate_dir = util.root_pattern("Cargo.toml")(fname) + local cmd = "cargo metadata --no-deps --format-version 1" + if cargo_crate_dir ~= nil then + cmd = cmd .. " --manifest-path " .. util.path.join(cargo_crate_dir, "Cargo.toml") + end + local cargo_metadata = vim.fn.system(cmd) + local cargo_workspace_dir = nil if vim.v.shell_error == 0 then - cargo_root = vim.fn.json_decode(cargo_metadata)["workspace_root"] + cargo_workspace_dir = vim.fn.json_decode(cargo_metadata)["workspace_root"] end - return cargo_root or - util.find_git_ancestor(fname) or + return cargo_workspace_dir or + cargo_crate_dir or util.root_pattern("rust-project.json")(fname) or - util.root_pattern("Cargo.toml")(fname) + util.find_git_ancestor(fname) end; settings = { ["rust-analyzer"] = {} -- cgit v1.2.3-70-g09d2