[index] Add UnitTest SymbolSubKind and collapse the IndexSymbol inheritance

Fold UnitTest into the subkind, now that it's a bitself, and then remove
the unnecessary inheritance for IndexSymbol and its SourceKit indexing
equivalent.

Author: benlangmuir

include/swift/Index/IndexSymbol.h

@@ -72,6 +72,8 @@ enum class SymbolSubKind : uint32_t {
   ExtensionOfClass              = 1 << 7,
   ExtensionOfEnum               = 1 << 8,
   ExtensionOfProtocol           = 1 << 9,
+
+  UnitTest                      = 1 << 10,
 };
 
 typedef uint32_t SymbolSubKindSet;
@@ -90,9 +92,6 @@ using SymbolRole = clang::index::SymbolRole;
 using SymbolRoleSet = clang::index::SymbolRoleSet;
 
 struct IndexSymbol {
-  enum TypeKind { Base, FuncDecl };
-  TypeKind entityType = Base;
-
   SymbolKind kind;
   SymbolSubKindSet subKinds = SymbolSubKindSet(0);
   SymbolRoleSet roles = SymbolRoleSet(0);
@@ -106,18 +105,8 @@ struct IndexSymbol {
   unsigned column = 0;
 
   IndexSymbol() = default;
-
-protected:
-  IndexSymbol(TypeKind TK) : entityType(TK) {}
 };
 
-struct FuncDeclIndexSymbol : public IndexSymbol {
-  bool IsTestCandidate = false;
-
-  FuncDeclIndexSymbol() : IndexSymbol(FuncDecl) {}
-};
-
-
 SymbolKind getSymbolKindForDecl(const Decl *D);
 
 } // end namespace index

lib/Index/Index.cpp

@@ -278,7 +278,7 @@ class IndexSwiftASTWalker : public SourceEntityWalker {
 
   bool initIndexSymbol(ValueDecl *D, SourceLoc Loc, bool IsRef,
                        IndexSymbol &Info);
-  bool initFuncDeclIndexSymbol(ValueDecl *D, FuncDeclIndexSymbol &Info);
+  bool initFuncDeclIndexSymbol(ValueDecl *D, IndexSymbol &Info);
   bool initCallRefIndexSymbol(Expr *CurrentE, Expr *ParentE, ValueDecl *D,
                               SourceLoc Loc, IndexSymbol &Info);
 
@@ -458,7 +458,7 @@ bool IndexSwiftASTWalker::startEntityDecl(ValueDecl *D) {
     return false;
 
   if (isa<FuncDecl>(D)) {
-    FuncDeclIndexSymbol Info;
+    IndexSymbol Info;
     if (initFuncDeclIndexSymbol(D, Info))
       return false;
 
@@ -818,11 +818,13 @@ static bool isTestCandidate(ValueDecl *D) {
 }
 
 bool IndexSwiftASTWalker::initFuncDeclIndexSymbol(ValueDecl *D,
-                                                  FuncDeclIndexSymbol &Info) {
+                                                  IndexSymbol &Info) {
   if (initIndexSymbol(D, D->getLoc(), /*IsRef=*/false, Info))
     return true;
 
-  Info.IsTestCandidate = isTestCandidate(D);
+  if (isTestCandidate(D))
+    Info.subKinds |= SymbolSubKind::UnitTest;
+
   if (auto Group = D->getGroupName())
     Info.group = Group.getValue();
   return false;

tools/SourceKit/include/SourceKit/Core/LangSupport.h

@@ -30,37 +30,17 @@ namespace SourceKit {
   class Context;
 
 struct EntityInfo {
-  enum TypeKind {
-    Base,
-    FuncDecl,
-    CallReference
-  };
-  TypeKind EntityType = Base;
-
   UIdent Kind;
   StringRef Name;
   StringRef USR;
   StringRef Group;
+  StringRef ReceiverUSR;
+  bool IsDynamic = false;
+  bool IsTestCandidate = false;
   unsigned Line = 0;
   unsigned Column = 0;
 
   EntityInfo() = default;
-
-protected:
-  EntityInfo(TypeKind TK) : EntityType(TK) { }
-};
-
-struct FuncDeclEntityInfo : public EntityInfo {
-  bool IsTestCandidate = false;
-
-  FuncDeclEntityInfo() : EntityInfo(FuncDecl) { }
-};
-
-struct CallRefEntityInfo : public EntityInfo {
-  StringRef ReceiverUSR;
-  bool IsDynamic = false;
-
-  CallRefEntityInfo() : EntityInfo(CallReference) { }
 };
 
 class IndexingConsumer {

tools/SourceKit/lib/SwiftLang/SwiftIndexing.cpp

@@ -92,41 +92,19 @@ class SKIndexDataConsumer : public IndexDataConsumer {
 
   template <typename F>
   bool withEntityInfo(const IndexSymbol &symbol, F func) {
-    auto initEntity = [](EntityInfo &info, const IndexSymbol &symbol) {
-      bool isRef = symbol.roles & (unsigned)SymbolRole::Reference;
-      info.Kind = SwiftLangSupport::getUIDForSymbol(symbol.kind, symbol.subKinds,
-                                                    isRef);
-      info.Name = symbol.name;
-      info.USR = symbol.USR;
-      info.Group = symbol.group;
-      info.Line = symbol.line;
-      info.Column = symbol.column;
-    };
-
-    if (symbol.roles & (unsigned)SymbolRole::Call) {
-      assert(symbol.entityType == IndexSymbol::Base);
-      CallRefEntityInfo info;
-      initEntity(info, symbol);
-      info.ReceiverUSR = symbol.receiverUSR;
-      info.IsDynamic = symbol.roles & (unsigned)SymbolRole::Dynamic;
-      return func(info);
-    }
-
-    switch (symbol.entityType) {
-    case IndexSymbol::Base: {
-      EntityInfo info;
-      initEntity(info, symbol);
-      return func(info);
-    }
-    case IndexSymbol::FuncDecl: {
-      FuncDeclEntityInfo info;
-      initEntity(info, symbol);
-      info.IsTestCandidate =
-          static_cast<const FuncDeclIndexSymbol &>(symbol).IsTestCandidate;
-      return func(info);
-    }
-    }
-    llvm_unreachable("unexpected symbol kind");
+    EntityInfo info;
+    bool isRef = symbol.roles & (unsigned)SymbolRole::Reference;
+    info.Kind = SwiftLangSupport::getUIDForSymbol(symbol.kind, symbol.subKinds,
+                                                  isRef);
+    info.Name = symbol.name;
+    info.USR = symbol.USR;
+    info.Group = symbol.group;
+    info.Line = symbol.line;
+    info.Column = symbol.column;
+    info.ReceiverUSR = symbol.receiverUSR;
+    info.IsDynamic = symbol.roles & (unsigned)SymbolRole::Dynamic;
+    info.IsTestCandidate = symbol.subKinds & SymbolSubKind::UnitTest;
+    return func(info);
   }
 
 private:

tools/SourceKit/tools/sourcekitd/lib/API/Requests.cpp

@@ -882,21 +882,12 @@ bool SKIndexingConsumer::startSourceEntity(const EntityInfo &Info) {
   if (!Info.Group.empty())
     Elem.set(KeyGroupName, Info.Group);
 
-  if (Info.EntityType == EntityInfo::FuncDecl) {
-    const FuncDeclEntityInfo &FDInfo =
-        static_cast<const FuncDeclEntityInfo &>(Info);
-    if (FDInfo.IsTestCandidate)
-      Elem.setBool(KeyIsTestCandidate, true);
-  }
-
-  if (Info.EntityType == EntityInfo::CallReference) {
-    const CallRefEntityInfo &CRInfo =
-        static_cast<const CallRefEntityInfo &>(Info);
-    if (!CRInfo.ReceiverUSR.empty())
-      Elem.set(KeyReceiverUSR, CRInfo.ReceiverUSR);
-    if (CRInfo.IsDynamic)
-      Elem.setBool(KeyIsDynamic, true);
-  }
+  if (!Info.ReceiverUSR.empty())
+    Elem.set(KeyReceiverUSR, Info.ReceiverUSR);
+  if (Info.IsDynamic)
+    Elem.setBool(KeyIsDynamic, true);
+  if (Info.IsTestCandidate)
+    Elem.setBool(KeyIsTestCandidate, true);
 
   EntitiesStack.push_back({ Info.Kind, Elem, ResponseBuilder::Array(),
                             ResponseBuilder::Array()});