diff options
Diffstat (limited to 'crates/ra_assists/src/handlers/merge_imports.rs')
-rw-r--r-- | crates/ra_assists/src/handlers/merge_imports.rs | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/crates/ra_assists/src/handlers/merge_imports.rs b/crates/ra_assists/src/handlers/merge_imports.rs index 972d16241..1beccb61c 100644 --- a/crates/ra_assists/src/handlers/merge_imports.rs +++ b/crates/ra_assists/src/handlers/merge_imports.rs | |||
@@ -8,7 +8,7 @@ use ra_syntax::{ | |||
8 | 8 | ||
9 | use crate::{ | 9 | use crate::{ |
10 | assist_context::{AssistContext, Assists}, | 10 | assist_context::{AssistContext, Assists}, |
11 | AssistId, | 11 | AssistId, AssistKind, |
12 | }; | 12 | }; |
13 | 13 | ||
14 | // Assist: merge_imports | 14 | // Assist: merge_imports |
@@ -56,9 +56,14 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext) -> Option<() | |||
56 | }; | 56 | }; |
57 | 57 | ||
58 | let target = tree.syntax().text_range(); | 58 | let target = tree.syntax().text_range(); |
59 | acc.add(AssistId("merge_imports"), "Merge imports", target, |builder| { | 59 | acc.add( |
60 | builder.rewrite(rewriter); | 60 | AssistId("merge_imports", AssistKind::RefactorRewrite), |
61 | }) | 61 | "Merge imports", |
62 | target, | ||
63 | |builder| { | ||
64 | builder.rewrite(rewriter); | ||
65 | }, | ||
66 | ) | ||
62 | } | 67 | } |
63 | 68 | ||
64 | fn next_prev() -> impl Iterator<Item = Direction> { | 69 | fn next_prev() -> impl Iterator<Item = Direction> { |
@@ -127,7 +132,7 @@ fn first_path(path: &ast::Path) -> ast::Path { | |||
127 | 132 | ||
128 | #[cfg(test)] | 133 | #[cfg(test)] |
129 | mod tests { | 134 | mod tests { |
130 | use crate::tests::check_assist; | 135 | use crate::tests::{check_assist, check_assist_not_applicable}; |
131 | 136 | ||
132 | use super::*; | 137 | use super::*; |
133 | 138 | ||
@@ -276,4 +281,14 @@ bar::baz}; | |||
276 | ", | 281 | ", |
277 | ) | 282 | ) |
278 | } | 283 | } |
284 | |||
285 | #[test] | ||
286 | fn test_empty_use() { | ||
287 | check_assist_not_applicable( | ||
288 | merge_imports, | ||
289 | r" | ||
290 | use std::<|> | ||
291 | fn main() {}", | ||
292 | ); | ||
293 | } | ||
279 | } | 294 | } |