klimek added inline comments.
================
Comment at: lib/Format/TokenAnnotator.cpp:2546-2560
return Line.Type == LT_ObjCDecl || Left.is(tok::semi) ||
(Style.SpaceBeforeParens != FormatStyle::SBPO_Never &&
- (Left.isOneOf(tok::kw_if, tok::pp_elif, tok::kw_for, tok::kw_while,
- tok::kw_switch, tok::kw_case, TT_ForEachMacro,
- TT_ObjCForIn) ||
- Left.endsSequence(tok::kw_constexpr, tok::kw_if) ||
- (Left.isOneOf(tok::kw_try, Keywords.kw___except, tok::kw_catch,
- tok::kw_new, tok::kw_delete) &&
- (!Left.Previous || Left.Previous->isNot(tok::period))))) ||
- (Style.SpaceBeforeParens == FormatStyle::SBPO_Always &&
- (Left.is(tok::identifier) || Left.isFunctionLikeKeyword() ||
- Left.is(tok::r_paren) ||
- (Left.is(tok::r_square) && Left.MatchingParen &&
- Left.MatchingParen->is(TT_LambdaLSquare))) &&
- Line.Type != LT_PreprocessorDirective);
+ ((Left.isOneOf(tok::kw_if, tok::pp_elif, tok::kw_for,
tok::kw_while,
+ tok::kw_switch, tok::kw_case, TT_ForEachMacro,
+ TT_ObjCForIn) ||
+ Left.endsSequence(tok::kw_constexpr, tok::kw_if) ||
+ (Left.isOneOf(tok::kw_try, Keywords.kw___except, tok::kw_catch,
----------------
reuk wrote:
> klimek wrote:
> > I'm really confused about the changes os parens. It seems like this should
> > just change the spaceRequiredBeforeParens(...), but instead seems to change
> > parens in a way that completely changes the logic? (or alternatively is
> > phabricator showing this wrong?)
> I think this looks like a bigger change than it really is because I added an
> open-parens on line 2548, which then affected the formatting of the following
> lines. I also added the `isSimpleTypeSpecifier` check, so that
> functional-style casts (`int (foo)`) are given the correct spacing.
a) why did you add the one in 2548? you didn't change any of the logic, right?
b) there are 3 extra closing parens in 2560, I see one more new opening in
2556, but that also seems superfluous?
One question is whether we should pull this apart into bools with names that
make sense :)
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D55170/new/
https://reviews.llvm.org/D55170
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
