Merge #2597

2597: Handle start imports in import groups r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>

crates/ra_hir_def/src/marks.rs

@@ -5,6 +5,7 @@ test_utils::marks!(
     name_res_works_for_broken_modules
     can_import_enum_variant
     glob_enum
+    glob_enum_group
     glob_across_crates
     std_prelude
     macro_rules_from_other_crates_are_visible_with_macro_use

crates/ra_hir_def/src/nameres/tests/globs.rs

@@ -112,3 +112,24 @@ fn glob_enum() {
     "###
     );
 }
+
+#[test]
+fn glob_enum_group() {
+    covers!(glob_enum_group);
+    let map = def_map(
+        "
+        //- /lib.rs
+        enum Foo {
+            Bar, Baz
+        }
+        use self::Foo::{*};
+        ",
+    );
+    assert_snapshot!(map, @r###"
+   ⋮crate
+   ⋮Bar: t v
+   ⋮Baz: t v
+   ⋮Foo: t
+    "###
+    );
+}

crates/ra_hir_def/src/path/lower/lower_use.rs

@@ -9,6 +9,7 @@ use hir_expand::{
     name::{AsName, Name},
 };
 use ra_syntax::ast::{self, NameOwner};
+use test_utils::tested_by;
 
 use crate::path::{ModPath, PathKind};
 
@@ -34,6 +35,7 @@ pub(crate) fn lower_use_tree(
         }
     } else {
         let alias = tree.alias().and_then(|a| a.name()).map(|a| a.as_name());
+        let is_glob = tree.has_star();
         if let Some(ast_path) = tree.path() {
             // Handle self in a path.
             // E.g. `use something::{self, <...>}`
@@ -48,11 +50,15 @@ pub(crate) fn lower_use_tree(
                 }
             }
             if let Some(path) = convert_path(prefix, ast_path, hygiene) {
-                let is_glob = tree.has_star();
                 cb(path, &tree, is_glob, alias)
             }
         // FIXME: report errors somewhere
         // We get here if we do
+        } else if is_glob {
+            tested_by!(glob_enum_group);
+            if let Some(prefix) = prefix {
+                cb(prefix, &tree, is_glob, None)
+            }
         }
     }
 }