Merge #3044

3044: Don't crash when recieving unkown file for cargo diagnostic. r=matklad a=kiljacken

Fixes #3014

Co-authored-by: Emil Lauridsen <[email protected]>

1 files changed, 7 insertions, 6 deletions

diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs
index 12961ba37..ceff82fda 100644
--- a/crates/ra_lsp_server/src/main_loop.rs
+++ b/crates/ra_lsp_server/src/main_loop.rs
@@ -635,12 +635,13 @@ fn on_check_task(
 
         CheckTask::AddDiagnostic { url, diagnostic, fixes } => {
             let path = url.to_file_path().map_err(|()| format!("invalid uri: {}", url))?;
-            let file_id = world_state
-                .vfs
-                .read()
-                .path2file(&path)
-                .map(|it| FileId(it.0))
-                .ok_or_else(|| format!("unknown file: {}", path.to_string_lossy()))?;
+            let file_id = match world_state.vfs.read().path2file(&path) {
+                Some(file) => FileId(file.0),
+                None => {
+                    log::error!("File with cargo diagnostic not found in VFS: {}", path.display());
+                    return Ok(());
+                }
+            };
 
             task_sender
                 .send(Task::Diagnostic(DiagnosticTask::AddCheck(file_id, diagnostic, fixes)))?;