From 0f90e9fbd3f2546f90e9b515fd44522e59916849 Mon Sep 17 00:00:00 2001 From: Michael Lingelbach Date: Mon, 11 Jan 2021 00:40:06 -0800 Subject: rust_analyzer: read project root from cargo --- lua/lspconfig/rust_analyzer.lua | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'lua') diff --git a/lua/lspconfig/rust_analyzer.lua b/lua/lspconfig/rust_analyzer.lua index 1ff1370a..6ba704b3 100644 --- a/lua/lspconfig/rust_analyzer.lua +++ b/lua/lspconfig/rust_analyzer.lua @@ -6,9 +6,15 @@ configs.rust_analyzer = { cmd = {"rust-analyzer"}; filetypes = {"rust"}; 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) + local cargo_metadata = vim.fn.system("cargo metadata --format-version 1") + local cargo_root = nil + if vim.v.shell_handler == 0 then + cargo_root = vim.fn.json_decode(cargo_metadata)["workspace_root"] + end + return cargo_root or + util.find_git_ancestor(fname) or + util.root_pattern("rust-project.json")(fname) or + util.root_pattern("Cargo.toml")(fname) end; settings = { ["rust-analyzer"] = {} -- cgit v1.2.3-70-g09d2