mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-28 11:29:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Clear diagnostics from buffer when unregistering it from language server

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2022-04-05 16:01:33 +02:00
parent 7e3cc67e0a
commit cc45658b2d
1 changed files with 45 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
crates/project/src/project.rs
View file

@ -1177,19 +1177,21 @@ impl Project {
old_path: PathBuf, old_path: PathBuf,
cx: &mut ModelContext<Self>, cx: &mut ModelContext<Self>,
) { ) {
let buffer = &buffer.read(cx); buffer.update(cx, |buffer, cx| {
if let Some((_, language_server)) = self.language_server_for_buffer(buffer, cx) { buffer.update_diagnostics(Default::default(), cx);
language_server self.buffer_snapshots.remove(&buffer.remote_id());
.notify::<lsp::notification::DidCloseTextDocument>( if let Some((_, language_server)) = self.language_server_for_buffer(buffer, cx) {
lsp::DidCloseTextDocumentParams { language_server
text_document: lsp::TextDocumentIdentifier::new( .notify::<lsp::notification::DidCloseTextDocument>(
lsp::Url::from_file_path(old_path).unwrap(), lsp::DidCloseTextDocumentParams {
), text_document: lsp::TextDocumentIdentifier::new(
}, lsp::Url::from_file_path(old_path).unwrap(),
) ),
.log_err(); },
} )
self.buffer_snapshots.remove(&buffer.remote_id()); .log_err();
}
});
} }
fn on_buffer_event( fn on_buffer_event(
@ -5189,6 +5191,26 @@ mod tests {
}, },
); );
rust_buffer2.update(cx, |buffer, cx| {
buffer.update_diagnostics(
DiagnosticSet::from_sorted_entries(
vec![DiagnosticEntry {
diagnostic: Default::default(),
range: Anchor::MIN..Anchor::MAX,
}],
&buffer.snapshot(),
),
cx,
);
assert_eq!(
buffer
.snapshot()
.diagnostics_in_range::<_, usize>(0..buffer.len(), false)
.count(),
1
);
});
// When the rename changes the extension of the file, the buffer gets closed on the old // When the rename changes the extension of the file, the buffer gets closed on the old
// language server and gets opened on the new one. // language server and gets opened on the new one.
fs.rename( fs.rename(
@ -5219,6 +5241,16 @@ mod tests {
language_id: Default::default() language_id: Default::default()
}, },
); );
// We clear the diagnostics, since the language has changed.
rust_buffer2.read_with(cx, |buffer, _| {
assert_eq!(
buffer
.snapshot()
.diagnostics_in_range::<_, usize>(0..buffer.len(), false)
.count(),
0
);
});
// The renamed file's version resets after changing language server. // The renamed file's version resets after changing language server.
rust_buffer2.update(cx, |buffer, cx| buffer.edit([0..0], "// ", cx)); rust_buffer2.update(cx, |buffer, cx| buffer.edit([0..0], "// ", cx));