aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_assists/src/lib.rs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-03-03 16:10:55 +0000
committerGitHub <[email protected]>2020-03-03 16:10:55 +0000
commit9451d9f05b035dea9795bb35a72e4bb8841066ac (patch)
tree605a9e4e9b3f9bde6f3b8229f7a01c4fb7735748 /crates/ra_assists/src/lib.rs
parent077f8ac02cc732e2e14592fd48891c2a1eabbc25 (diff)
parentcf0ececb7aa93d5538a7688d825201327335132e (diff)
Merge #3424
3424: Highlight assist tests r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_assists/src/lib.rs')
-rw-r--r--crates/ra_assists/src/lib.rs16
1 files changed, 10 insertions, 6 deletions
diff --git a/crates/ra_assists/src/lib.rs b/crates/ra_assists/src/lib.rs
index deeada2de..50a15f978 100644
--- a/crates/ra_assists/src/lib.rs
+++ b/crates/ra_assists/src/lib.rs
@@ -178,19 +178,23 @@ mod helpers {
178 (db, file_id) 178 (db, file_id)
179 } 179 }
180 180
181 pub(crate) fn check_assist(assist: AssistHandler, before: &str, after: &str) { 181 pub(crate) fn check_assist(
182 check(assist, before, ExpectedResult::After(after)); 182 assist: AssistHandler,
183 ra_fixture_before: &str,
184 ra_fixture_after: &str,
185 ) {
186 check(assist, ra_fixture_before, ExpectedResult::After(ra_fixture_after));
183 } 187 }
184 188
185 // FIXME: instead of having a separate function here, maybe use 189 // FIXME: instead of having a separate function here, maybe use
186 // `extract_ranges` and mark the target as `<target> </target>` in the 190 // `extract_ranges` and mark the target as `<target> </target>` in the
187 // fixuture? 191 // fixuture?
188 pub(crate) fn check_assist_target(assist: AssistHandler, before: &str, target: &str) { 192 pub(crate) fn check_assist_target(assist: AssistHandler, ra_fixture: &str, target: &str) {
189 check(assist, before, ExpectedResult::Target(target)); 193 check(assist, ra_fixture, ExpectedResult::Target(target));
190 } 194 }
191 195
192 pub(crate) fn check_assist_not_applicable(assist: AssistHandler, before: &str) { 196 pub(crate) fn check_assist_not_applicable(assist: AssistHandler, ra_fixture: &str) {
193 check(assist, before, ExpectedResult::NotApplicable); 197 check(assist, ra_fixture, ExpectedResult::NotApplicable);
194 } 198 }
195 199
196 enum ExpectedResult<'a> { 200 enum ExpectedResult<'a> {