mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-10-02 22:54:58 +00:00
remove slower impl, add benchmarks
This commit is contained in:
Bernardo
parent
a005d2a614
commit
d6312085a1
6 changed files with 304 additions and 201 deletions
|
|
@ -2,7 +2,8 @@ mod code_actions;
|
|||
mod extend_selection;
|
||||
mod folding_ranges;
|
||||
mod line_index;
|
||||
mod line_index_utils;
|
||||
// public for benchmarkig
|
||||
pub mod line_index_utils;
|
||||
mod symbols;
|
||||
#[cfg(test)]
|
||||
mod test_utils;
|
||||
|
|
@ -13,7 +14,6 @@ pub use self::{
|
|||
extend_selection::extend_selection,
|
||||
folding_ranges::{folding_ranges, Fold, FoldKind},
|
||||
line_index::{LineCol, LineIndex},
|
||||
line_index_utils::translate_offset_with_edit,
|
||||
symbols::{file_structure, file_symbols, FileSymbol, StructureNode},
|
||||
typing::{join_lines, on_enter, on_eq_typed},
|
||||
};
|
||||
|
|
|
|||
|
|
@ -24,136 +24,6 @@ impl<'a> Iterator for OffsetNewlineIter<'a> {
|
|||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
struct AltEdit<'a> {
|
||||
insert_newlines: OffsetNewlineIter<'a>,
|
||||
delete: TextRange,
|
||||
diff: i64,
|
||||
}
|
||||
|
||||
fn translate_range_by(range: TextRange, diff: i64) -> TextRange {
|
||||
if diff == 0 {
|
||||
range
|
||||
} else {
|
||||
let start = translate_by(range.start(), diff);
|
||||
let end = translate_by(range.end(), diff);
|
||||
TextRange::from_to(start, end)
|
||||
}
|
||||
}
|
||||
|
||||
fn translate_by(x: TextUnit, diff: i64) -> TextUnit {
|
||||
if diff == 0 {
|
||||
x
|
||||
} else {
|
||||
TextUnit::from((x.to_usize() as i64 + diff) as u32)
|
||||
}
|
||||
}
|
||||
|
||||
fn to_alt_edits<'a>(offset: TextUnit, edits: &'a [AtomTextEdit]) -> Vec<AltEdit<'a>> {
|
||||
let mut xs: Vec<AltEdit<'a>> = Vec::with_capacity(edits.len());
|
||||
// collect and sort edits
|
||||
for edit in edits {
|
||||
// TODO discard after translating?
|
||||
// if edit.delete.start() >= offset {
|
||||
// continue;
|
||||
// }
|
||||
let insert_index = xs.upper_bound_by_key(&edit.delete.start(), |x| x.delete.start());
|
||||
let diff = edit.insert.len() as i64 - edit.delete.len().to_usize() as i64;
|
||||
xs.insert(
|
||||
insert_index,
|
||||
AltEdit {
|
||||
insert_newlines: OffsetNewlineIter {
|
||||
offset: edit.delete.start(),
|
||||
text: &edit.insert,
|
||||
},
|
||||
delete: edit.delete,
|
||||
diff: diff,
|
||||
},
|
||||
);
|
||||
}
|
||||
// translate edits by previous edits
|
||||
for i in 1..xs.len() {
|
||||
let (x, prevs) = xs[0..=i].split_last_mut().unwrap();
|
||||
for prev in prevs {
|
||||
x.delete = translate_range_by(x.delete, prev.diff);
|
||||
x.insert_newlines.offset = translate_by(x.insert_newlines.offset, prev.diff);
|
||||
}
|
||||
}
|
||||
xs
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
enum NextNewline {
|
||||
Use,
|
||||
Discard,
|
||||
Replace(TextUnit),
|
||||
New(TextUnit),
|
||||
}
|
||||
|
||||
fn next_newline(candidate: Option<TextUnit>, edits: &mut [AltEdit]) -> NextNewline {
|
||||
let mut candidate = match candidate {
|
||||
None => {
|
||||
for edit in edits {
|
||||
if let Some(inserted) = edit.insert_newlines.next() {
|
||||
return NextNewline::New(inserted);
|
||||
}
|
||||
}
|
||||
return NextNewline::Use; // END
|
||||
}
|
||||
Some(x) => x,
|
||||
};
|
||||
|
||||
for edit in edits {
|
||||
if candidate <= edit.delete.start() {
|
||||
return NextNewline::Replace(candidate);
|
||||
} else if candidate <= edit.delete.end() {
|
||||
return match edit.insert_newlines.next() {
|
||||
Some(x) => NextNewline::Replace(x),
|
||||
None => NextNewline::Discard,
|
||||
};
|
||||
} else {
|
||||
if let Some(inserted) = edit.insert_newlines.next() {
|
||||
return NextNewline::New(inserted);
|
||||
}
|
||||
candidate = translate_by(candidate, edit.diff);
|
||||
}
|
||||
}
|
||||
return NextNewline::Replace(candidate);
|
||||
}
|
||||
|
||||
pub fn count_newlines(offset: TextUnit, line_index: &LineIndex, edits: &[AtomTextEdit]) -> u32 {
|
||||
let mut edits = to_alt_edits(offset, edits);
|
||||
let mut orig_newlines = line_index.newlines().iter().map(|x| *x).peekable();
|
||||
|
||||
let mut count = 0;
|
||||
|
||||
loop {
|
||||
let res = next_newline(orig_newlines.peek().map(|x| *x), &mut edits);
|
||||
let next = match res {
|
||||
NextNewline::Use => orig_newlines.next(),
|
||||
NextNewline::Discard => {
|
||||
orig_newlines.next();
|
||||
continue;
|
||||
}
|
||||
NextNewline::Replace(new) => {
|
||||
orig_newlines.next();
|
||||
Some(new)
|
||||
}
|
||||
NextNewline::New(new) => Some(new),
|
||||
};
|
||||
match next {
|
||||
Some(n) if n <= offset => {
|
||||
count += 1;
|
||||
}
|
||||
_ => {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
count
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
enum NextNewlines<'a> {
|
||||
Use,
|
||||
|
|
@ -188,7 +58,7 @@ impl<'a, 'b> Edits<'a, 'b> {
|
|||
self.acc_diff += self.current.as_ref().map_or(0, |x| x.diff);
|
||||
match self.edits.split_first() {
|
||||
Some((next, rest)) => {
|
||||
let delete = translate_range_by(next.delete, self.acc_diff);
|
||||
let delete = self.translate_range(next.delete);
|
||||
let diff = next.insert.len() as i64 - next.delete.len().to_usize() as i64;
|
||||
self.current = Some(TranslatedEdit {
|
||||
delete,
|
||||
|
|
@ -241,9 +111,27 @@ impl<'a, 'b> Edits<'a, 'b> {
|
|||
};
|
||||
res
|
||||
}
|
||||
|
||||
fn translate_range(&self, range: TextRange) -> TextRange {
|
||||
if self.acc_diff == 0 {
|
||||
range
|
||||
} else {
|
||||
let start = self.translate(range.start());
|
||||
let end = self.translate(range.end());
|
||||
TextRange::from_to(start, end)
|
||||
}
|
||||
}
|
||||
|
||||
fn translate(&self, x: TextUnit) -> TextUnit {
|
||||
if self.acc_diff == 0 {
|
||||
x
|
||||
} else {
|
||||
TextUnit::from((x.to_usize() as i64 + self.acc_diff) as u32)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn count_newlines_alt(offset: TextUnit, line_index: &LineIndex, edits: &[AtomTextEdit]) -> u32 {
|
||||
pub fn count_newlines(offset: TextUnit, line_index: &LineIndex, edits: &[AtomTextEdit]) -> u32 {
|
||||
let mut sorted_edits: Vec<&AtomTextEdit> = Vec::with_capacity(edits.len());
|
||||
for edit in edits {
|
||||
let insert_index =
|
||||
|
|
@ -257,7 +145,7 @@ pub fn count_newlines_alt(offset: TextUnit, line_index: &LineIndex, edits: &[Ato
|
|||
|
||||
for &orig_newline in line_index.newlines() {
|
||||
loop {
|
||||
let translated_newline = translate_by(orig_newline, state.acc_diff);
|
||||
let translated_newline = state.translate(orig_newline);
|
||||
match state.next_newlines(translated_newline) {
|
||||
NextNewlines::Use => {
|
||||
if offset < translated_newline {
|
||||
|
|
@ -369,69 +257,5 @@ mod test {
|
|||
let actual_lines = count_newlines(x.offset, &line_index, &x.edits);
|
||||
assert_eq!(actual_lines, expected.line);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_translate_offset_with_edit_alt(x in arb_text_with_offset_and_edits()) {
|
||||
let line_index = LineIndex::new(&x.text);
|
||||
let expected = translate_after_edit(&x.text, x.offset, x.edits.clone());
|
||||
let actual_lines = count_newlines_alt(x.offset, &line_index, &x.edits);
|
||||
assert_eq!(actual_lines, expected.line);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_translate_offset_with_edit_alt_1() {
|
||||
let x = ArbTextWithOffsetAndEdits {
|
||||
text: String::from("aA\n"),
|
||||
offset: 2.into(),
|
||||
edits: vec![AtomTextEdit::delete(TextRange::from_to(1.into(), 2.into()))],
|
||||
};
|
||||
let line_index = LineIndex::new(&x.text);
|
||||
let expected = translate_after_edit(&x.text, x.offset, x.edits.clone());
|
||||
let actual_lines = count_newlines_alt(x.offset, &line_index, &x.edits);
|
||||
assert_eq!(actual_lines, expected.line);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_translate_offset_with_edit_alt_2() {
|
||||
let x = ArbTextWithOffsetAndEdits {
|
||||
text: String::from("\nqꀸ#"),
|
||||
offset: 5.into(),
|
||||
edits: vec![AtomTextEdit::insert(1.into(), "\n".into())],
|
||||
};
|
||||
let line_index = LineIndex::new(&x.text);
|
||||
let expected = translate_after_edit(&x.text, x.offset, x.edits.clone());
|
||||
let actual_lines = count_newlines_alt(x.offset, &line_index, &x.edits);
|
||||
assert_eq!(actual_lines, expected.line);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_translate_offset_with_edit_alt_3() {
|
||||
let x = ArbTextWithOffsetAndEdits {
|
||||
text: String::from("\n\n\n"),
|
||||
offset: 0.into(),
|
||||
edits: vec![AtomTextEdit::delete(TextRange::from_to(0.into(), 2.into()))],
|
||||
};
|
||||
let line_index = LineIndex::new(&x.text);
|
||||
let expected = translate_after_edit(&x.text, x.offset, x.edits.clone());
|
||||
let actual_lines = count_newlines_alt(x.offset, &line_index, &x.edits);
|
||||
assert_eq!(actual_lines, expected.line);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_translate_offset_with_edit_alt_4() {
|
||||
let x = ArbTextWithOffsetAndEdits {
|
||||
text: String::from("☻54翑\"A"),
|
||||
offset: 5.into(),
|
||||
edits: vec![
|
||||
AtomTextEdit::delete(TextRange::from_to(0.into(), 8.into())),
|
||||
AtomTextEdit::insert(9.into(), String::from("\n")),
|
||||
],
|
||||
};
|
||||
let line_index = LineIndex::new(&x.text);
|
||||
let expected = translate_after_edit(&x.text, x.offset, x.edits.clone());
|
||||
let actual_lines = count_newlines_alt(x.offset, &line_index, &x.edits);
|
||||
assert_eq!(actual_lines, expected.line);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue