[ASTPrinter] Move up the logic printing the module disambiguation

Author: xymus

include/swift/AST/ASTPrinter.h

@@ -166,8 +166,7 @@ class ASTPrinter {
       PrintNameContext NameContext = PrintNameContext::Normal);
 
   /// Called when printing the referenced name of a module.
-  virtual void printModuleRef(ModuleEntity Mod, Identifier Name,
-                              const PrintOptions &Options);
+  virtual void printModuleRef(ModuleEntity Mod, Identifier Name);
 
   /// Called before printing a synthesized extension.
   virtual void printSynthesizedExtensionPre(const ExtensionDecl *ED,

lib/AST/ASTPrinter.cpp

@@ -367,11 +367,7 @@ void ASTPrinter::printTypeRef(Type T, const TypeDecl *RefTo, Identifier Name,
   printName(Name, Context);
 }
 
-void ASTPrinter::printModuleRef(ModuleEntity Mod, Identifier Name,
-                                const PrintOptions &Options) {
-  if (Options.AliasModuleNames)
-    printTextImpl(MODULE_DISAMBIGUATING_PREFIX);
-
+void ASTPrinter::printModuleRef(ModuleEntity Mod, Identifier Name) {
   printName(Name);
 }
 
@@ -2509,7 +2505,7 @@ void PrintAST::visitImportDecl(ImportDecl *decl) {
                              Name = Declaring->getRealName();
                          }
                        }
-                       Printer.printModuleRef(Mods.front(), Name, Options);
+                       Printer.printModuleRef(Mods.front(), Name);
                        Mods = Mods.slice(1);
                      } else {
                        Printer << Elem.Item.str();
@@ -5397,7 +5393,12 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
       }
     }
 
-    Printer.printModuleRef(Mod, Name, Options);
+    if (Options.AliasModuleNames) {
+      auto nameTwine = MODULE_DISAMBIGUATING_PREFIX + Name.str();
+      Name = Mod->getASTContext().getIdentifier(nameTwine.str());
+    }
+
+    Printer.printModuleRef(Mod, Name);
     Printer << ".";
   }
 
@@ -5748,8 +5749,7 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
     Printer << "module<";
     // Should print the module real name in case module aliasing is
     // used (see -module-alias), since that's the actual binary name.
-    Printer.printModuleRef(T->getModule(), T->getModule()->getRealName(),
-                           Options);
+    Printer.printModuleRef(T->getModule(), T->getModule()->getRealName());
     Printer << ">";
   }
 

lib/AST/TypeRepr.cpp

@@ -269,7 +269,7 @@ void ComponentIdentTypeRepr::printImpl(ASTPrinter &Printer,
                                        const PrintOptions &Opts) const {
   if (auto *TD = dyn_cast_or_null<TypeDecl>(getBoundDecl())) {
     if (auto MD = dyn_cast<ModuleDecl>(TD))
-      Printer.printModuleRef(MD, getNameRef().getBaseIdentifier(), Opts);
+      Printer.printModuleRef(MD, getNameRef().getBaseIdentifier());
     else
       Printer.printTypeRef(Type(), TD, getNameRef().getBaseIdentifier());
   } else {

lib/IDE/ModuleInterfacePrinting.cpp

@@ -80,9 +80,8 @@ class ClangCommentPrinter : public ASTPrinter {
                     PrintNameContext NameContext) override {
     return OtherPrinter.printTypeRef(T, TD, Name, NameContext);
   }
-  void printModuleRef(ModuleEntity Mod, Identifier Name,
-                      const PrintOptions &Options) override {
-    return OtherPrinter.printModuleRef(Mod, Name, Options);
+  void printModuleRef(ModuleEntity Mod, Identifier Name) override {
+    return OtherPrinter.printModuleRef(Mod, Name);
   }
   void printSynthesizedExtensionPre(const ExtensionDecl *ED,
                                     TypeOrExtensionDecl Target,

tools/SourceKit/lib/SwiftLang/SwiftEditorInterfaceGen.cpp

@@ -185,11 +185,10 @@ class AnnotatingPrinter : public StreamPrinter {
     StreamPrinter::printTypeRef(T, TD, Name, NameContext);
   }
 
-  void printModuleRef(ModuleEntity Mod, Identifier Name,
-                      const PrintOptions &Options) override {
+  void printModuleRef(ModuleEntity Mod, Identifier Name) override {
     unsigned StartOffset = OS.tell();
     Info.References.emplace_back(Mod, StartOffset, Name.str().size());
-    StreamPrinter::printModuleRef(Mod, Name, Options);
+    StreamPrinter::printModuleRef(Mod, Name);
   }
 };
 

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

@@ -2841,10 +2841,9 @@ class AnnotatingPrinter : public StreamPrinter {
     StreamPrinter::printTypeRef(T, TD, Name, NameContext);
     OS << "</ref>";
   }
-  void printModuleRef(ModuleEntity Mod, Identifier Name,
-                      const PrintOptions &Options) override {
+  void printModuleRef(ModuleEntity Mod, Identifier Name) override {
     OS << "<ref:module>";
-    StreamPrinter::printModuleRef(Mod, Name, Options);
+    StreamPrinter::printModuleRef(Mod, Name);
     OS << "</ref>";
   }
 };