mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-12 21:32:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Prevent .unwrap() on Err

Browse source
This commit is contained in:
Helge Mahrt 2024-12-15 21:32:34 +01:00
parent a94afbc062
commit 7f2514eb14
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/project/src/lsp_store.rs
View file

@ -1945,8 +1945,9 @@ impl LocalLspStore {
Some(local) => local.abs_path(cx), Some(local) => local.abs_path(cx),
None => return, None => return,
}; };
let file_url = lsp::Url::from_file_path(old_path).unwrap(); if let Ok(file_url) = lsp::Url::from_file_path(old_path) {
self.unregister_buffer_from_language_servers(buffer, file_url, cx); self.unregister_buffer_from_language_servers(buffer, file_url, cx);
}
} }
pub(crate) fn unregister_buffer_from_language_servers( pub(crate) fn unregister_buffer_from_language_servers(
@ -4919,7 +4920,7 @@ impl LspStore {
let buffer = buffer.read(cx); let buffer = buffer.read(cx);
let file = File::from_dyn(buffer.file())?; let file = File::from_dyn(buffer.file())?;
let abs_path = file.as_local()?.abs_path(cx); let abs_path = file.as_local()?.abs_path(cx);
let uri = lsp::Url::from_file_path(abs_path).unwrap(); if let Ok(uri) = lsp::Url::from_file_path(abs_path) {
let next_snapshot = buffer.text_snapshot(); let next_snapshot = buffer.text_snapshot();
let language_servers: Vec<_> = self let language_servers: Vec<_> = self
@ -5010,6 +5011,7 @@ impl LspStore {
) )
.log_err(); .log_err();
} }
}
None None
} }