Luis created this revision.
Luis added reviewers: djasper, klimek, owenpan, mitchell-stellar.
Luis added a project: clang-format.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
The new option is called SpaceBeforeAndAfterArrows
True:
(pointer instance) -> (member)
False:
(pointer instance)->(member)
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D71659
Files:
clang/include/clang/Format/Format.h
clang/lib/Format/Format.cpp
clang/lib/Format/TokenAnnotator.cpp
Index: clang/lib/Format/TokenAnnotator.cpp
===================================================================
--- clang/lib/Format/TokenAnnotator.cpp
+++ clang/lib/Format/TokenAnnotator.cpp
@@ -3045,8 +3045,11 @@
return Right.is(TT_TemplateCloser) && Left.is(TT_TemplateCloser) &&
(Style.Standard < FormatStyle::LS_Cpp11 || Style.SpacesInAngles);
}
- if (Right.isOneOf(tok::arrow, tok::arrowstar, tok::periodstar) ||
- Left.isOneOf(tok::arrow, tok::period, tok::arrowstar, tok::periodstar) ||
+ if (Left.is(tok::arrow) || Right.is(tok::arrow)) {
+ return Style.SpaceBeforeAndAfterArrows;
+ }
+ if (Right.isOneOf(tok::arrowstar, tok::periodstar) ||
+ Left.isOneOf(tok::period, tok::arrowstar, tok::periodstar) ||
(Right.is(tok::period) && Right.isNot(TT_DesignatedInitializerPeriod)))
return false;
if (!Style.SpaceBeforeAssignmentOperators && Left.isNot(TT_TemplateCloser) &&
@@ -3058,7 +3061,8 @@
if (Right.is(tok::coloncolon) && Left.is(tok::identifier))
// Generally don't remove existing spaces between an identifier and "::".
// The identifier might actually be a macro name such as ALWAYS_INLINE. If
- // this turns out to be too lenient, add analysis of the identifier itself.
+ // this turns out to be too lenient, add analysis of the identifier
+ // itself.
return Right.WhitespaceRange.getBegin() != Right.WhitespaceRange.getEnd();
if (Right.is(tok::coloncolon) &&
!Left.isOneOf(tok::l_brace, tok::comment, tok::l_paren))
@@ -3098,7 +3102,8 @@
return spaceRequiredBetween(Line, Left, Right);
}
-// Returns 'true' if 'Tok' is a brace we'd want to break before in Allman style.
+// Returns 'true' if 'Tok' is a brace we'd want to break before in Allman
+// style.
static bool isAllmanBrace(const FormatToken &Tok) {
return Tok.is(tok::l_brace) && Tok.BlockKind == BK_Block &&
!Tok.isOneOf(TT_ObjCBlockLBrace, TT_LambdaLBrace, TT_DictLiteral);
@@ -3122,8 +3127,9 @@
// kw_var/kw_let are pseudo-tokens that are tok::identifier, so match
// above.
!Line.First->isOneOf(Keywords.kw_var, Keywords.kw_let))
- // Object literals on the top level of a file are treated as "enum-style".
- // Each key/value pair is put on a separate line, instead of bin-packing.
+ // Object literals on the top level of a file are treated as
+ // "enum-style". Each key/value pair is put on a separate line, instead
+ // of bin-packing.
return true;
if (Left.is(tok::l_brace) && Line.Level == 0 &&
(Line.startsWith(tok::kw_enum) ||
@@ -3155,8 +3161,8 @@
}
// If the last token before a '}', ']', or ')' is a comma or a trailing
- // comment, the intention is to insert a line break after it in order to make
- // shuffling around entries easier. Import statements, especially in
+ // comment, the intention is to insert a line break after it in order to
+ // make shuffling around entries easier. Import statements, especially in
// JavaScript, can be an exception to this rule.
if (Style.JavaScriptWrapImports || Line.Type != LT_ImportStatement) {
const FormatToken *BeforeClosingBrace = nullptr;
@@ -3261,18 +3267,17 @@
if (Right.is(TT_ProtoExtensionLSquare))
return true;
- // In text proto instances if a submessage contains at least 2 entries and at
- // least one of them is a submessage, like A { ... B { ... } ... },
- // put all of the entries of A on separate lines by forcing the selector of
- // the submessage B to be put on a newline.
+ // In text proto instances if a submessage contains at least 2 entries and
+ // at least one of them is a submessage, like A { ... B { ... } ... }, put
+ // all of the entries of A on separate lines by forcing the selector of the
+ // submessage B to be put on a newline.
//
// Example: these can stay on one line:
// a { scalar_1: 1 scalar_2: 2 }
// a { b { key: value } }
//
- // and these entries need to be on a new line even if putting them all in one
- // line is under the column limit:
- // a {
+ // and these entries need to be on a new line even if putting them all in
+ // one line is under the column limit: a {
// scalar: 1
// b { key: value }
// }
@@ -3281,11 +3286,12 @@
// siblings, *and* breaking before a field that follows a submessage field.
//
// Be careful to exclude the case [proto.ext] { ... } since the `]` is
- // the TT_SelectorName there, but we don't want to break inside the brackets.
+ // the TT_SelectorName there, but we don't want to break inside the
+ // brackets.
//
// Another edge case is @submessage { key: value }, which is a common
- // substitution placeholder. In this case we want to keep `@` and `submessage`
- // together.
+ // substitution placeholder. In this case we want to keep `@` and
+ // `submessage` together.
//
// We ensure elsewhere that extensions are always on their own line.
if ((Style.Language == FormatStyle::LK_Proto ||
@@ -3322,11 +3328,12 @@
(LBrace->Next && LBrace->Next->is(tok::r_brace)))) ||
LBrace->is(TT_ArrayInitializerLSquare) || LBrace->is(tok::less))) {
// If Left.ParameterCount is 0, then this submessage entry is not the
- // first in its parent submessage, and we want to break before this entry.
- // If Left.ParameterCount is greater than 0, then its parent submessage
- // might contain 1 or more entries and we want to break before this entry
- // if it contains at least 2 entries. We deal with this case later by
- // detecting and breaking before the next entry in the parent submessage.
+ // first in its parent submessage, and we want to break before this
+ // entry. If Left.ParameterCount is greater than 0, then its parent
+ // submessage might contain 1 or more entries and we want to break
+ // before this entry if it contains at least 2 entries. We deal with
+ // this case later by detecting and breaking before the next entry in
+ // the parent submessage.
if (Left.ParameterCount == 0)
return true;
// However, if this submessage is the first entry in its parent
@@ -3346,9 +3353,10 @@
return true;
}
- // Deal with lambda arguments in C++ - we want consistent line breaks whether
- // they happen to be at arg0, arg1 or argN. The selection is a bit nuanced
- // as aggressive line breaks are placed when the lambda is not the last arg.
+ // Deal with lambda arguments in C++ - we want consistent line breaks
+ // whether they happen to be at arg0, arg1 or argN. The selection is a bit
+ // nuanced as aggressive line breaks are placed when the lambda is not the
+ // last arg.
if ((Style.Language == FormatStyle::LK_Cpp ||
Style.Language == FormatStyle::LK_ObjC) &&
Left.is(tok::l_paren) && Left.BlockParameterCount > 0 &&
@@ -3478,9 +3486,9 @@
if (Right.isTrailingComment())
// We rely on MustBreakBefore being set correctly here as we should not
// change the "binding" behavior of a comment.
- // The first comment in a braced lists is always interpreted as belonging to
- // the first list element. Otherwise, it should be placed outside of the
- // list.
+ // The first comment in a braced lists is always interpreted as belonging
+ // to the first list element. Otherwise, it should be placed outside of
+ // the list.
return Left.BlockKind == BK_BracedInit ||
(Left.is(TT_CtorInitializerColon) &&
Style.BreakConstructorInitializers == FormatStyle::BCIS_AfterColon);
Index: clang/lib/Format/Format.cpp
===================================================================
--- clang/lib/Format/Format.cpp
+++ clang/lib/Format/Format.cpp
@@ -521,6 +521,8 @@
IO.mapOptional("SpaceAfterLogicalNot", Style.SpaceAfterLogicalNot);
IO.mapOptional("SpaceAfterTemplateKeyword",
Style.SpaceAfterTemplateKeyword);
+ IO.mapOptional("SpaceBeforeAndAfterArrows",
+ Style.SpaceBeforeAndAfterArrows);
IO.mapOptional("SpaceBeforeAssignmentOperators",
Style.SpaceBeforeAssignmentOperators);
IO.mapOptional("SpaceBeforeCpp11BracedList",
@@ -815,6 +817,7 @@
LLVMStyle.SpaceBeforeInheritanceColon = true;
LLVMStyle.SpaceBeforeParens = FormatStyle::SBPO_ControlStatements;
LLVMStyle.SpaceBeforeRangeBasedForLoopColon = true;
+ LLVMStyle.SpaceBeforeAndAfterArrows = false;
LLVMStyle.SpaceBeforeAssignmentOperators = true;
LLVMStyle.SpaceBeforeCpp11BracedList = false;
LLVMStyle.SpaceBeforeSquareBrackets = false;
Index: clang/include/clang/Format/Format.h
===================================================================
--- clang/include/clang/Format/Format.h
+++ clang/include/clang/Format/Format.h
@@ -1825,6 +1825,13 @@
/// \endcode
bool SpaceBeforeAssignmentOperators;
+ /// If ``false``, spaces will removed before and after arrow
+ /// \code
+ /// true: false:
+ /// object -> member vs object->member
+ /// \endcode
+ bool SpaceBeforeAndAfterArrows;
+
/// If ``true``, a space will be inserted before a C++11 braced list
/// used to initialize an object (after the preceding identifier or type).
/// \code
@@ -2152,6 +2159,7 @@
SpaceAfterCStyleCast == R.SpaceAfterCStyleCast &&
SpaceAfterLogicalNot == R.SpaceAfterLogicalNot &&
SpaceAfterTemplateKeyword == R.SpaceAfterTemplateKeyword &&
+ SpaceBeforeAndAfterArrows == R.SpaceBeforeAndAfterArrows &&
SpaceBeforeAssignmentOperators == R.SpaceBeforeAssignmentOperators &&
SpaceBeforeCpp11BracedList == R.SpaceBeforeCpp11BracedList &&
SpaceBeforeCtorInitializerColon ==
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
