rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove debugging code for incremental sync

Browse Source
This commit is contained in:
Laurențiu Nicola
2020-06-16 21:28:57 +03:00
parent 5d7974e5fb
commit 2fa0b20ce0
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
crates/rust-analyzer/src/main_loop.rs
View File

@@ -669,14 +669,11 @@ fn apply_document_changes(
mut line_index: Cow<'_, LineIndex>, mut line_index: Cow<'_, LineIndex>,
content_changes: Vec<TextDocumentContentChangeEvent>, content_changes: Vec<TextDocumentContentChangeEvent>,
) { ) {
// Remove when https://github.com/rust-analyzer/rust-analyzer/issues/4263 is fixed.
let backup_text = old_text.clone();
let backup_changes = content_changes.clone();
// The changes we got must be applied sequentially, but can cross lines so we // The changes we got must be applied sequentially, but can cross lines so we
// have to keep our line index updated. // have to keep our line index updated.
// Some clients (e.g. Code) sort the ranges in reverse. As an optimization, we // Some clients (e.g. Code) sort the ranges in reverse. As an optimization, we
// remember the last valid line in the index and only rebuild it if needed. // remember the last valid line in the index and only rebuild it if needed.
// The VFS will normalize the end of lines to `\n`.
enum IndexValid { enum IndexValid {
All, All,
UpToLineExclusive(u64), UpToLineExclusive(u64),
@@ -700,19 +697,7 @@ fn apply_document_changes(
} }
index_valid = IndexValid::UpToLineExclusive(range.start.line); index_valid = IndexValid::UpToLineExclusive(range.start.line);
let range = from_proto::text_range(&line_index, range); let range = from_proto::text_range(&line_index, range);
let mut text = old_text.to_owned(); old_text.replace_range(Range::<usize>::from(range), &change.text);
match std::panic::catch_unwind(move || {
text.replace_range(Range::<usize>::from(range), &change.text);
text
}) {
Ok(t) => *old_text = t,
Err(e) => {
eprintln!("Bug in incremental text synchronization. Please report the following output on https://github.com/rust-analyzer/rust-analyzer/issues/4263");
dbg!(&backup_text);
dbg!(&backup_changes);
std::panic::resume_unwind(e);
}
}
} }
None => { None => {
*old_text = change.text; *old_text = change.text;