language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 22:01:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Support unions in symbol search

Browse source
This commit is contained in:
Lukas Wirth 2021-01-24 01:32:52 +01:00
parent 89fef5307e
commit a872ebf81f
3 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/ide_db/src/symbol_index.rs
View file

@ -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 @@ impl FileSymbolKind {
| FileSymbolKind::Enum
| FileSymbolKind::Trait
| FileSymbolKind::TypeAlias
| FileSymbolKind::Union
)
}
}
@ -425,6 +427,7 @@ fn to_symbol(node: &SyntaxNode) -> 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(),