[TypeInterface] Replace generic params with instantiated type when printing type-specific interface.

nkcsgexi · nkcsgexi · commit 01ec4f2ebdd6 · 2015-11-17T19:12:30.000-08:00
diff --git a/include/swift/AST/PrintOptions.h b/include/swift/AST/PrintOptions.h
@@ -20,6 +20,7 @@ namespace swift {
 class GenericParamList;
 class CanType;
 class ExtensionDecl;
+class TypeBase;
 enum DeclAttrKind : unsigned;
 
 /// Options for printing AST nodes.
@@ -187,6 +188,12 @@ struct PrintOptions {
   /// \brief Print types with alternative names from their canonical names.
   llvm::DenseMap<CanType, Identifier> *AlternativeTypeNames = nullptr;
 
+  /// \brief When printing a type interface, register the type to print.
+  TypeBase *TypeToPrint = nullptr;
+
+  /// \brief When printing a type interface, whether we instantiate archetypes.
+  bool InstantiateArchetype = false;
+
   /// Retrieve the set of options for verbose printing to users.
   static PrintOptions printVerbose() {
     PrintOptions result;
@@ -227,6 +234,13 @@ struct PrintOptions {
     return result;
   }
 
+  static PrintOptions printTypeInterface(TypeBase *T) {
+    PrintOptions result = printInterface();
+    result.TypeToPrint = T;
+    result.InstantiateArchetype = true;
+    return result;
+  }
+
   /// Retrive the print options that are suitable to print the testable interface.
   static PrintOptions printTestableInterface() {
     PrintOptions result = printInterface();
diff --git a/lib/AST/ASTPrinter.cpp b/lib/AST/ASTPrinter.cpp
@@ -74,7 +74,7 @@ bool ASTPrinter::printTypeInterface(Type Ty, llvm::raw_ostream &OS) {
   if (!Ty)
     return false;
   Ty = Ty->getRValueType();
-  PrintOptions Options = PrintOptions::printInterface();
+  PrintOptions Options = PrintOptions::printTypeInterface(Ty.getPointer());
    if (auto ND = Ty->getNominalOrBoundGenericNominal()) {
      Options.printExtensionContentAsMembers = [&](const ExtensionDecl *ED) {
        return isExtensionApplied(*ND->getDeclContext(), Ty, ED);
@@ -594,18 +594,31 @@ void PrintAST::printGenericParams(GenericParamList *Params) {
 
   Printer << "<";
   bool IsFirst = true;
-  for (auto GP : Params->getParams()) {
-    if (IsFirst) {
-      IsFirst = false;
-    } else {
-      Printer << ", ";
+  SmallVector<Type, 4> Scrach;
+  if (Options.InstantiateArchetype) {
+    auto ArgArr = Options.TypeToPrint->getAllGenericArgs(Scrach);
+    for (auto Arg : ArgArr) {
+      if (IsFirst) {
+        IsFirst = false;
+      } else {
+        Printer << ", ";
+      }
+      auto NM = Arg->getAnyNominal();
+      assert(NM && "Cannot get nominal type.");
+      Printer << NM->getNameStr();
     }
-
-    Printer.printName(GP->getName());
-    printInherited(GP);
+  } else {
+    for (auto GP : Params->getParams()) {
+      if (IsFirst) {
+        IsFirst = false;
+      } else {
+        Printer << ", ";
+      }
+      Printer.printName(GP->getName());
+      printInherited(GP);
+    }
+    printWhereClause(Params->getRequirements());
   }
-
-  printWhereClause(Params->getRequirements());
   Printer << ">";
 }
 
diff --git a/test/IDE/print_type_interface.swift b/test/IDE/print_type_interface.swift
@@ -48,13 +48,13 @@ class C2 {
 // RUN: %target-swift-ide-test -print-type-interface -pos=43:6 -source-filename %s | FileCheck %s -check-prefix=TYPE3
 
 
-// TYPE2:      public class D<T> {
+// TYPE2:      public class D<T1> {
 // TYPE2-NEXT:   public func foo()
 // TYPE2-NEXT:   public func conditionalFunc1()
 // TYPE2-NEXT:   public func unconditionalFunc1()
 // TYPE2-NEXT: }
 
-// TYPE3:      public class D<T> {
+// TYPE3:      public class D<Int> {
 // TYPE3-NEXT:   public func foo()
 // TYPE3-NEXT:   public func unconditionalFunc1()
 // TYPE3-NEXT: }
