Merge pull request #15035 from slavapestov/print-extended-type-name

AST: Simplify printExtendedTypeName()

Author: slavapestov

lib/AST/ASTPrinter.cpp

@@ -1758,28 +1758,13 @@ void PrintAST::visitImportDecl(ImportDecl *decl) {
 
 static void printExtendedTypeName(Type ExtendedType, ASTPrinter &Printer,
                                   PrintOptions Options) {
-  auto Nominal = ExtendedType->getAnyNominal();
-  assert(Nominal && "extension of non-nominal type");
-  if (auto nt = ExtendedType->getAs<NominalType>()) {
-    if (auto ParentType = nt->getParent()) {
-      if (auto *ParentNT = ParentType->getAs<NominalOrBoundGenericNominalType>()) {
-        // Avoid using the parent type directly because it can be bound
-        // generic type and sugared.
-        ParentNT->getDecl()->getDeclaredType().print(Printer, Options);
-      } else {
-        ParentType.print(Printer, Options);
-      }
-      Printer << ".";
-    }
-  }
+  Options.FullyQualifiedTypes = false;
+  Options.FullyQualifiedTypesIfAmbiguous = false;
 
-  // Respect alias type.
-  if (isa<NameAliasType>(ExtendedType.getPointer())) {
-    ExtendedType.print(Printer, Options);
-    return;
-  }
+  // Strip off generic arguments, if any.
+  auto Ty = ExtendedType->getAnyNominal()->getDeclaredType();
 
-  Printer.printTypeRef(ExtendedType, Nominal, Nominal->getName());
+  Ty->print(Printer, Options);
 }
 
 void PrintAST::printSynthesizedExtension(Type ExtendedType,

test/IDE/print_synthesized_extensions.swift

@@ -294,7 +294,7 @@ extension S13 : P5 {
 // CHECK9-NEXT:    <decl:Func>public func <loc>ef5(<decl:Param>t: <ref:Struct>S5</ref></decl>)</loc></decl>
 // CHECK9-NEXT: }</synthesized>
 
-// CHECK10: <synthesized>extension <ref:module>print_synthesized_extensions</ref>.<ref:Struct>S7</ref>.<ref:Struct>S8</ref> {
+// CHECK10: <synthesized>extension <ref:Struct>S7</ref>.<ref:Struct>S8</ref> {
 // CHECK10-NEXT:     <decl:Func>public func <loc>p3Func(<decl:Param>i: <ref:Struct>Int</ref></decl>)</loc> -> <ref:Struct>Int</ref></decl>
 // CHECK10-NEXT:     <decl:Func>public func <loc>ef5(<decl:Param>t: <ref:Struct>S5</ref></decl>)</loc></decl>
 // CHECK10-NEXT: }</synthesized>