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

Introduce Location and make SyntaxError fields private

Browse Source
This commit is contained in:
Adolfo Ochagavía
2018-11-05 18:38:34 +01:00
parent 3b42ddae60
commit fda8ddc5fe
10 changed files with 82 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crates/ra_syntax/src/reparsing.rs
View File

@@ -165,20 +165,14 @@ fn merge_errors(
) -> Vec<SyntaxError> {
let mut res = Vec::new();
for e in old_errors {
if e.range.start() <= old_node.range().start() {
if e.offset() <= old_node.range().start() {
res.push(e)
} else if e.range.start() >= old_node.range().end() {
res.push(SyntaxError {
kind: e.kind,
range: e.range + TextUnit::of_str(&edit.insert) - edit.delete.len(),
})
} else if e.offset() >= old_node.range().end() {
res.push(e.add_offset(TextUnit::of_str(&edit.insert) - edit.delete.len()));
}
}
for e in new_errors {
res.push(SyntaxError {
kind: e.kind,
range: e.range + old_node.range().start(),
})
res.push(e.add_offset(old_node.range().start()));
}
res
}