diff options
Diffstat (limited to 'crates/ra_assists/src/tests.rs')
-rw-r--r-- | crates/ra_assists/src/tests.rs | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/crates/ra_assists/src/tests.rs b/crates/ra_assists/src/tests.rs index 861622d86..18fcb9049 100644 --- a/crates/ra_assists/src/tests.rs +++ b/crates/ra_assists/src/tests.rs | |||
@@ -35,14 +35,14 @@ fn check_doc_test(assist_id: &str, before: &str, after: &str) { | |||
35 | let before = db.file_text(file_id).to_string(); | 35 | let before = db.file_text(file_id).to_string(); |
36 | let frange = FileRange { file_id, range: selection.into() }; | 36 | let frange = FileRange { file_id, range: selection.into() }; |
37 | 37 | ||
38 | let mut assist = Assist::resolved(&db, &AssistConfig::default(), frange, None) | 38 | let mut assist = Assist::resolved(&db, &AssistConfig::default(), frange) |
39 | .into_iter() | 39 | .into_iter() |
40 | .find(|assist| assist.assist.id.0 == assist_id) | 40 | .find(|assist| assist.assist.id.0 == assist_id) |
41 | .unwrap_or_else(|| { | 41 | .unwrap_or_else(|| { |
42 | panic!( | 42 | panic!( |
43 | "\n\nAssist is not applicable: {}\nAvailable assists: {}", | 43 | "\n\nAssist is not applicable: {}\nAvailable assists: {}", |
44 | assist_id, | 44 | assist_id, |
45 | Assist::resolved(&db, &AssistConfig::default(), frange, None) | 45 | Assist::resolved(&db, &AssistConfig::default(), frange) |
46 | .into_iter() | 46 | .into_iter() |
47 | .map(|assist| assist.assist.id.0) | 47 | .map(|assist| assist.assist.id.0) |
48 | .collect::<Vec<_>>() | 48 | .collect::<Vec<_>>() |
@@ -73,7 +73,7 @@ fn check(handler: Handler, before: &str, expected: ExpectedResult) { | |||
73 | 73 | ||
74 | let sema = Semantics::new(&db); | 74 | let sema = Semantics::new(&db); |
75 | let config = AssistConfig::default(); | 75 | let config = AssistConfig::default(); |
76 | let ctx = AssistContext::new(sema, &config, frange, None); | 76 | let ctx = AssistContext::new(sema, &config, frange); |
77 | let mut acc = Assists::new_resolved(&ctx); | 77 | let mut acc = Assists::new_resolved(&ctx); |
78 | handler(&mut acc, &ctx); | 78 | handler(&mut acc, &ctx); |
79 | let mut res = acc.finish_resolved(); | 79 | let mut res = acc.finish_resolved(); |
@@ -105,7 +105,7 @@ fn assist_order_field_struct() { | |||
105 | let (before_cursor_pos, before) = extract_offset(before); | 105 | let (before_cursor_pos, before) = extract_offset(before); |
106 | let (db, file_id) = with_single_file(&before); | 106 | let (db, file_id) = with_single_file(&before); |
107 | let frange = FileRange { file_id, range: TextRange::empty(before_cursor_pos) }; | 107 | let frange = FileRange { file_id, range: TextRange::empty(before_cursor_pos) }; |
108 | let assists = Assist::resolved(&db, &AssistConfig::default(), frange, None); | 108 | let assists = Assist::resolved(&db, &AssistConfig::default(), frange); |
109 | let mut assists = assists.iter(); | 109 | let mut assists = assists.iter(); |
110 | 110 | ||
111 | assert_eq!( | 111 | assert_eq!( |
@@ -128,7 +128,7 @@ fn assist_order_if_expr() { | |||
128 | let (range, before) = extract_range(before); | 128 | let (range, before) = extract_range(before); |
129 | let (db, file_id) = with_single_file(&before); | 129 | let (db, file_id) = with_single_file(&before); |
130 | let frange = FileRange { file_id, range }; | 130 | let frange = FileRange { file_id, range }; |
131 | let assists = Assist::resolved(&db, &AssistConfig::default(), frange, None); | 131 | let assists = Assist::resolved(&db, &AssistConfig::default(), frange); |
132 | let mut assists = assists.iter(); | 132 | let mut assists = assists.iter(); |
133 | 133 | ||
134 | assert_eq!(assists.next().expect("expected assist").assist.label, "Extract into variable"); | 134 | assert_eq!(assists.next().expect("expected assist").assist.label, "Extract into variable"); |
@@ -150,9 +150,10 @@ fn assist_filter_works() { | |||
150 | let frange = FileRange { file_id, range }; | 150 | let frange = FileRange { file_id, range }; |
151 | 151 | ||
152 | { | 152 | { |
153 | let allowed = Some(vec![AssistKind::Refactor]); | 153 | let mut cfg = AssistConfig::default(); |
154 | cfg.allowed = Some(vec![AssistKind::Refactor]); | ||
154 | 155 | ||
155 | let assists = Assist::resolved(&db, &AssistConfig::default(), frange, allowed); | 156 | let assists = Assist::resolved(&db, &cfg, frange); |
156 | let mut assists = assists.iter(); | 157 | let mut assists = assists.iter(); |
157 | 158 | ||
158 | assert_eq!(assists.next().expect("expected assist").assist.label, "Extract into variable"); | 159 | assert_eq!(assists.next().expect("expected assist").assist.label, "Extract into variable"); |
@@ -160,8 +161,9 @@ fn assist_filter_works() { | |||
160 | } | 161 | } |
161 | 162 | ||
162 | { | 163 | { |
163 | let allowed = Some(vec![AssistKind::RefactorExtract]); | 164 | let mut cfg = AssistConfig::default(); |
164 | let assists = Assist::resolved(&db, &AssistConfig::default(), frange, allowed); | 165 | cfg.allowed = Some(vec![AssistKind::RefactorExtract]); |
166 | let assists = Assist::resolved(&db, &cfg, frange); | ||
165 | assert_eq!(assists.len(), 1); | 167 | assert_eq!(assists.len(), 1); |
166 | 168 | ||
167 | let mut assists = assists.iter(); | 169 | let mut assists = assists.iter(); |
@@ -169,8 +171,9 @@ fn assist_filter_works() { | |||
169 | } | 171 | } |
170 | 172 | ||
171 | { | 173 | { |
172 | let allowed = Some(vec![AssistKind::QuickFix]); | 174 | let mut cfg = AssistConfig::default(); |
173 | let assists = Assist::resolved(&db, &AssistConfig::default(), frange, allowed); | 175 | cfg.allowed = Some(vec![AssistKind::QuickFix]); |
176 | let assists = Assist::resolved(&db, &cfg, frange); | ||
174 | assert!(assists.is_empty(), "All asserts but quickfixes should be filtered out"); | 177 | assert!(assists.is_empty(), "All asserts but quickfixes should be filtered out"); |
175 | } | 178 | } |
176 | } | 179 | } |