Print type inheritances and dictionary types without a space before the colon by default

include/swift/AST/ASTPrinter.h

@@ -311,6 +311,14 @@ class ASTPrinter {
     PendingNewlines++;
   }
 
+  void printColonForType(const PrintOptions &options)
+  {
+    if (options.PrintSpaceBeforeInheritance) {
+      *this << ' ';
+    }
+    *this << ": ";
+  }
+
   void forceNewlines() {
     if (PendingNewlines > 0) {
       llvm::SmallString<16> Str;

include/swift/AST/GenericParamList.h

@@ -215,8 +215,8 @@ class RequirementRepr {
   }
 
   SWIFT_DEBUG_DUMP;
-  void print(raw_ostream &OS) const;
-  void print(ASTPrinter &Printer) const;
+  void print(raw_ostream &OS, const PrintOptions &Options = PrintOptions()) const;
+  void print(ASTPrinter &Printer, const PrintOptions &Options = PrintOptions()) const;
 };
 
 /// GenericParamList - A list of generic parameters that is part of a generic
@@ -400,7 +400,7 @@ class alignas(RequirementRepr) TrailingWhereClause final :
     return SourceRange(WhereLoc, EndLoc);
   }
 
-  void print(llvm::raw_ostream &OS, bool printWhereKeyword) const;
+  void print(llvm::raw_ostream &OS, const PrintOptions &PO, bool printWhereKeyword) const;
 
 };
 

include/swift/AST/PrintOptions.h

@@ -585,7 +585,7 @@ struct PrintOptions {
 
   /// Whether to print a space before the `:` of an inheritance list in a type
   /// decl.
-  bool PrintSpaceBeforeInheritance = true;
+  bool PrintSpaceBeforeInheritance = false;
 
   /// Whether to print feature checks for compatibility with older Swift
   /// compilers that might parse the result.
@@ -771,6 +771,7 @@ struct PrintOptions {
   static PrintOptions printQualifiedSILType() {
     PrintOptions result = PrintOptions::printSIL();
     result.FullyQualifiedTypesIfAmbiguous = true;
+    result.PrintSpaceBeforeInheritance = true;
     return result;
   }
 

lib/AST/ASTDumper.cpp

@@ -1471,7 +1471,7 @@ namespace {
         }, label);
       } else {
         printFieldQuotedRaw([&](raw_ostream &OS) {
-          Where->print(OS, /*printWhereKeyword*/ false);
+          Where->print(OS, PrintOptions(), /*printWhereKeyword*/ false);
         }, label);
       }
     };

lib/AST/ASTPrinter.cpp

@@ -898,6 +898,7 @@ class PrintAST : public ASTVisitor<PrintAST> {
       FreshOptions.TransformContext = options.TransformContext;
       FreshOptions.CurrentModule = options.CurrentModule;
       FreshOptions.FullyQualifiedTypesIfAmbiguous = options.FullyQualifiedTypesIfAmbiguous;
+      FreshOptions.PrintSpaceBeforeInheritance = options.PrintSpaceBeforeInheritance;
       T.print(Printer, FreshOptions);
       return;
     }
@@ -1979,7 +1980,7 @@ void PrintAST::printSingleDepthOfGenericSignature(
                               PrintNameContext::GenericParameter);
 
             if (param->isValue()) {
-              Printer << " : ";
+              Printer.printColonForType(Options);
               printType(param->getValueType());
             }
 
@@ -1992,7 +1993,7 @@ void PrintAST::printSingleDepthOfGenericSignature(
             printType(param);
 
             if (param->isValue()) {
-              Printer << " : ";
+              Printer.printColonForType(Options);
               printType(param->getValueType());
             }
           }
@@ -2036,7 +2037,7 @@ void PrintAST::printSingleDepthOfGenericSignature(
         if (printRequirements)
           Printer << " " << tok::kw_where << " ";
         else
-          Printer << " : ";
+          Printer.printColonForType(Options);
 
         isFirstReq = false;
       } else {
@@ -2085,7 +2086,8 @@ void PrintAST::printSingleDepthOfGenericSignature(
         if (printRequirements)
           Printer << " " << tok::kw_where << " ";
         else
-          Printer << " : ";
+
+        Printer.printColonForType(Options);
 
         isFirstReq = false;
       } else {
@@ -2171,21 +2173,23 @@ void PrintAST::printRequirement(const Requirement &req) {
     printTransformedType(req.getFirstType());
     Printer << ", ";
     printTransformedType(req.getSecondType());
-    Printer << ")) : Any";
+    Printer << "))";
+    Printer.printColonForType(Options);
+    Printer << "Any";
     return;
   case RequirementKind::Layout:
     if (isPackRequirement)
       Printer << "repeat ";
     printTransformedType(req.getFirstType());
-    Printer << " : ";
+    Printer.printColonForType(Options);
     req.getLayoutConstraint()->print(Printer, Options);
     return;
   case RequirementKind::Conformance:
   case RequirementKind::Superclass:
     if (isPackRequirement)
       Printer << "repeat ";
     printTransformedType(req.getFirstType());
-    Printer << " : ";
+    Printer.printColonForType(Options);
     break;
   case RequirementKind::SameType:
     if (isPackRequirement)
@@ -2202,7 +2206,7 @@ void PrintAST::printRequirement(const InverseRequirement &inverse,
   if (!forInherited) {
     Printer.callPrintStructurePre(PrintStructureKind::GenericRequirement);
     printTransformedType(inverse.subject);
-    Printer << " : ";
+    Printer.printColonForType(Options);
     Printer.printStructurePost(PrintStructureKind::GenericRequirement);
   }
 
@@ -2930,10 +2934,7 @@ void PrintAST::printInherited(const Decl *decl) {
   if (TypesToPrint.empty())
     return;
 
-  if (Options.PrintSpaceBeforeInheritance) {
-    Printer << " ";
-  }
-  Printer << ": ";
+  Printer.printColonForType(Options);
 
   interleave(TypesToPrint, [&](InheritedEntry inherited) {
     printTypeLoc(inherited, [&] {
@@ -4627,8 +4628,10 @@ void PrintAST::visitInfixOperatorDecl(InfixOperatorDecl *decl) {
     [&]{
       Printer.printName(decl->getName());
     });
-  if (auto *group = decl->getPrecedenceGroup())
-    Printer << " : " << group->getName();
+  if (auto *group = decl->getPrecedenceGroup()) {
+    Printer.printColonForType(Options);
+    Printer << group->getName();
+  }
 }
 
 void PrintAST::visitPrecedenceGroupDecl(PrecedenceGroupDecl *decl) {
@@ -6336,7 +6339,7 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
       if (T->isDictionary()) {
         Printer << "[";
         visit(T->getGenericArgs()[0]);
-        Printer << " : ";
+        Printer.printColonForType(Options);
         visit(T->getGenericArgs()[1]);
         Printer << "]";
         return;
@@ -7123,7 +7126,7 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
     } else {
       Printer << "[";
       visit(T->getKeyType());
-      Printer << " : ";
+      Printer << ": ";
       visit(T->getValueType());
       Printer << "]";
     }
@@ -8160,43 +8163,43 @@ swift::getInheritedForPrinting(
 //  Generic param list printing.
 //===----------------------------------------------------------------------===//
 
-void RequirementRepr::print(raw_ostream &out) const {
+void RequirementRepr::print(raw_ostream &out, const PrintOptions &options) const {
   StreamPrinter printer(out);
-  print(printer);
+  print(printer, options);
 }
 
-void RequirementRepr::print(ASTPrinter &out) const {
+void RequirementRepr::print(ASTPrinter &out, const PrintOptions &options) const {
   auto printLayoutConstraint =
       [&](const LayoutConstraintLoc &LayoutConstraintLoc) {
-        LayoutConstraintLoc.getLayoutConstraint()->print(out, PrintOptions());
+        LayoutConstraintLoc.getLayoutConstraint()->print(out, options);
       };
 
   switch (getKind()) {
   case RequirementReprKind::LayoutConstraint:
     if (auto *repr = getSubjectRepr()) {
-      repr->print(out, PrintOptions());
+      repr->print(out, options);
     }
-    out << " : ";
+    out.printColonForType(options);
     printLayoutConstraint(getLayoutConstraintLoc());
     break;
 
   case RequirementReprKind::TypeConstraint:
     if (auto *repr = getSubjectRepr()) {
-      repr->print(out, PrintOptions());
+      repr->print(out, options);
     }
-    out << " : ";
+    out.printColonForType(options);
     if (auto *repr = getConstraintRepr()) {
-      repr->print(out, PrintOptions());
+      repr->print(out, options);
     }
     break;
 
   case RequirementReprKind::SameType:
     if (auto *repr = getFirstTypeRepr()) {
-      repr->print(out, PrintOptions());
+      repr->print(out, options);
     }
     out << " == ";
     if (auto *repr = getSecondTypeRepr()) {
-      repr->print(out, PrintOptions());
+      repr->print(out, options);
     }
     break;
   }
@@ -8209,6 +8212,7 @@ void GenericParamList::print(raw_ostream &out, const PrintOptions &PO) const {
 
 static void printTrailingRequirements(ASTPrinter &Printer,
                                       ArrayRef<RequirementRepr> Reqs,
+                                      const PrintOptions &Options,
                                       bool printWhereKeyword) {
   if (Reqs.empty())
     return;
@@ -8219,7 +8223,7 @@ static void printTrailingRequirements(ASTPrinter &Printer,
       Reqs,
       [&](const RequirementRepr &req) {
         Printer.callPrintStructurePre(PrintStructureKind::GenericRequirement);
-        req.print(Printer);
+        req.print(Printer, Options);
         Printer.printStructurePost(PrintStructureKind::GenericRequirement);
       },
       [&] { Printer << ", "; });
@@ -8233,7 +8237,7 @@ void GenericParamList::print(ASTPrinter &Printer,
       [&](const GenericTypeParamDecl *P) {
         Printer << P->getName();
         if (!P->getInherited().empty()) {
-          Printer << " : ";
+          Printer.printColonForType(PO);
 
           auto loc = P->getInherited().getEntry(0);
           if (willUseTypeReprPrinting(loc, nullptr, PO)) {
@@ -8245,13 +8249,15 @@ void GenericParamList::print(ASTPrinter &Printer,
       },
       [&] { Printer << ", "; });
 
-  printTrailingRequirements(Printer, getRequirements(),
+  printTrailingRequirements(Printer, getRequirements(), PO,
                             /*printWhereKeyword*/ true);
   Printer << '>';
 }
 
 void TrailingWhereClause::print(llvm::raw_ostream &OS,
+                                const PrintOptions &PO,
                                 bool printWhereKeyword) const {
   StreamPrinter Printer(OS);
-  printTrailingRequirements(Printer, getRequirements(), printWhereKeyword);
+  printTrailingRequirements(Printer, getRequirements(), PO,
+                            printWhereKeyword);
 }

lib/AST/RequirementMachine/RequirementLowering.cpp

@@ -1195,7 +1195,7 @@ TypeAliasRequirementsRequest::evaluate(Evaluator &evaluator,
         if (!assocType->getInherited().empty())
           out << ", ";
 
-        whereClause->print(out, /*printWhereKeyword*/false);
+        whereClause->print(out, PrintOptions(), /*printWhereKeyword*/false);
       }
     }
     return result;

lib/AST/TypeRepr.cpp

@@ -500,7 +500,7 @@ void DictionaryTypeRepr::printImpl(ASTPrinter &Printer,
                                    const PrintOptions &Opts) const {
   Printer << "[";
   printTypeRepr(Key, Printer, Opts);
-  Printer << " : ";
+  Printer.printColonForType(Opts);
   printTypeRepr(Value, Printer, Opts);
   Printer << "]";
 }

lib/Frontend/ModuleInterfaceSupport.cpp

@@ -822,16 +822,22 @@ class InheritedProtocolCollector {
         out << "@_spi(" << DummyProtocolName << ")\n";
       out << "@available(*, unavailable)\nextension ";
       nominal->getDeclaredType().print(out, printOptions);
-      out << " : ";
+      if (printOptions.PrintSpaceBeforeInheritance) {
+        out << ' ';
+      }
+      out << ": ";
       llvm::interleave(
           conformanceProtos,
           [&out, &printOptions](const ProtocolType *protoTy) {
             protoTy->print(out, printOptions);
           },
           [&out] { out << ", "; });
       out << " where "
-          << nominal->getGenericSignature().getGenericParams()[0]->getName()
-          << " : " << DummyProtocolName << " {}\n";
+          << nominal->getGenericSignature().getGenericParams()[0]->getName();
+          if (printOptions.PrintSpaceBeforeInheritance) {
+            out << ' ';
+          }
+          out << ": " << DummyProtocolName << " {}\n";
     };
 
     // We have to print conformances for invertible protocols in separate

lib/SIL/IR/SILPrinter.cpp

@@ -4844,6 +4844,7 @@ PrintOptions PrintOptions::printSIL(const SILPrintContext *ctx) {
   result.AbstractAccessors = false;
   result.PrintForSIL = true;
   result.PrintInSILBody = true;
+  result.PrintSpaceBeforeInheritance = true;
   result.PreferTypeRepr = false;
   result.OpaqueReturnTypePrinting =
      OpaqueReturnTypePrintingMode::StableReference;

test/APINotes/properties.swift

@@ -7,7 +7,7 @@
 // REQUIRES: objc_interop
 
 
-// CHECK-BOTH-LABEL: class TestProperties : Base {
+// CHECK-BOTH-LABEL: class TestProperties: Base {
 
 // CHECK-BOTH-DAG: func accessorsOnly() -> Any
 // CHECK-BOTH-DAG: func setAccessorsOnly(_ accessorsOnly: Any)
@@ -34,7 +34,7 @@
 
 // CHECK-BOTH: {{^}$}}
 
-// CHECK-BOTH-LABEL: class TestPropertiesSub : TestProperties {
+// CHECK-BOTH-LABEL: class TestPropertiesSub: TestProperties {
 // CHECK-BOTH-DAG: func accessorsOnly() -> Any
 // CHECK-BOTH-DAG: func setAccessorsOnly(_ accessorsOnly: Any)
 // CHECK-BOTH-DAG: class func accessorsOnlyForClass() -> Any