[Constraint] Add indentations to conj/disjunction printing.

This indents added/removed conj/disjunction constraints
and AST printed with conjunctions.

Author: Amritpan Kaur

include/swift/Sema/ConstraintSystem.h

@@ -4425,7 +4425,8 @@ class ConstraintSystem {
     if (isDebugMode() && getPhase() == ConstraintSystemPhase::Solving) {
       auto &log = llvm::errs();
       log.indent(solverState->getCurrentIndent() + 2) << "(added constraint: ";
-      constraint->print(log, &getASTContext().SourceMgr);
+      constraint->print(log, &getASTContext().SourceMgr,
+                        solverState->getCurrentIndent() + 4);
       log << ")\n";
     }
 
@@ -4443,7 +4444,8 @@ class ConstraintSystem {
       auto &log = llvm::errs();
       log.indent(solverState->getCurrentIndent() + 2)
           << "(removed constraint: ";
-      constraint->print(log, &getASTContext().SourceMgr);
+      constraint->print(log, &getASTContext().SourceMgr,
+                        solverState->getCurrentIndent() + 4);
       log << ")\n";
     }
 

lib/Sema/Constraint.cpp

@@ -357,18 +357,21 @@ void Constraint::print(llvm::raw_ostream &Out, SourceManager *sm, unsigned inden
                  return false;
                });
 
-    interleave(sortedConstraints,
-               [&](Constraint *constraint) {
-                 if (constraint->isDisabled())
-                   Out << ">  [disabled] ";
-                 else if (constraint->isFavored())
-                   Out << ">  [favored]  ";
-                 else
-                   Out << ">             ";
-                 constraint->print(Out, sm,
-                   /*skipLocator=*/constraint->getLocator() == Locator);
-               },
-               [&] { Out << "\n"; });
+    interleave(
+        sortedConstraints,
+        [&](Constraint *constraint) {
+          Out.indent(indent);
+          if (constraint->isDisabled())
+            Out << ">  [disabled] ";
+          else if (constraint->isFavored())
+            Out << ">  [favored]  ";
+          else
+            Out << ">             ";
+          constraint->print(Out, sm, indent,
+                            /*skipLocator=*/constraint->getLocator() ==
+                                Locator);
+        },
+        [&] { Out << "\n"; });
     return;
   }