[ASTPrinter] Tweak #if print

* Removed extra newlines.
* Print '/* condition */' for condition part.

Author: rintaro

lib/AST/ASTPrinter.cpp

@@ -2365,18 +2365,15 @@ void PrintAST::visitIfConfigDecl(IfConfigDecl *ICD) {
 
   for (auto &Clause : ICD->getClauses()) {
     if (&Clause == &*ICD->getClauses().begin())
-      Printer << tok::pound_if << " "; // FIXME: print condition
+      Printer << tok::pound_if << " /* condition */"; // FIXME: print condition
     else if (Clause.Cond)
-      Printer << tok::pound_elseif << ""; // FIXME: print condition
+      Printer << tok::pound_elseif << " /* condition */"; // FIXME: print condition
     else
       Printer << tok::pound_else;
+    printASTNodes(Clause.Elements);
     Printer.printNewline();
-    if (printASTNodes(Clause.Elements)) {
-      Printer.printNewline();
-      indent();
-    }
+    indent();
   }
-  Printer.printNewline();
   Printer << tok::pound_endif;
 }
 

test/IDE/print_ast_non_typechecked.swift

@@ -4,3 +4,24 @@ class C {
 
 // RUN: %target-swift-ide-test -print-ast-not-typechecked -source-filename %s | %FileCheck %s -check-prefix=CHECK1
 // CHECK1: func foo(s: Int)
+
+#if BAR
+func bar() {}
+#elseif BAZ
+func baz() {}
+#else
+func qux() {}
+#endif
+
+// CHECK1: {{^}}#if /* condition */
+// CHECK1: {{^}}  func bar() {
+// CHECK1: {{^}}  }
+// CHECK1: {{^}}#elseif /* condition */
+// CHECK1: {{^}}  func baz() {
+// CHECK1: {{^}}  }
+// CHECK1: {{^}}#else
+// CHECK1: {{^}}  func qux() {
+// CHECK1: {{^}}  }
+// CHECK1: {{^}}#endif
+// CHECK1: {{^}}func qux() {
+// CHECK1: {{^}}}

test/IDE/print_source_file_interface_1.swift.result

@@ -3,8 +3,6 @@
 
 // More blah blah.
 
-
-
 import Swift
 
 internal class FooDisabled {