From: Martin Probst Date: Thu, 10 Nov 2016 16:21:04 +0000 (+0000) Subject: drop kw_module from ASI protection block X-Git-Tag: llvmorg-4.0.0-rc1~5024 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e19acaa361103d3b192b6912021c689968237637;p=platform%2Fupstream%2Fllvm.git drop kw_module from ASI protection block llvm-svn: 286469 --- diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 628659e..893e5fa 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;