Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Don't replace newer diagnostics with older ones"

Browse source 
This reverts commit 71eeeedc05.
This commit is contained in:
Antonio Scandurra 2022-11-17 16:57:40 +01:00
parent e7e45be6e1
commit 4f39181c4c
7 changed files with 13 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/collab/src/db.rs
View file

@ -1809,15 +1809,13 @@ where
path,
language_server_id,
error_count,
warning_count,
version
warning_count
)
VALUES ($1, $2, $3, $4, $5, $6, $7)
VALUES ($1, $2, $3, $4, $5, $6)
ON CONFLICT (project_id, worktree_id, path) DO UPDATE SET
language_server_id = excluded.language_server_id,
error_count = excluded.error_count,
warning_count = excluded.warning_count,
version = excluded.version
warning_count = excluded.warning_count
",
)
.bind(project_id)
@ -1826,7 +1824,6 @@ where
.bind(summary.language_server_id as i64)
.bind(summary.error_count as i32)
.bind(summary.warning_count as i32)
.bind(summary.version as i32)
.execute(&mut tx)
.await?;
@ -2041,7 +2038,6 @@ where
language_server_id: summary.language_server_id as u64,
error_count: summary.error_count as u32,
warning_count: summary.warning_count as u32,
version: summary.version as u32,
});
}
}
@ -2666,7 +2662,6 @@ struct WorktreeDiagnosticSummary {
language_server_id: i64,
error_count: i32,
warning_count: i32,
version: i32,
}
id_type!(LanguageServerId);

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

@ -2412,10 +2412,9 @@ async fn test_collaborating_with_diagnostics(
path: Arc::from(Path::new("a.rs")),
},
DiagnosticSummary {
language_server_id: 0,
error_count: 1,
warning_count: 0,
version: 2,
..Default::default()
},
)]
)
@ -2445,10 +2444,9 @@ async fn test_collaborating_with_diagnostics(
path: Arc::from(Path::new("a.rs")),
},
DiagnosticSummary {
language_server_id: 0,
error_count: 1,
warning_count: 0,
version: 2,
..Default::default()
},
)]
);
@ -2486,10 +2484,9 @@ async fn test_collaborating_with_diagnostics(
path: Arc::from(Path::new("a.rs")),
},
DiagnosticSummary {
language_server_id: 0,
error_count: 1,
warning_count: 1,
version: 3,
..Default::default()
},
)]
);
@ -2503,10 +2500,9 @@ async fn test_collaborating_with_diagnostics(
path: Arc::from(Path::new("a.rs")),
},
DiagnosticSummary {
language_server_id: 0,
error_count: 1,
warning_count: 1,
version: 3,
..Default::default()
},
)]
);