Re-sort diagnostics after transaction transform (#3895)

Applying document-change transactions to diagnostic ranges is not stable
with respect to the ordering of diagnostics. This can cause diagnostics
to become temporarily unordered with some edits to a document, which can
eventually break some invariants/assumptions in syntax::merge.

With this change, Document::diagnostics are always sorted.
imgbot
Michael Davis 2 years ago committed by GitHub
parent 947ff63e6d
commit 8988c1ecc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -788,6 +788,8 @@ impl Document {
diagnostic.range.end = changes.map_pos(diagnostic.range.end, Assoc::After); diagnostic.range.end = changes.map_pos(diagnostic.range.end, Assoc::After);
diagnostic.line = self.text.char_to_line(diagnostic.range.start); diagnostic.line = self.text.char_to_line(diagnostic.range.start);
} }
self.diagnostics
.sort_unstable_by_key(|diagnostic| diagnostic.range);
// emit lsp notification // emit lsp notification
if let Some(language_server) = self.language_server() { if let Some(language_server) = self.language_server() {

Loading…
Cancel
Save