maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

clang-format: Fix incorrect handling of leading whitespace. 

Added an assertion that triggered in an existing test case (without
observable differences) and fixed the code.

llvm-svn: 227677
This commit is contained in:
Daniel Jasper 2015-01-31 07:05:46 +00:00
parent 9fee8ab4f9
commit 30526e79e8
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
clang/lib/Format/ContinuationIndenter.cpp
View File

@ -245,12 +245,18 @@ unsigned ContinuationIndenter::addTokenToState(LineState &State, bool Newline,
(Current.Previous->Tok.getIdentifierInfo() == nullptr || (Current.Previous->Tok.getIdentifierInfo() == nullptr ||
Current.Previous->Tok.getIdentifierInfo()->getPPKeywordID() == Current.Previous->Tok.getIdentifierInfo()->getPPKeywordID() ==
tok::pp_not_keyword))) { tok::pp_not_keyword))) {
// FIXME: Is this correct? unsigned EndColumn =
int WhitespaceLength = SourceMgr.getSpellingColumnNumber( SourceMgr.getSpellingColumnNumber(Current.WhitespaceRange.getEnd());
State.NextToken->WhitespaceRange.getEnd()) - if (Current.LastNewlineOffset != 0) {
SourceMgr.getSpellingColumnNumber( // If there is a newline within this token, the final column will solely
State.NextToken->WhitespaceRange.getBegin()); // determined by the current end column.
State.Column += WhitespaceLength; State.Column = EndColumn;
} else {
unsigned StartColumn =
SourceMgr.getSpellingColumnNumber(Current.WhitespaceRange.getBegin());
assert(EndColumn >= StartColumn);
State.Column += EndColumn - StartColumn;
}
moveStateToNextToken(State, DryRun, /*Newline=*/false); moveStateToNextToken(State, DryRun, /*Newline=*/false);
return 0; return 0;
} }