diff options
author | Piotr Szpetkowski <[email protected]> | 2020-03-27 16:28:25 +0000 |
---|---|---|
committer | Piotr Szpetkowski <[email protected]> | 2020-03-27 16:28:25 +0000 |
commit | f016d8b900792c8ae4fce268920edea3035b6559 (patch) | |
tree | 9afc05a20e5e51f757317a71906dc45a97861415 /crates/ra_syntax/src/ast/make.rs | |
parent | 75f6ab208a2b3e5fea9e8b6362df3fad7308a0d5 (diff) |
Fix merge-imports assist for wildcard imports
Diffstat (limited to 'crates/ra_syntax/src/ast/make.rs')
-rw-r--r-- | crates/ra_syntax/src/ast/make.rs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/crates/ra_syntax/src/ast/make.rs b/crates/ra_syntax/src/ast/make.rs index 4621c9888..dbf8e6370 100644 --- a/crates/ra_syntax/src/ast/make.rs +++ b/crates/ra_syntax/src/ast/make.rs | |||
@@ -29,12 +29,17 @@ pub fn use_tree( | |||
29 | path: ast::Path, | 29 | path: ast::Path, |
30 | use_tree_list: Option<ast::UseTreeList>, | 30 | use_tree_list: Option<ast::UseTreeList>, |
31 | alias: Option<ast::Alias>, | 31 | alias: Option<ast::Alias>, |
32 | add_star: bool, | ||
32 | ) -> ast::UseTree { | 33 | ) -> ast::UseTree { |
33 | let mut buf = "use ".to_string(); | 34 | let mut buf = "use ".to_string(); |
34 | buf += &path.syntax().to_string(); | 35 | buf += &path.syntax().to_string(); |
35 | if let Some(use_tree_list) = use_tree_list { | 36 | if let Some(use_tree_list) = use_tree_list { |
36 | buf += &format!("::{}", use_tree_list); | 37 | buf += &format!("::{}", use_tree_list); |
37 | } | 38 | } |
39 | if add_star { | ||
40 | buf += "::*"; | ||
41 | } | ||
42 | |||
38 | if let Some(alias) = alias { | 43 | if let Some(alias) = alias { |
39 | buf += &format!(" {}", alias); | 44 | buf += &format!(" {}", alias); |
40 | } | 45 | } |