diff options
| author | Martin Probst <martin@probst.io> | 2016-06-24 17:45:13 +0000 |
|---|---|---|
| committer | Martin Probst <martin@probst.io> | 2016-06-24 17:45:13 +0000 |
| commit | ec3dc98802f71d25cd21136b153f3ebead798cb4 (patch) | |
| tree | 7967183dee35829a5dedb87185bfec1e6fa0aeb0 | |
| parent | 3e9bbddcbb2791e9bb04fe117ce9a95a4b0f0939 (diff) | |
| download | bcm5719-llvm-ec3dc98802f71d25cd21136b153f3ebead798cb4.tar.gz bcm5719-llvm-ec3dc98802f71d25cd21136b153f3ebead798cb4.zip | |
clang-format: [JS] Fix build breakage.
Checking Line.MustBeDeclaration does actually break the field and param initializer use case.
llvm-svn: 273694
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 2 | ||||
| -rw-r--r-- | clang/unittests/Format/FormatTestJS.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 4a90522e6e3..db8a3d62441 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -639,7 +639,7 @@ private: } // Declarations cannot be conditional expressions, this can only be part // of a type declaration. - if (Line.MustBeDeclaration && !Contexts.back().IsExpression && + if (!Contexts.back().IsExpression && Style.Language == FormatStyle::LK_JavaScript) break; parseConditional(); diff --git a/clang/unittests/Format/FormatTestJS.cpp b/clang/unittests/Format/FormatTestJS.cpp index 3b9667d5ca4..a5f0b19577a 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;"); + verifyFormat("x ? 1: 2;"); // Known issue with top level conditionals. verifyFormat("class Foo {\n" " field = true ? 1 : 2;\n" " method(a = true ? 1 : 2) {}\n" |
