Fix a misplaced ( and add more tests

Author: owenca

clang/test/Format/dry-run-warning.cpp

@@ -3,10 +3,20 @@
 // RUN: echo '}' >> %t.json
 
 // RUN: clang-format -n -style=LLVM %t.json 2>&1 | FileCheck %s -allow-empty
-// CHECK-NOT: warning
 
 // RUN: clang-format -n -style=LLVM < %t.json 2>&1 \
 // RUN:   | FileCheck %s -check-prefix=CHECK2 -strict-whitespace
-// CHECK2: warning: code should be clang-formatted
+
+// RUN: echo '{' > %t.json
+// RUN: echo '  "married" : true' >> %t.json
+// RUN: echo '}' >> %t.json
+
+// RUN: clang-format -n -style=LLVM < %t.json 2>&1 | FileCheck %s -allow-empty
+
+// RUN: clang-format -n -style=LLVM %t.json 2>&1 \
+// RUN:   | FileCheck %s -check-prefix=CHECK2 -strict-whitespace
 
 // RUN: rm %t.json
+
+// CHECK-NOT: warning
+// CHECK2: warning: code should be clang-formatted

clang/tools/clang-format/ClangFormat.cpp

@@ -511,7 +511,7 @@ static bool format(StringRef FileName, bool ErrorOnIncompleteFormat = false) {
   Replaces = Replaces.merge(FormatChanges);
   if (OutputXML || DryRun) {
     if (DryRun) {
-      return (Replaces.size() > IsJson ? 1 : 0) &&
+      return Replaces.size() > (IsJson ? 1 : 0) &&
              emitReplacementWarnings(Replaces, AssumedFileName, Code);
     }
     outputXML(Replaces, FormatChanges, Status, Cursor, CursorPosition);