summaryrefslogtreecommitdiffstats
path: root/clang/unittests/Format
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2016-07-12 15:45:53 +0000
committerDaniel Jasper <djasper@google.com>2016-07-12 15:45:53 +0000
commitd9d8da2821c11654de4f7c1ea33e51c5f68e37c7 (patch)
treedd46c513dc55280be3e4fde1d59334377d48e3f3 /clang/unittests/Format
parent9880bfda07f946e76b892bec298c295a71033417 (diff)
downloadbcm5719-llvm-d9d8da2821c11654de4f7c1ea33e51c5f68e37c7.tar.gz
bcm5719-llvm-d9d8da2821c11654de4f7c1ea33e51c5f68e37c7.zip
clang-format: [JS] Allow top-level conditionals again.
I am not sure exactly which test breakage Martin was trying to fix in r273694. For now, fix the behavior for top-level conditionals, which (surprisingly) are actually used somewhat commonly. llvm-svn: 275183
Diffstat (limited to 'clang/unittests/Format')
-rw-r--r--clang/unittests/Format/FormatTestJS.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/unittests/Format/FormatTestJS.cpp b/clang/unittests/Format/FormatTestJS.cpp
index 5fda89d45d6..2819383a358 100644
--- a/clang/unittests/Format/FormatTestJS.cpp
+++ b/clang/unittests/Format/FormatTestJS.cpp
@@ -1351,7 +1351,7 @@ TEST_F(FormatTestJS, NonNullAssertionOperator) {
TEST_F(FormatTestJS, Conditional) {
verifyFormat("y = x ? 1 : 2;");
- verifyFormat("x ? 1: 2;"); // Known issue with top level conditionals.
+ verifyFormat("x ? 1 : 2;");
verifyFormat("class Foo {\n"
" field = true ? 1 : 2;\n"
" method(a = true ? 1 : 2) {}\n"
OpenPOWER on IntegriCloud