diff options
| author | Daniel Jasper <djasper@google.com> | 2015-06-11 13:29:20 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2015-06-11 13:29:20 +0000 |
| commit | 56691b8cb93c2d05c2679a8bf412a9913b3198dd (patch) | |
| tree | 9e66f0b9c4d902f74a1664bc985b4da2cd0d0e8f /clang/lib/Format/TokenAnnotator.cpp | |
| parent | b6b58b315222aac2743ce99c7cc1f8a8a762c29c (diff) | |
| download | bcm5719-llvm-56691b8cb93c2d05c2679a8bf412a9913b3198dd.tar.gz bcm5719-llvm-56691b8cb93c2d05c2679a8bf412a9913b3198dd.zip | |
clang-format: [JS] Ensure that formatting actually takes place in tests.
And fix formatting issue discovered by that :-).
llvm-svn: 239530
Diffstat (limited to 'clang/lib/Format/TokenAnnotator.cpp')
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 8f2b608afb3..e45ef603114 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -558,7 +558,7 @@ private: break; case tok::question: if (Style.Language == FormatStyle::LK_JavaScript && Tok->Next && - Tok->Next->isOneOf(tok::semi, tok::colon, tok::r_paren, + Tok->Next->isOneOf(tok::semi, tok::comma, tok::colon, tok::r_paren, tok::r_brace)) { // Question marks before semicolons, colons, etc. indicate optional // types (fields, parameters), e.g. |
