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

Introduce SyntaxErrorKind and TextRange in SyntaxError

Browse Source
This commit is contained in:
Adolfo Ochagavía
2018-11-04 16:45:22 +01:00
parent 576b9a0727
commit 3b42ddae60
10 changed files with 159 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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