diff options
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 3 | ||||
| -rw-r--r-- | clang/unittests/Format/FormatTestJS.cpp | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 1713865ee59..2ddff47b930 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -538,6 +538,9 @@ private: } break; case tok::kw_for: + if (Style.Language == FormatStyle::LK_JavaScript && Tok->Previous && + Tok->Previous->is(tok::period)) + break; Contexts.back().ColonIsForRangeExpr = true; next(); if (!parseParens()) diff --git a/clang/unittests/Format/FormatTestJS.cpp b/clang/unittests/Format/FormatTestJS.cpp index 5f60f1d2162..457298704d8 100644 --- a/clang/unittests/Format/FormatTestJS.cpp +++ b/clang/unittests/Format/FormatTestJS.cpp @@ -125,6 +125,7 @@ TEST_F(FormatTestJS, ReservedWords) { verifyFormat("x.class.struct = 1;"); verifyFormat("x.case = 1;"); verifyFormat("x.interface = 1;"); + verifyFormat("x.for = 1;"); verifyFormat("x.of() = 1;"); verifyFormat("x.in() = 1;"); verifyFormat("x.let() = 1;"); |
