Merge pull request #36422 from apple/QuietMisdreavus/enum-titles

[SymbolGraph] use fully qualified titles for enum elements

Author: QuietMisdreavus

lib/SymbolGraphGen/Symbol.cpp

@@ -120,7 +120,7 @@ void Symbol::serializeNames(llvm::json::OStream &OS) const {
     SmallVector<PathComponent, 8> PathComponents;
     getPathComponents(PathComponents);
 
-    if (isa<GenericTypeDecl>(VD)) {    
+    if (isa<GenericTypeDecl>(VD) || isa<EnumElementDecl>(VD)) {
       SmallString<64> FullyQualifiedTitle;
 
       for (const auto *It = PathComponents.begin(); It != PathComponents.end(); ++It) {

test/SourceKit/CursorInfo/cursor_symbol_graph.swift

@@ -745,7 +745,7 @@ enum MyEnum {
 // CHECKCASE:             "spelling": "someCase"
 // CHECKCASE:           }
 // CHECKCASE:         ],
-// CHECKCASE:         "title": "someCase"
+// CHECKCASE:         "title": "MyEnum.someCase"
 // CHECKCASE:       },
 // CHECKCASE:       "pathComponents": [
 // CHECKCASE:         "MyEnum",

test/SymbolGraph/Symbols/Names.swift

@@ -5,13 +5,19 @@
 // RUN: %FileCheck %s --input-file %t/Names.symbols.json --check-prefix=FUNC
 // RUN: %FileCheck %s --input-file %t/Names.symbols.json --check-prefix=INNERTYPE
 // RUN: %FileCheck %s --input-file %t/Names.symbols.json --check-prefix=INNERTYPEALIAS
+// RUN: %FileCheck %s --input-file %t/Names.symbols.json --check-prefix=INNERENUM
+// RUN: %FileCheck %s --input-file %t/Names.symbols.json --check-prefix=INNERCASE
 
 public struct MyStruct {
   public struct InnerStruct {}
 
   public typealias InnerTypeAlias = InnerStruct
 
   public func foo() {}
+
+  public enum InnerEnum {
+      case InnerCase
+  }
 }
 
 // CHECK-LABEL: "precise": "s:5Names8MyStructV"
@@ -29,3 +35,11 @@ public struct MyStruct {
 // INNERTYPEALIAS-LABEL: "precise": "s:5Names8MyStructV14InnerTypeAliasa"
 // INNERTYPEALIAS: names
 // INNERTYPEALIAS-NEXT: "title": "MyStruct.InnerTypeAlias"
+
+// INNERENUM-LABEL: "precise": "s:5Names8MyStructV9InnerEnumO",
+// INNERENUM: names
+// INNERENUM-NEXT: "title": "MyStruct.InnerEnum"
+
+// INNERCASE-LABEL: "precise": "s:5Names8MyStructV9InnerEnumO0D4CaseyA2EmF",
+// INNERCASE: names
+// INNERCASE-NEXT: "title": "MyStruct.InnerEnum.InnerCase",