gedare created this revision.
Herald added a project: All.
gedare requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
The BracketAlignmentStyle BAS_BlockIndent was forcing breaks before a
closing right parenthesis yielding strange-looking results in case of
code structures that have a left parens immediately following a right
parens ")(" such as is seen with indirect function calls via function
pointers and with type casting.
See GitHub issues #57250 and #58496.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D137762
Files:
clang/lib/Format/TokenAnnotator.cpp
Index: clang/lib/Format/TokenAnnotator.cpp
===================================================================
--- clang/lib/Format/TokenAnnotator.cpp
+++ clang/lib/Format/TokenAnnotator.cpp
@@ -5001,7 +5001,10 @@
return false;
}
const FormatToken *Previous = Right.MatchingParen->Previous;
- return !(Previous && (Previous->is(tok::kw_for) || Previous->isIf()));
+ // avoid breaking when there is an opening parens immediately following
+ // a closing parens, such as in cast operators and indirect function calls
+ return !((Previous && (Previous->is(tok::kw_for) || Previous->isIf())) ||
+ (Right.Next && Right.Next->is(tok::l_paren)));
}
// Allow breaking after a trailing annotation, e.g. after a method
Index: clang/lib/Format/TokenAnnotator.cpp
===================================================================
--- clang/lib/Format/TokenAnnotator.cpp
+++ clang/lib/Format/TokenAnnotator.cpp
@@ -5001,7 +5001,10 @@
return false;
}
const FormatToken *Previous = Right.MatchingParen->Previous;
- return !(Previous && (Previous->is(tok::kw_for) || Previous->isIf()));
+ // avoid breaking when there is an opening parens immediately following
+ // a closing parens, such as in cast operators and indirect function calls
+ return !((Previous && (Previous->is(tok::kw_for) || Previous->isIf())) ||
+ (Right.Next && Right.Next->is(tok::l_paren)));
}
// Allow breaking after a trailing annotation, e.g. after a method
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
