release/19.x: [clang-format] Don't insert a space between :: and * (#105043) #105773
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@owenca What do you think about merging this PR to the release branch? |
|
@llvm/pr-subscribers-clang-format Author: None (llvmbot) ChangesBackport 714033a Requested by: @owenca Full diff: https://github.com/llvm/llvm-project/pull/105773.diff 3 Files Affected:
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index 6b9253613788c0..851f79895ac5ac 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -4467,10 +4467,8 @@ bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line,
}
if (Left.is(tok::colon))
return Left.isNot(TT_ObjCMethodExpr);
- if (Left.is(tok::coloncolon)) {
- return Right.is(tok::star) && Right.is(TT_PointerOrReference) &&
- Style.PointerAlignment != FormatStyle::PAS_Left;
- }
+ if (Left.is(tok::coloncolon))
+ return false;
if (Left.is(tok::less) || Right.isOneOf(tok::greater, tok::less)) {
if (Style.Language == FormatStyle::LK_TextProto ||
(Style.Language == FormatStyle::LK_Proto &&
@@ -4580,8 +4578,14 @@ bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line,
if (!BeforeLeft)
return false;
if (BeforeLeft->is(tok::coloncolon)) {
- return Left.is(tok::star) &&
- Style.PointerAlignment != FormatStyle::PAS_Right;
+ if (Left.isNot(tok::star))
+ return false;
+ assert(Style.PointerAlignment != FormatStyle::PAS_Right);
+ if (!Right.startsSequence(tok::identifier, tok::r_paren))
+ return true;
+ assert(Right.Next);
+ const auto *LParen = Right.Next->MatchingParen;
+ return !LParen || LParen->isNot(TT_FunctionTypeLParen);
}
return !BeforeLeft->isOneOf(tok::l_paren, tok::l_square);
}
diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp
index 39fcbab3447a7b..82af149e048c94 100644
--- a/clang/unittests/Format/FormatTest.cpp
+++ b/clang/unittests/Format/FormatTest.cpp
@@ -3646,8 +3646,8 @@ TEST_F(FormatTest, FormatsClasses) {
" : public aaaaaaaaaaaaaaaaaaa<aaaaaaaaaaaaaaaaaaaaa,\n"
" aaaaaaaaaaaaaaaaaaaaaa> {};");
verifyFormat("template <class R, class C>\n"
- "struct Aaaaaaaaaaaaaaaaa<R (C:: *)(int) const>\n"
- " : Aaaaaaaaaaaaaaaaa<R (C:: *)(int)> {};");
+ "struct Aaaaaaaaaaaaaaaaa<R (C::*)(int) const>\n"
+ " : Aaaaaaaaaaaaaaaaa<R (C::*)(int)> {};");
verifyFormat("class ::A::B {};");
}
@@ -11141,10 +11141,10 @@ TEST_F(FormatTest, UnderstandsBinaryOperators) {
}
TEST_F(FormatTest, UnderstandsPointersToMembers) {
- verifyFormat("int A:: *x;");
- verifyFormat("int (S:: *func)(void *);");
- verifyFormat("void f() { int (S:: *func)(void *); }");
- verifyFormat("typedef bool *(Class:: *Member)() const;");
+ verifyFormat("int A::*x;");
+ verifyFormat("int (S::*func)(void *);");
+ verifyFormat("void f() { int (S::*func)(void *); }");
+ verifyFormat("typedef bool *(Class::*Member)() const;");
verifyFormat("void f() {\n"
" (a->*f)();\n"
" a->*x;\n"
@@ -11162,16 +11162,16 @@ TEST_F(FormatTest, UnderstandsPointersToMembers) {
FormatStyle Style = getLLVMStyle();
EXPECT_EQ(Style.PointerAlignment, FormatStyle::PAS_Right);
- verifyFormat("typedef bool *(Class:: *Member)() const;", Style);
- verifyFormat("void f(int A:: *p) { int A:: *v = &A::B; }", Style);
+ verifyFormat("typedef bool *(Class::*Member)() const;", Style);
+ verifyFormat("void f(int A::*p) { int A::*v = &A::B; }", Style);
Style.PointerAlignment = FormatStyle::PAS_Left;
- verifyFormat("typedef bool* (Class::* Member)() const;", Style);
+ verifyFormat("typedef bool* (Class::*Member)() const;", Style);
verifyFormat("void f(int A::* p) { int A::* v = &A::B; }", Style);
Style.PointerAlignment = FormatStyle::PAS_Middle;
- verifyFormat("typedef bool * (Class:: * Member)() const;", Style);
- verifyFormat("void f(int A:: * p) { int A:: * v = &A::B; }", Style);
+ verifyFormat("typedef bool * (Class::*Member)() const;", Style);
+ verifyFormat("void f(int A::* p) { int A::* v = &A::B; }", Style);
}
TEST_F(FormatTest, UnderstandsUnaryOperators) {
@@ -12514,7 +12514,7 @@ TEST_F(FormatTest, FormatsFunctionTypes) {
verifyFormat("int (*func)(void *);");
verifyFormat("void f() { int (*func)(void *); }");
verifyFormat("template <class CallbackClass>\n"
- "using Callback = void (CallbackClass:: *)(SomeObject *Data);");
+ "using MyCallback = void (CallbackClass::*)(SomeObject *Data);");
verifyGoogleFormat("A<void*(int*, SomeType*)>;");
verifyGoogleFormat("void* (*a)(int);");
@@ -19437,13 +19437,13 @@ TEST_F(FormatTest, AlignConsecutiveDeclarations) {
"int bbbbbbb = 0;",
Alignment);
// http://llvm.org/PR68079
- verifyFormat("using Fn = int (A:: *)();\n"
- "using RFn = int (A:: *)() &;\n"
- "using RRFn = int (A:: *)() &&;",
+ verifyFormat("using Fn = int (A::*)();\n"
+ "using RFn = int (A::*)() &;\n"
+ "using RRFn = int (A::*)() &&;",
Alignment);
- verifyFormat("using Fn = int (A:: *)();\n"
- "using RFn = int *(A:: *)() &;\n"
- "using RRFn = double (A:: *)() &&;",
+ verifyFormat("using Fn = int (A::*)();\n"
+ "using RFn = int *(A::*)() &;\n"
+ "using RRFn = double (A::*)() &&;",
Alignment);
// PAS_Right
diff --git a/clang/unittests/Format/QualifierFixerTest.cpp b/clang/unittests/Format/QualifierFixerTest.cpp
index 3a5f63e5de65b4..f9255c6e4c7088 100644
--- a/clang/unittests/Format/QualifierFixerTest.cpp
+++ b/clang/unittests/Format/QualifierFixerTest.cpp
@@ -305,7 +305,7 @@ TEST_F(QualifierFixerTest, RightQualifier) {
verifyFormat("Foo inline static const;", "Foo inline const static;", Style);
verifyFormat("Foo inline static const;", Style);
- verifyFormat("Foo<T volatile>::Bar<Type const, 5> const volatile A:: *;",
+ verifyFormat("Foo<T volatile>::Bar<Type const, 5> const volatile A::*;",
"volatile const Foo<volatile T>::Bar<const Type, 5> A::*;",
Style);
@@ -523,15 +523,14 @@ TEST_F(QualifierFixerTest, RightQualifier) {
verifyFormat("const INTPTR a;", Style);
// Pointers to members
- verifyFormat("int S:: *a;", Style);
- verifyFormat("int const S:: *a;", "const int S:: *a;", Style);
- verifyFormat("int const S:: *const a;", "const int S::* const a;", Style);
- verifyFormat("int A:: *const A:: *p1;", Style);
- verifyFormat("float (C:: *p)(int);", Style);
- verifyFormat("float (C:: *const p)(int);", Style);
- verifyFormat("float (C:: *p)(int) const;", Style);
- verifyFormat("float const (C:: *p)(int);", "const float (C::*p)(int);",
- Style);
+ verifyFormat("int S::*a;", Style);
+ verifyFormat("int const S::*a;", "const int S::*a;", Style);
+ verifyFormat("int const S::*const a;", "const int S::* const a;", Style);
+ verifyFormat("int A::*const A::*p1;", Style);
+ verifyFormat("float (C::*p)(int);", Style);
+ verifyFormat("float (C::*const p)(int);", Style);
+ verifyFormat("float (C::*p)(int) const;", Style);
+ verifyFormat("float const (C::*p)(int);", "const float (C::*p)(int);", Style);
}
TEST_F(QualifierFixerTest, LeftQualifier) {
@@ -831,15 +830,14 @@ TEST_F(QualifierFixerTest, LeftQualifier) {
verifyFormat("INTPTR const a;", Style);
// Pointers to members
- verifyFormat("int S:: *a;", Style);
- verifyFormat("const int S:: *a;", "int const S:: *a;", Style);
- verifyFormat("const int S:: *const a;", "int const S::* const a;", Style);
- verifyFormat("int A:: *const A:: *p1;", Style);
- verifyFormat("float (C:: *p)(int);", Style);
- verifyFormat("float (C:: *const p)(int);", Style);
- verifyFormat("float (C:: *p)(int) const;", Style);
- verifyFormat("const float (C:: *p)(int);", "float const (C::*p)(int);",
- Style);
+ verifyFormat("int S::*a;", Style);
+ verifyFormat("const int S::*a;", "int const S::*a;", Style);
+ verifyFormat("const int S::*const a;", "int const S::*const a;", Style);
+ verifyFormat("int A::*const A::*p1;", Style);
+ verifyFormat("float (C::*p)(int);", Style);
+ verifyFormat("float (C::*const p)(int);", Style);
+ verifyFormat("float (C::*p)(int) const;", Style);
+ verifyFormat("const float (C::*p)(int);", "float const (C::*p)(int);", Style);
}
TEST_F(QualifierFixerTest, ConstVolatileQualifiersOrder) {
|
owenca
approved these changes
Aug 23, 2024
Also, don't insert a space after ::* for method pointers. See llvm#86253 (comment). Fixes llvm#100841. (cherry picked from commit 714033a)
|
@owenca (or anyone else). If you would like to add a note about this fix in the release notes (completely optional). Please reply to this comment with a one or two sentence description of the fix. When you are done, please add the release:note label to this PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport 714033a
Requested by: @owenca