[SymbolGraph] add a USR for RHS types in generic conformances (#36242)

rdar://70442228

Author: QuietMisdreavus

lib/SymbolGraphGen/FormatVersion.h

@@ -15,6 +15,6 @@
 
 #define SWIFT_SYMBOLGRAPH_FORMAT_MAJOR 0
 #define SWIFT_SYMBOLGRAPH_FORMAT_MINOR 5
-#define SWIFT_SYMBOLGRAPH_FORMAT_PATCH 1
+#define SWIFT_SYMBOLGRAPH_FORMAT_PATCH 2
 
 #endif // SWIFT_SYMBOLGRAPHGEN_FORMATVERSION_H

lib/SymbolGraphGen/JSON.cpp

@@ -16,6 +16,7 @@
 #include "swift/AST/GenericParamList.h"
 #include "swift/AST/Module.h"
 #include "swift/AST/Type.h"
+#include "swift/AST/USRGeneration.h"
 #include "JSON.h"
 
 void swift::symbolgraphgen::serialize(const llvm::VersionTuple &VT,
@@ -105,6 +106,16 @@ void swift::symbolgraphgen::serialize(const Requirement &Req,
     OS.attribute("kind", Kind);
     OS.attribute("lhs", Req.getFirstType()->getString());
     OS.attribute("rhs", Req.getSecondType()->getString());
+    
+    // If the RHS type has a USR we can link to, add it to the output
+    if (auto *TyDecl = Req.getSecondType()->getAnyNominal()) {
+      SmallString<256> USR;
+      {
+        llvm::raw_svector_ostream SOS(USR);
+        ide::printDeclUSR(TyDecl, SOS);
+      }
+      OS.attribute("rhsPrecise", USR.str());
+    }
   });
 }
 

test/SymbolGraph/Symbols/Mixins/Extension/IgnoreInherited.swift

@@ -22,11 +22,13 @@ extension S: P where T: Sequence, T.Element == Int {
 // CHECK-NEXT:   {
 // CHECK-NEXT:     "kind": "conformance",
 // CHECK-NEXT:     "lhs": "T",
-// CHECK-NEXT:     "rhs": "Sequence"
+// CHECK-NEXT:     "rhs": "Sequence",
+// CHECK-NEXT:     "rhsPrecise": "s:ST"
 // CHECK-NEXT:   },
 // CHECK-NEXT:   {
 // CHECK-NEXT:     "kind": "sameType",
 // CHECK-NEXT:     "lhs": "T.Element",
-// CHECK-NEXT:     "rhs": "Int"
+// CHECK-NEXT:     "rhs": "Int",
+// CHECK-NEXT:     "rhsPrecise": "s:Si"
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]

test/SymbolGraph/Symbols/Mixins/Generics/ConstraintsOnLocalContext.swift

@@ -17,6 +17,7 @@ public func foo<T: Sequence>(x: T) {}
 //               {
 // CHECK:          "kind": "conformance"
 // CHECK-NEXT:     "lhs": "T"
-// CHECK-NEXT:     "rhs": "Sequence"
+// CHECK-NEXT:     "rhs": "Sequence",
+// CHECK-NEXT:     "rhsPrecise": "s:ST"
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]

test/SymbolGraph/Symbols/Mixins/Generics/ConstraintsOnOuterContext.swift

@@ -18,10 +18,12 @@ public struct MyStruct<S: Sequence> {
 // CHECK:          "kind": "conformance"
 // CHECK-NEXT:     "lhs": "S"
 // CHECK-NEXT:     "rhs": "Sequence"
-//               },
+// CHECK-NEXT:     "rhsPrecise": "s:ST"
+// CHECK-NEXT:   },
 //               {
 // CHECK:          "kind": "sameType"
 // CHECK-NEXT:     "lhs": "S.Element"
 // CHECK-NEXT:     "rhs": "Int"
+// CHECK-NEXT:     "rhsPrecise": "s:Si"
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]

test/SymbolGraph/Symbols/Mixins/Generics/WhereClause.swift

@@ -18,5 +18,6 @@ public func foo<T>(x: T) where T: Sequence {}
 // CHECK:          "kind": "conformance"
 // CHECK-NEXT:     "lhs": "T"
 // CHECK-NEXT:     "rhs": "Sequence"
+// CHECK-NEXT:     "rhsPrecise": "s:ST"
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]