mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplify newline check with macro

Browse Source
This commit is contained in:
Bernardo 2018-12-21 20:11:27 +01:00
parent d6312085a1
commit 1c44ba0f04
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
crates/ra_editor/src/line_index_utils.rs
View File

@ -143,35 +143,33 @@ pub fn count_newlines(offset: TextUnit, line_index: &LineIndex, edits: &[AtomTex
let mut lines: u32 = 0;
macro_rules! test_newline {
($x:ident) => {
if offset < $x {
return lines;
} else {
lines += 1;
}
};
}
for &orig_newline in line_index.newlines() {
loop {
let translated_newline = state.translate(orig_newline);
match state.next_newlines(translated_newline) {
NextNewlines::Use => {
if offset < translated_newline {
return lines;
} else {
lines += 1;
}
test_newline!(translated_newline);
break;
}
NextNewlines::ReplaceMany(ns) => {
for n in ns {
if offset < n {
return lines;
} else {
lines += 1;
}
test_newline!(n);
}
break;
}
NextNewlines::AddMany(ns) => {
for n in ns {
if offset < n {
return lines;
} else {
lines += 1;
}
test_newline!(n);
}
}
}
@ -183,11 +181,7 @@ pub fn count_newlines(offset: TextUnit, line_index: &LineIndex, edits: &[AtomTex
None => break,
Some(ns) => {
for n in ns {
if offset < n {
return lines;
} else {
lines += 1;
}
test_newline!(n);
}
}
}