Do not traverse the break-state when we know we cannot break anyway.
This is an optimization that djasper spottet. For now, we do not format anything after the first token that belongs to such an implicit string literal. All our state is not made for handling that anyway, so we'll revisit this if we find a problem. llvm-svn: 172537
This commit is contained in:
parent
99c7baa3cf
commit
a31e58b2df
|
@ -253,6 +253,12 @@ public:
|
|||
|
||||
// Start iterating at 1 as we have correctly formatted of Token #0 above.
|
||||
while (State.NextToken != NULL) {
|
||||
if (State.NextToken->Type == TT_ImplicitStringLiteral)
|
||||
// We will not touch the rest of the white space in this
|
||||
// \c UnwrappedLine. The returned value can also not matter, as we
|
||||
// cannot continue an top-level implicit string literal on the next
|
||||
// line.
|
||||
return 0;
|
||||
if (FitsOnALine) {
|
||||
addTokenToState(false, false, State);
|
||||
} else {
|
||||
|
@ -374,11 +380,6 @@ private:
|
|||
assert(State.Stack.size());
|
||||
unsigned ParenLevel = State.Stack.size() - 1;
|
||||
|
||||
if (Current.Type == TT_ImplicitStringLiteral) {
|
||||
moveStateToNextToken(State);
|
||||
return;
|
||||
}
|
||||
|
||||
if (Newline) {
|
||||
unsigned WhitespaceStartColumn = State.Column;
|
||||
if (Current.is(tok::r_brace)) {
|
||||
|
|
Loading…
Reference in New Issue