diff options
Diffstat (limited to 'crates/ra_syntax/src/reparsing.rs')
-rw-r--r-- | crates/ra_syntax/src/reparsing.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crates/ra_syntax/src/reparsing.rs b/crates/ra_syntax/src/reparsing.rs index 873809a5a..208cae5c8 100644 --- a/crates/ra_syntax/src/reparsing.rs +++ b/crates/ra_syntax/src/reparsing.rs | |||
@@ -6,11 +6,11 @@ use crate::parser_impl; | |||
6 | use crate::text_utils::replace_range; | 6 | use crate::text_utils::replace_range; |
7 | use crate::yellow::{self, GreenNode, SyntaxError, SyntaxNodeRef}; | 7 | use crate::yellow::{self, GreenNode, SyntaxError, SyntaxNodeRef}; |
8 | use crate::{SyntaxKind::*, TextRange, TextUnit}; | 8 | use crate::{SyntaxKind::*, TextRange, TextUnit}; |
9 | use ra_text_edit::AtomEdit; | 9 | use ra_text_edit::AtomTextEdit; |
10 | 10 | ||
11 | pub(crate) fn incremental_reparse( | 11 | pub(crate) fn incremental_reparse( |
12 | node: SyntaxNodeRef, | 12 | node: SyntaxNodeRef, |
13 | edit: &AtomEdit, | 13 | edit: &AtomTextEdit, |
14 | errors: Vec<SyntaxError>, | 14 | errors: Vec<SyntaxError>, |
15 | ) -> Option<(GreenNode, Vec<SyntaxError>)> { | 15 | ) -> Option<(GreenNode, Vec<SyntaxError>)> { |
16 | let (node, green, new_errors) = | 16 | let (node, green, new_errors) = |
@@ -22,7 +22,7 @@ pub(crate) fn incremental_reparse( | |||
22 | 22 | ||
23 | fn reparse_leaf<'node>( | 23 | fn reparse_leaf<'node>( |
24 | node: SyntaxNodeRef<'node>, | 24 | node: SyntaxNodeRef<'node>, |
25 | edit: &AtomEdit, | 25 | edit: &AtomTextEdit, |
26 | ) -> Option<(SyntaxNodeRef<'node>, GreenNode, Vec<SyntaxError>)> { | 26 | ) -> Option<(SyntaxNodeRef<'node>, GreenNode, Vec<SyntaxError>)> { |
27 | let node = algo::find_covering_node(node, edit.delete); | 27 | let node = algo::find_covering_node(node, edit.delete); |
28 | match node.kind() { | 28 | match node.kind() { |
@@ -48,7 +48,7 @@ fn reparse_leaf<'node>( | |||
48 | 48 | ||
49 | fn reparse_block<'node>( | 49 | fn reparse_block<'node>( |
50 | node: SyntaxNodeRef<'node>, | 50 | node: SyntaxNodeRef<'node>, |
51 | edit: &AtomEdit, | 51 | edit: &AtomTextEdit, |
52 | ) -> Option<(SyntaxNodeRef<'node>, GreenNode, Vec<SyntaxError>)> { | 52 | ) -> Option<(SyntaxNodeRef<'node>, GreenNode, Vec<SyntaxError>)> { |
53 | let (node, reparser) = find_reparsable_node(node, edit.delete)?; | 53 | let (node, reparser) = find_reparsable_node(node, edit.delete)?; |
54 | let text = get_text_after_edit(node, &edit); | 54 | let text = get_text_after_edit(node, &edit); |
@@ -61,7 +61,7 @@ fn reparse_block<'node>( | |||
61 | Some((node, green, new_errors)) | 61 | Some((node, green, new_errors)) |
62 | } | 62 | } |
63 | 63 | ||
64 | fn get_text_after_edit(node: SyntaxNodeRef, edit: &AtomEdit) -> String { | 64 | fn get_text_after_edit(node: SyntaxNodeRef, edit: &AtomTextEdit) -> String { |
65 | replace_range( | 65 | replace_range( |
66 | node.text().to_string(), | 66 | node.text().to_string(), |
67 | edit.delete - node.range().start(), | 67 | edit.delete - node.range().start(), |
@@ -139,7 +139,7 @@ fn merge_errors( | |||
139 | old_errors: Vec<SyntaxError>, | 139 | old_errors: Vec<SyntaxError>, |
140 | new_errors: Vec<SyntaxError>, | 140 | new_errors: Vec<SyntaxError>, |
141 | old_node: SyntaxNodeRef, | 141 | old_node: SyntaxNodeRef, |
142 | edit: &AtomEdit, | 142 | edit: &AtomTextEdit, |
143 | ) -> Vec<SyntaxError> { | 143 | ) -> Vec<SyntaxError> { |
144 | let mut res = Vec::new(); | 144 | let mut res = Vec::new(); |
145 | for e in old_errors { | 145 | for e in old_errors { |
@@ -166,7 +166,7 @@ mod tests { | |||
166 | where | 166 | where |
167 | for<'a> F: Fn( | 167 | for<'a> F: Fn( |
168 | SyntaxNodeRef<'a>, | 168 | SyntaxNodeRef<'a>, |
169 | &AtomEdit, | 169 | &AtomTextEdit, |
170 | ) -> Option<(SyntaxNodeRef<'a>, GreenNode, Vec<SyntaxError>)>, | 170 | ) -> Option<(SyntaxNodeRef<'a>, GreenNode, Vec<SyntaxError>)>, |
171 | { | 171 | { |
172 | let (range, before) = extract_range(before); | 172 | let (range, before) = extract_range(before); |
@@ -175,7 +175,7 @@ mod tests { | |||
175 | let fully_reparsed = SourceFileNode::parse(&after); | 175 | let fully_reparsed = SourceFileNode::parse(&after); |
176 | let incrementally_reparsed = { | 176 | let incrementally_reparsed = { |
177 | let f = SourceFileNode::parse(&before); | 177 | let f = SourceFileNode::parse(&before); |
178 | let edit = AtomEdit { | 178 | let edit = AtomTextEdit { |
179 | delete: range, | 179 | delete: range, |
180 | insert: replace_with.to_string(), | 180 | insert: replace_with.to_string(), |
181 | }; | 181 | }; |