diff options
author | Aleksey Kladov <[email protected]> | 2019-01-07 13:53:24 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-01-08 08:20:15 +0000 |
commit | b88775af7fdfb06df922325ab48237592d5afecb (patch) | |
tree | 68ee9946a5d59d8d8f82a658aa3816dc658c1ff8 /crates/ra_editor/src/test_utils.rs | |
parent | b73c51ff9bdf96ea22af0b9c431f201dcc8ddcd3 (diff) |
migrate ra_editor to rowan 0.2
Diffstat (limited to 'crates/ra_editor/src/test_utils.rs')
-rw-r--r-- | crates/ra_editor/src/test_utils.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crates/ra_editor/src/test_utils.rs b/crates/ra_editor/src/test_utils.rs index f0a4f250a..bf40c92c0 100644 --- a/crates/ra_editor/src/test_utils.rs +++ b/crates/ra_editor/src/test_utils.rs | |||
@@ -1,15 +1,15 @@ | |||
1 | use ra_syntax::{SourceFileNode, TextRange, TextUnit}; | 1 | use ra_syntax::{SourceFile, TextRange, TextUnit}; |
2 | 2 | ||
3 | use crate::LocalEdit; | 3 | use crate::LocalEdit; |
4 | pub use test_utils::*; | 4 | pub use test_utils::*; |
5 | 5 | ||
6 | pub fn check_action<F: Fn(&SourceFileNode, TextUnit) -> Option<LocalEdit>>( | 6 | pub fn check_action<F: Fn(&SourceFile, TextUnit) -> Option<LocalEdit>>( |
7 | before: &str, | 7 | before: &str, |
8 | after: &str, | 8 | after: &str, |
9 | f: F, | 9 | f: F, |
10 | ) { | 10 | ) { |
11 | let (before_cursor_pos, before) = extract_offset(before); | 11 | let (before_cursor_pos, before) = extract_offset(before); |
12 | let file = SourceFileNode::parse(&before); | 12 | let file = SourceFile::parse(&before); |
13 | let result = f(&file, before_cursor_pos).expect("code action is not applicable"); | 13 | let result = f(&file, before_cursor_pos).expect("code action is not applicable"); |
14 | let actual = result.edit.apply(&before); | 14 | let actual = result.edit.apply(&before); |
15 | let actual_cursor_pos = match result.cursor_position { | 15 | let actual_cursor_pos = match result.cursor_position { |
@@ -20,13 +20,13 @@ pub fn check_action<F: Fn(&SourceFileNode, TextUnit) -> Option<LocalEdit>>( | |||
20 | assert_eq_text!(after, &actual); | 20 | assert_eq_text!(after, &actual); |
21 | } | 21 | } |
22 | 22 | ||
23 | pub fn check_action_range<F: Fn(&SourceFileNode, TextRange) -> Option<LocalEdit>>( | 23 | pub fn check_action_range<F: Fn(&SourceFile, TextRange) -> Option<LocalEdit>>( |
24 | before: &str, | 24 | before: &str, |
25 | after: &str, | 25 | after: &str, |
26 | f: F, | 26 | f: F, |
27 | ) { | 27 | ) { |
28 | let (range, before) = extract_range(before); | 28 | let (range, before) = extract_range(before); |
29 | let file = SourceFileNode::parse(&before); | 29 | let file = SourceFile::parse(&before); |
30 | let result = f(&file, range).expect("code action is not applicable"); | 30 | let result = f(&file, range).expect("code action is not applicable"); |
31 | let actual = result.edit.apply(&before); | 31 | let actual = result.edit.apply(&before); |
32 | let actual_cursor_pos = match result.cursor_position { | 32 | let actual_cursor_pos = match result.cursor_position { |