averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[index] Make IndexSymbol's subkind into a bitset

Browse Source 
This follows a similar change to clang indexing, and will allow us to
add overlapping sub kinds such as "UnitTest", etc.
This commit is contained in:
Ben Langmuir
2016-04-29 14:32:52 -07:00
parent ef4e84b8d6
commit 6096b8b93c
6 changed files with 55 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp
View File

@@ -39,6 +39,7 @@ using namespace swift;
using namespace swift::ide;
using swift::index::SymbolKind;
using swift::index::SymbolSubKind;
using swift::index::SymbolSubKindSet;
using swift::index::SymbolRole;
using swift::index::SymbolRoleSet;
@@ -522,7 +523,7 @@ UIdent SwiftLangSupport::getUIDForSyntaxStructureElementKind(
}
}
UIdent SwiftLangSupport::getUIDForSymbol(SymbolKind kind, SymbolSubKind subKind,
UIdent SwiftLangSupport::getUIDForSymbol(SymbolKind kind, SymbolSubKindSet subKinds,
bool isRef) {
#define UID_FOR(CLASS) isRef ? KindRef##CLASS : KindDecl##CLASS;
@@ -571,30 +572,29 @@ UIdent SwiftLangSupport::getUIDForSymbol(SymbolKind kind, SymbolSubKind subKind,
assert(!isRef && "reference to extension decl?");
SWIFT_FALLTHROUGH;
case SymbolKind::Accessor:
switch (subKind) {
case SymbolSubKind::AccessorGetter:
if (subKinds & SymbolSubKind::AccessorGetter) {
return UID_FOR(AccessorGetter);
case SymbolSubKind::AccessorSetter:
} else if (subKinds & SymbolSubKind::AccessorSetter) {
return UID_FOR(AccessorSetter);
case SymbolSubKind::AccessorWillSet:
} else if (subKinds & SymbolSubKind::AccessorWillSet) {
return UID_FOR(AccessorWillSet);
case SymbolSubKind::AccessorDidSet:
} else if (subKinds & SymbolSubKind::AccessorDidSet) {
return UID_FOR(AccessorDidSet);
case SymbolSubKind::AccessorAddressor:
} else if (subKinds & SymbolSubKind::AccessorAddressor) {
return UID_FOR(AccessorAddress);
case SymbolSubKind::AccessorMutableAddressor:
} else if (subKinds & SymbolSubKind::AccessorMutableAddressor) {
return UID_FOR(AccessorMutableAddress);
case SymbolSubKind::ExtensionOfStruct:
} else if (subKinds & SymbolSubKind::ExtensionOfStruct) {
return KindDeclExtensionStruct;
case SymbolSubKind::ExtensionOfClass:
} else if (subKinds & SymbolSubKind::ExtensionOfClass) {
return KindDeclExtensionClass;
case SymbolSubKind::ExtensionOfEnum:
} else if (subKinds & SymbolSubKind::ExtensionOfEnum) {
return KindDeclExtensionEnum;
case SymbolSubKind::ExtensionOfProtocol:
} else if (subKinds & SymbolSubKind::ExtensionOfProtocol) {
return KindDeclExtensionProtocol;
case SymbolSubKind::None:
} else {
llvm_unreachable("missing sub kind");
}