mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-26 08:31:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #1091 from zed-industries/fix-project-diagnostics-panic

Browse source 
Don't reuse the same diagnostic group id across buffers
This commit is contained in:
Antonio Scandurra 2022-06-02 12:11:09 +02:00 committed by GitHub
commit 7beb1946b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/collab/src/integration_tests.rs
View file

@ -1359,7 +1359,7 @@ async fn test_collaborating_with_diagnostics(
DiagnosticEntry {
range: Point::new(0, 4)..Point::new(0, 7),
diagnostic: Diagnostic {
group_id: 0,
group_id: 1,
message: "message 1".to_string(),
severity: lsp::DiagnosticSeverity::ERROR,
is_primary: true,
@ -1369,7 +1369,7 @@ async fn test_collaborating_with_diagnostics(
DiagnosticEntry {
range: Point::new(0, 10)..Point::new(0, 13),
diagnostic: Diagnostic {
group_id: 1,
group_id: 2,
severity: lsp::DiagnosticSeverity::WARNING,
message: "message 2".to_string(),
is_primary: true,

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

@ -73,6 +73,7 @@ pub struct Project {
next_language_server_id: usize,
client: Arc<client::Client>,
next_entry_id: Arc<AtomicUsize>,
next_diagnostic_group_id: usize,
user_store: ModelHandle<UserStore>,
fs: Arc<dyn Fs>,
client_state: ProjectClientState,
@ -355,6 +356,7 @@ impl Project {
user_store,
fs,
next_entry_id: Default::default(),
next_diagnostic_group_id: Default::default(),
language_servers: Default::default(),
started_language_servers: Default::default(),
language_server_statuses: Default::default(),
@ -424,6 +426,7 @@ impl Project {
user_store: user_store.clone(),
fs,
next_entry_id: Default::default(),
next_diagnostic_group_id: Default::default(),
subscriptions: vec![client.add_model_for_remote_entity(remote_id, cx)],
client: client.clone(),
client_state: ProjectClientState::Remote {
@ -2121,7 +2124,6 @@ impl Project {
.uri
.to_file_path()
.map_err(|_| anyhow!("URI is not a file"))?;
let mut next_group_id = 0;
let mut diagnostics = Vec::default();
let mut primary_diagnostic_group_ids = HashMap::default();
let mut sources_by_group_id = HashMap::default();
@ -2156,7 +2158,7 @@ impl Project {
(diagnostic.severity, is_unnecessary),
);
} else {
let group_id = post_inc(&mut next_group_id);
let group_id = post_inc(&mut self.next_diagnostic_group_id);
let is_disk_based = source.map_or(false, |source| {
disk_based_sources.contains(&source.as_str())
});
@ -6270,7 +6272,7 @@ mod tests {
severity: DiagnosticSeverity::WARNING,
message: "unreachable statement".to_string(),
is_disk_based: true,
group_id: 1,
group_id: 4,
is_primary: true,
..Default::default()
}
@ -6281,7 +6283,7 @@ mod tests {
severity: DiagnosticSeverity::ERROR,
message: "undefined variable 'A'".to_string(),
is_disk_based: true,
group_id: 0,
group_id: 3,
is_primary: true,
..Default::default()
},
@ -6359,7 +6361,7 @@ mod tests {
severity: DiagnosticSeverity::WARNING,
message: "undefined variable 'A'".to_string(),
is_disk_based: true,
group_id: 1,
group_id: 6,
is_primary: true,
..Default::default()
}
@ -6370,7 +6372,7 @@ mod tests {
severity: DiagnosticSeverity::ERROR,
message: "undefined variable 'BB'".to_string(),
is_disk_based: true,
group_id: 0,
group_id: 5,
is_primary: true,
..Default::default()
},