Merge #7413

7413: Handle unions in symbol search r=Veykril a=Veykril

bors r+

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>

crates/completion/src/render.rs

@@ -201,8 +201,7 @@ fn render_resolution(
             ScopeDef::ModuleDef(Module(..)) => CompletionItemKind::SymbolKind(SymbolKind::Module),
             ScopeDef::ModuleDef(Adt(adt)) => CompletionItemKind::SymbolKind(match adt {
                 hir::Adt::Struct(_) => SymbolKind::Struct,
-                // FIXME: add CompletionItemKind::Union
-                hir::Adt::Union(_) => SymbolKind::Struct,
+                hir::Adt::Union(_) => SymbolKind::Union,
                 hir::Adt::Enum(_) => SymbolKind::Enum,
             }),
             ScopeDef::ModuleDef(Const(..)) => CompletionItemKind::SymbolKind(SymbolKind::Const),

crates/ide/src/display/navigation_target.rs

@@ -173,6 +173,7 @@ fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
                 FileSymbolKind::Const => SymbolKind::Const,
                 FileSymbolKind::Static => SymbolKind::Static,
                 FileSymbolKind::Macro => SymbolKind::Macro,
+                FileSymbolKind::Union => SymbolKind::Union,
             }),
             full_range: self.range,
             focus_range: self.name_range,

crates/ide_db/src/symbol_index.rs

@@ -356,15 +356,16 @@ pub struct FileSymbol {
 
 #[derive(PartialEq, Eq, Hash, Clone, Copy, Debug)]
 pub enum FileSymbolKind {
-    Function,
-    Struct,
-    Enum,
-    Trait,
-    Module,
-    TypeAlias,
     Const,
-    Static,
+    Enum,
+    Function,
     Macro,
+    Module,
+    Static,
+    Struct,
+    Trait,
+    TypeAlias,
+    Union,
 }
 
 impl FileSymbolKind {
@@ -375,6 +376,7 @@ fn is_type(self: FileSymbolKind) -> bool {
                 | FileSymbolKind::Enum
                 | FileSymbolKind::Trait
                 | FileSymbolKind::TypeAlias
+                | FileSymbolKind::Union
         )
     }
 }
@@ -425,6 +427,7 @@ fn decl<N: NameOwner>(node: N) -> Option<(SmolStr, SyntaxNodePtr, TextRange)> {
             ast::Const(it) => decl(it),
             ast::Static(it) => decl(it),
             ast::MacroRules(it) => decl(it),
+            ast::Union(it) => decl(it),
             _ => None,
         }
     }
@@ -443,6 +446,7 @@ fn to_file_symbol(node: &SyntaxNode, file_id: FileId) -> Option<FileSymbol> {
             CONST => FileSymbolKind::Const,
             STATIC => FileSymbolKind::Static,
             MACRO_RULES => FileSymbolKind::Macro,
+            UNION => FileSymbolKind::Union,
             kind => unreachable!("{:?}", kind),
         },
         range: node.text_range(),