[libIDE] Refactor type-interface APIs. (#3537)

Author: nkcsgexi

include/swift/AST/ASTPrinter.h

@@ -258,8 +258,6 @@ class ASTPrinter {
   /// To sanitize a malformed utf8 string to a well-formed one.
   static std::string sanitizeUtf8(StringRef Text);
   static ValueDecl* findConformancesWithDocComment(ValueDecl *VD);
-  static bool printTypeInterface(Type Ty, DeclContext *DC, std::string &Result);
-  static bool printTypeInterface(Type Ty, DeclContext *DC, llvm::raw_ostream &Out);
 
 private:
   virtual void anchor();

include/swift/IDE/ModuleInterfacePrinting.h

@@ -23,6 +23,7 @@ class ASTContext;
 class ASTPrinter;
 class ModuleDecl;
 class SourceFile;
+class Type;
 struct PrintOptions;
 
 namespace ide {
@@ -46,6 +47,12 @@ ArrayRef<StringRef> collectModuleGroups(ModuleDecl *M,
 Optional<StringRef>
 findGroupNameForUSR(ModuleDecl *M, StringRef USR);
 
+bool printTypeInterface(ModuleDecl *M, Type Ty, ASTPrinter &Printer,
+                        std::string &Error);
+
+bool printTypeInterface(ModuleDecl *M, StringRef TypeUSR, ASTPrinter &Printer,
+                        std::string &Error);
+
 void printModuleInterface(ModuleDecl *M, Optional<StringRef> Group,
                           ModuleTraversalOptions TraversalOptions,
                           ASTPrinter &Printer, const PrintOptions &Options,

lib/AST/ASTPrinter.cpp

@@ -53,7 +53,7 @@ using namespace swift;
 namespace swift {
 
 std::unique_ptr<llvm::DenseMap<StringRef, Type>>
-collectNameTypeMap(Type Ty, const DeclContext *DC) {
+collectNameTypeMap(Type Ty) {
   std::unique_ptr<llvm::DenseMap<StringRef, Type>> IdMap(
     new llvm::DenseMap<StringRef, Type>());
   Type BaseTy = Ty->getRValueType();
@@ -89,8 +89,8 @@ class PrinterArchetypeNameTransformer : public PrinterArchetypeTransformer{
   std::unique_ptr<llvm::DenseMap<StringRef, Type>> IdMap;
 
 public:
-  PrinterArchetypeNameTransformer(Type Ty, const DeclContext *DC) :
-    BaseTy(Ty->getRValueType()), IdMap(collectNameTypeMap(Ty, DC)){}
+  PrinterArchetypeNameTransformer(Type Ty) :
+    BaseTy(Ty->getRValueType()), IdMap(collectNameTypeMap(Ty)){}
 
   StringRef transform(StringRef TypeName) override {
     return TypeName;
@@ -174,7 +174,7 @@ class ArchetypeSelfTransformer : public PrinterArchetypeTransformer {
 
   ArchetypeSelfTransformer(Type BaseTy, DeclContext &DC):
     BaseTy(BaseTy->getRValueType()), DC(DC), Ctx(DC.getASTContext()),
-    NameTransformer(new PrinterArchetypeNameTransformer(BaseTy, &DC)){}
+    NameTransformer(new PrinterArchetypeNameTransformer(BaseTy)){}
 
   Type transform(Type Ty) override {
     return Ty.transform(F);
@@ -660,6 +660,10 @@ PrintOptions PrintOptions::printTypeInterface(Type T, DeclContext *DC) {
   result.PrintExtensionFromConformingProtocols = true;
   result.TransformContext = std::make_shared<ArchetypeTransformContext>(
     new ArchetypeSelfTransformer(T, *DC), T);
+  result.printExtensionContentAsMembers = [T](const ExtensionDecl *ED) {
+    return isExtensionApplied(*T->getNominalOrBoundGenericNominal()->
+                              getDeclContext(), T, ED);
+  };
   return result;
 }
 
@@ -797,29 +801,6 @@ ValueDecl* ASTPrinter::findConformancesWithDocComment(ValueDecl *VD) {
   return nullptr;
 }
 
-bool ASTPrinter::printTypeInterface(Type Ty, DeclContext *DC,
-                                    llvm::raw_ostream &OS) {
-  if (!Ty)
-    return false;
-  Ty = Ty->getRValueType();
-  PrintOptions Options = PrintOptions::printTypeInterface(Ty.getPointer(), DC);
-   if (auto ND = Ty->getNominalOrBoundGenericNominal()) {
-     Options.printExtensionContentAsMembers = [&](const ExtensionDecl *ED) {
-       return isExtensionApplied(*ND->getDeclContext(), Ty, ED);
-     };
-     ND->print(OS, Options);
-     return true;
-  }
-  return false;
-}
-
-bool ASTPrinter::printTypeInterface(Type Ty, DeclContext *DC, std::string &Buffer) {
-  llvm::raw_string_ostream OS(Buffer);
-  auto Result = printTypeInterface(Ty, DC, OS);
-  OS.str();
-  return Result;
-}
-
 void ASTPrinter::anchor() {}
 
 void ASTPrinter::printIndent() {

lib/IDE/ModuleInterfacePrinting.cpp

@@ -147,6 +147,29 @@ getUnderlyingClangModuleForImport(ImportDecl *Import) {
   return nullptr;
 }
 
+bool swift::ide::
+printTypeInterface(ModuleDecl *M, Type Ty, ASTPrinter &Printer,
+                   std::string &Error) {
+  if (!Ty)
+    return false;
+  Ty = Ty->getRValueType();
+  if (auto ND = Ty->getNominalOrBoundGenericNominal()) {
+    PrintOptions Options = PrintOptions::printTypeInterface(Ty.getPointer(), M);
+    ND->print(Printer, Options);
+    return true;
+  }
+  Error = "cannot find declaration of type.";
+  return false;
+}
+
+bool swift::ide::
+printTypeInterface(ModuleDecl *M, StringRef TypeUSR, ASTPrinter &Printer,
+                   std::string &Error) {
+  return printTypeInterface(M, getTypeFromMangledSymbolname(M->getASTContext(),
+                                                            TypeUSR, Error),
+                            Printer, Error);
+}
+
 void swift::ide::printModuleInterface(Module *M, Optional<StringRef> Group,
                                       ModuleTraversalOptions TraversalOptions,
                                       ASTPrinter &Printer,

tools/swift-ide-test/swift-ide-test.cpp

@@ -2365,8 +2365,12 @@ static int doPrintTypeInterface(const CompilerInvocation &InitInvok,
     llvm::errs() << "Cannot get type of the sema token.\n";
     return 1;
   }
-  ASTPrinter::printTypeInterface(SemaT.Ty, SemaT.DC, llvm::outs());
-  return 0;
+  StreamPrinter Printer(llvm::outs());
+  std::string Error;
+  if (printTypeInterface(SemaT.DC->getParentModule(), SemaT.Ty, Printer, Error))
+    return 0;
+  llvm::errs() << Error;
+  return 1;
 }
 
 static int doPrintTypeInterfaceForTypeUsr(const CompilerInvocation &InitInvok,
@@ -2378,22 +2382,14 @@ static int doPrintTypeInterfaceForTypeUsr(const CompilerInvocation &InitInvok,
   if (CI.setup(Invocation))
     return 1;
   CI.performSema();
-  SourceFile *SF = nullptr;
-  for (auto Unit : CI.getMainModule()->getFiles()) {
-    SF = dyn_cast<SourceFile>(Unit);
-    if (SF)
-      break;
-  }
-  assert(SF && "no source file?");
+  DeclContext *DC = CI.getMainModule()->getModuleContext();
+  assert(DC && "no decl context?");
+  StreamPrinter Printer(llvm::outs());
   std::string Error;
-  Type ReconstructedType = getTypeFromMangledSymbolname(SF->getASTContext(),
-                                                        Usr, Error);
-  if (!Error.empty()) {
-    llvm::errs() << Error << '\n';
-    return 1;
-  }
-  ASTPrinter::printTypeInterface(ReconstructedType, SF, llvm::outs());
-  return 0;
+  if (printTypeInterface(DC->getParentModule(), Usr, Printer, Error))
+    return 0;
+  llvm::errs() << Error;
+  return 1;
 }
 
 //===----------------------------------------------------------------------===//