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 @@ -2694,7 +2694,7 @@ // Space between the type and the * // operator void*(), operator char*(), operator Foo*() dependant // on PointerAlignment style. - return (Style.PointerAlignment == FormatStyle::PAS_Right); + return (Style.PointerAlignment != FormatStyle::PAS_Left); const auto SpaceRequiredForArrayInitializerLSquare = [](const FormatToken &LSquareTok, const FormatStyle &Style) { return Style.SpacesInContainerLiterals || 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 @@ -14970,6 +14970,28 @@ verifyFormat("Foo::operator&&(void&&);", Style); verifyFormat("Foo::operator&&();", Style); verifyFormat("operator&&(int(&&)(), class Foo);", Style); + + Style.PointerAlignment = FormatStyle::PAS_Middle; + verifyFormat("Foo::operator*();", Style); + verifyFormat("Foo::operator void *();", Style); + verifyFormat("Foo::operator()(void *);", Style); + verifyFormat("Foo::operator*(void *);", Style); + verifyFormat("Foo::operator*();", Style); + verifyFormat("operator*(int (*)(), class Foo);", Style); + + verifyFormat("Foo::operator&();", Style); + verifyFormat("Foo::operator void &();", Style); + verifyFormat("Foo::operator()(void &);", Style); + verifyFormat("Foo::operator&(void &);", Style); + verifyFormat("Foo::operator&();", Style); + verifyFormat("operator&(int (&)(), class Foo);", Style); + + verifyFormat("Foo::operator&&();", Style); + verifyFormat("Foo::operator void &&();", Style); + verifyFormat("Foo::operator()(void &&);", Style); + verifyFormat("Foo::operator&&(void &&);", Style); + verifyFormat("Foo::operator&&();", Style); + verifyFormat("operator&&(int(&&)(), class Foo);", Style); } } // namespace