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

[clang-format] Simplify conditions in spaceRequiredBetween. NFC.

This commit is contained in:
Marek Kurdej 2022-02-11 11:59:58 +01:00
parent 32a0482a65
commit 326cb51b14
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3093,14 +3093,15 @@ bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line,
Right.Next->is(TT_RangeBasedForLoopColon))
return getTokenPointerOrReferenceAlignment(Left) !=
FormatStyle::PAS_Right;
return !Right.isOneOf(TT_PointerOrReference, TT_ArraySubscriptLSquare,
tok::l_paren) &&
(getTokenPointerOrReferenceAlignment(Left) !=
FormatStyle::PAS_Right &&
!Line.IsMultiVariableDeclStmt) &&
Left.Previous &&
!Left.Previous->isOneOf(tok::l_paren, tok::coloncolon,
tok::l_square);
if (Right.isOneOf(TT_PointerOrReference, TT_ArraySubscriptLSquare,
tok::l_paren))
return false;
if (getTokenPointerOrReferenceAlignment(Left) == FormatStyle::PAS_Right)
return false;
if (Line.IsMultiVariableDeclStmt)
return false;
return Left.Previous && !Left.Previous->isOneOf(
tok::l_paren, tok::coloncolon, tok::l_square);
}
// Ensure right pointer alignment with ellipsis e.g. int *...P
if (Left.is(tok::ellipsis) && Left.Previous &&