diff options
| author | Lukas Wirth <lukastw97@gmail.com> | 2022-07-26 16:30:45 +0200 |
|---|---|---|
| committer | Lukas Wirth <lukastw97@gmail.com> | 2022-07-26 16:30:45 +0200 |
| commit | c8ff70e924efe3adba39ac5dc2a93dbd94bde5a4 (patch) | |
| tree | 04f96025c891e22b7fb94a8f387ecda3ad72a467 | |
| parent | 1c752841e2010dcabc834b5c5bbe66e51b8a8608 (diff) | |
| download | rust-c8ff70e924efe3adba39ac5dc2a93dbd94bde5a4.tar.gz rust-c8ff70e924efe3adba39ac5dc2a93dbd94bde5a4.zip | |
fix: Fix server panicking on project loading when proc-macros are disabled
| -rw-r--r-- | crates/rust-analyzer/src/cli/load_cargo.rs | 4 | ||||
| -rw-r--r-- | crates/rust-analyzer/src/reload.rs | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/crates/rust-analyzer/src/cli/load_cargo.rs b/crates/rust-analyzer/src/cli/load_cargo.rs index 0ada4b73e84..5d1c013c327 100644 --- a/crates/rust-analyzer/src/cli/load_cargo.rs +++ b/crates/rust-analyzer/src/cli/load_cargo.rs @@ -66,7 +66,9 @@ pub fn load_workspace( }; let crate_graph = ws.to_crate_graph( - &mut |_, path: &AbsPath| load_proc_macro(proc_macro_client.as_ref(), path, &[]), + &mut |_, path: &AbsPath| { + load_proc_macro(proc_macro_client.as_ref().map_err(|e| &**e), path, &[]) + }, &mut |path: &AbsPath| { let contents = loader.load_sync(path); let path = vfs::VfsPath::from(path.to_path_buf()); diff --git a/crates/rust-analyzer/src/reload.rs b/crates/rust-analyzer/src/reload.rs index b9aa13ec5b3..eaab275bc68 100644 --- a/crates/rust-analyzer/src/reload.rs +++ b/crates/rust-analyzer/src/reload.rs @@ -390,7 +390,10 @@ impl GlobalState { let mut crate_graph = CrateGraph::default(); for (idx, ws) in self.workspaces.iter().enumerate() { - let proc_macro_client = self.proc_macro_clients[idx].as_ref(); + let proc_macro_client = match self.proc_macro_clients.get(idx) { + Some(res) => res.as_ref().map_err(|e| &**e), + None => Err("Proc macros are disabled"), + }; let mut load_proc_macro = move |crate_name: &str, path: &AbsPath| { load_proc_macro( proc_macro_client, @@ -574,7 +577,7 @@ impl SourceRootConfig { /// Load the proc-macros for the given lib path, replacing all expanders whose names are in `dummy_replace` /// with an identity dummy expander. pub(crate) fn load_proc_macro( - server: Result<&ProcMacroServer, &String>, + server: Result<&ProcMacroServer, &str>, path: &AbsPath, dummy_replace: &[Box<str>], ) -> ProcMacroLoadResult { |