nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-12 16:45:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't crash when recieving unkown file for cargo diagnostic.

Browse Source
This commit is contained in:
Emil Lauridsen 2020-02-07 12:30:29 +01:00
parent 5aba5a756a
commit 5db7c8642b
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/ra_lsp_server/src/main_loop.rs
View File

@ -635,12 +635,16 @@ 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.to_string_lossy()
);
return Ok(());
}
};
task_sender
.send(Task::Diagnostic(DiagnosticTask::AddCheck(file_id, diagnostic, fixes)))?;