diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -317,7 +317,7 @@ // void (^ObjCBlock)(void); bool MightBeFunctionType = !Contexts[Contexts.size() - 2].IsExpression; bool ProbablyFunctionType = - CurrentToken->isOneOf(tok::star, tok::amp, tok::caret); + CurrentToken->isOneOf(tok::star, tok::amp, tok::ampamp, tok::caret); bool HasMultipleLines = false; bool HasMultipleParametersOnALine = false; bool MightBeObjCForRangeLoop = diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -9670,6 +9670,9 @@ verifyFormat("void f() { a->operator()(a & a); }"); verifyFormat("void f() { a.operator()(*a & *a); }"); verifyFormat("void f() { a->operator()(*a * *a); }"); + + verifyFormat("int operator()(T (&&)[N]) { return 1; }"); + verifyFormat("int operator()(T (&)[N]) { return 0; }"); } TEST_F(FormatTest, UnderstandsAttributes) { @@ -21876,6 +21879,7 @@ verifyFormat("Foo::operator&(void &);", Style); verifyFormat("Foo::operator&();", Style); verifyFormat("operator&(int (&)(), class Foo);", Style); + verifyFormat("operator&&(int (&)(), class Foo);", Style); verifyFormat("Foo::operator&&();", Style); verifyFormat("Foo::operator**();", Style); @@ -21884,7 +21888,7 @@ verifyFormat("Foo::operator()(void &&);", Style); verifyFormat("Foo::operator&&(void &&);", Style); verifyFormat("Foo::operator&&();", Style); - verifyFormat("operator&&(int(&&)(), class Foo);", Style); + verifyFormat("operator&&(int (&&)(), class Foo);", Style); verifyFormat("operator const nsTArrayRight &()", Style); verifyFormat("[[nodiscard]] operator const nsTArrayRight &()", Style); @@ -21935,6 +21939,8 @@ verifyFormat("Foo::operator&(void&);", Style); verifyFormat("Foo::operator&();", Style); verifyFormat("operator&(int (&)(), class Foo);", Style); + verifyFormat("operator&(int (&&)(), class Foo);", Style); + verifyFormat("operator&&(int (&&)(), class Foo);", Style); verifyFormat("Foo::operator&&();", Style); verifyFormat("Foo::operator void&&();", Style); @@ -21945,7 +21951,7 @@ verifyFormat("Foo::operator()(void&&);", Style); verifyFormat("Foo::operator&&(void&&);", Style); verifyFormat("Foo::operator&&();", Style); - verifyFormat("operator&&(int(&&)(), class Foo);", Style); + verifyFormat("operator&&(int (&&)(), class Foo);", Style); verifyFormat("operator const nsTArrayLeft&()", Style); verifyFormat("[[nodiscard]] operator const nsTArrayLeft&()", Style); @@ -21986,7 +21992,7 @@ verifyFormat("Foo::operator()(void &&);", Style); verifyFormat("Foo::operator&&(void &&);", Style); verifyFormat("Foo::operator&&();", Style); - verifyFormat("operator&&(int(&&)(), class Foo);", Style); + verifyFormat("operator&&(int (&&)(), class Foo);", Style); } TEST_F(FormatTest, OperatorPassedAsAFunctionPtr) {