formatting

llvm-svn: 301398
This commit is contained in:
Martin Probst 2017-04-26 12:34:18 +00:00
parent 19c7de0a22
commit 07a0307a40
1 changed files with 5 additions and 7 deletions

View File

@ -2541,13 +2541,11 @@ bool TokenAnnotator::canBreakBefore(const AnnotatedLine &Line,
} else if (Style.Language == FormatStyle::LK_JavaScript) {
const FormatToken *NonComment = Right.getPreviousNonComment();
if (NonComment &&
NonComment->isOneOf(tok::kw_return, tok::kw_continue, tok::kw_break,
tok::kw_throw, Keywords.kw_interface,
Keywords.kw_type, tok::kw_static, tok::kw_public,
tok::kw_private, tok::kw_protected,
Keywords.kw_abstract,
Keywords.kw_get,
Keywords.kw_set))
NonComment->isOneOf(
tok::kw_return, tok::kw_continue, tok::kw_break, tok::kw_throw,
Keywords.kw_interface, Keywords.kw_type, tok::kw_static,
tok::kw_public, tok::kw_private, tok::kw_protected,
Keywords.kw_abstract, Keywords.kw_get, Keywords.kw_set))
return false; // Otherwise a semicolon is inserted.
if (Left.is(TT_JsFatArrow) && Right.is(tok::l_brace))
return false;