diff options
author | Martin Probst <martin@probst.io> | 2016-11-10 16:21:04 +0000 |
---|---|---|
committer | Martin Probst <martin@probst.io> | 2016-11-10 16:21:04 +0000 |
commit | e19acaa361103d3b192b6912021c689968237637 (patch) | |
tree | 93f482568a453fa39c2076c0a3b634aa8efc8357 /clang/lib/Format | |
parent | 3dbbefae36a866c17c1994403c711e4a63fe8047 (diff) | |
download | bcm5719-llvm-e19acaa361103d3b192b6912021c689968237637.tar.gz bcm5719-llvm-e19acaa361103d3b192b6912021c689968237637.zip |
drop kw_module from ASI protection block
llvm-svn: 286469
Diffstat (limited to 'clang/lib/Format')
-rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 628659ef2be..893e5fa65d4 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -2426,10 +2426,10 @@ bool TokenAnnotator::canBreakBefore(const AnnotatedLine &Line, } else if (Style.Language == FormatStyle::LK_JavaScript) { const FormatToken *NonComment = Right.getPreviousNonComment(); if (Left.isOneOf(tok::kw_return, tok::kw_continue, tok::kw_break, - tok::kw_throw, Keywords.kw_module) || + tok::kw_throw) || (NonComment && NonComment->isOneOf(tok::kw_return, tok::kw_continue, tok::kw_break, - tok::kw_throw, Keywords.kw_module))) + tok::kw_throw))) return false; // Otherwise a semicolon is inserted. if (Left.is(TT_JsFatArrow) && Right.is(tok::l_brace)) return false; |