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

[clang-format][NFC] Use isComment() in setCommentLineLevels() 

Also replace an unnecessary check with assert() in the unwrapped
line parser.

Differential Revision: https://reviews.llvm.org/D124215
This commit is contained in:
owenca 2022-04-21 16:46:07 -07:00
parent d6dab38ae4
commit c9e7eec7bc
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clang/lib/Format/TokenAnnotator.cpp
View File

@ -2505,17 +2505,10 @@ void TokenAnnotator::setCommentLineLevels(
const AnnotatedLine *NextNonCommentLine = nullptr;
for (AnnotatedLine *Line : llvm::reverse(Lines)) {
assert(Line->First);
bool CommentLine = true;
for (const FormatToken *Tok = Line->First; Tok; Tok = Tok->Next) {
if (!Tok->is(tok::comment)) {
CommentLine = false;
break;
}
}
// If the comment is currently aligned with the line immediately following
// it, that's probably intentional and we should keep it.
if (NextNonCommentLine && CommentLine &&
if (NextNonCommentLine && Line->isComment() &&
NextNonCommentLine->First->NewlinesBefore <= 1 &&
NextNonCommentLine->First->OriginalColumn ==
Line->First->OriginalColumn) {

5
clang/lib/Format/UnwrappedLineParser.cpp
View File

@ -2470,8 +2470,9 @@ FormatToken *UnwrappedLineParser::parseIfThenElse(IfStmtKind *IfKind,
Kind = IfStmtKind::IfElseIf;
addUnwrappedLine();
} else if (FormatTok->is(tok::kw_if)) {
FormatToken *Previous = Tokens->getPreviousToken();
const bool IsPrecededByComment = Previous && Previous->is(tok::comment);
const FormatToken *Previous = Tokens->getPreviousToken();
assert(Previous);
const bool IsPrecededByComment = Previous->is(tok::comment);
if (IsPrecededByComment) {
addUnwrappedLine();
++Line->Level;