Handle ::type and ::foo::type

Author: owenca

clang/lib/Format/QualifierAlignmentFixer.cpp

@@ -414,9 +414,14 @@ const FormatToken *LeftRightQualifierAlignmentFixer::analyzeLeft(
   // The case `const long long volatile int` -> `const volatile long long int`
   // The case `long volatile long int const` -> `const volatile long long int`
   if (TypeToken->isTypeName(LangOpts)) {
-    if (const auto *Prev = TypeToken->getPreviousNonComment();
-        Prev && Prev->endsSequence(tok::coloncolon, tok::identifier)) {
-      TypeToken = Prev->getPreviousNonComment();
+    for (const auto *Prev = TypeToken->getPreviousNonComment();
+         Prev && Prev->is(tok::coloncolon);
+         Prev = Prev->getPreviousNonComment()) {
+      TypeToken = Prev;
+      Prev = Prev->getPreviousNonComment();
+      if (!(Prev && Prev->is(tok::identifier)))
+        break;
+      TypeToken = Prev;
     }
     const FormatToken *LastSimpleTypeSpecifier = TypeToken;
     while (isConfiguredQualifierOrType(

clang/unittests/Format/QualifierFixerTest.cpp

@@ -1296,8 +1296,11 @@ TEST_F(QualifierFixerTest, WithQualifiedTypeName) {
   Style.QualifierAlignment = FormatStyle::QAS_Custom;
   Style.QualifierOrder = {"constexpr", "type", "const"};
 
+  verifyFormat("constexpr ::int64_t x{1};", "::int64_t constexpr x{1};", Style);
   verifyFormat("constexpr std::int64_t x{123};",
                "std::int64_t constexpr x{123};", Style);
+  verifyFormat("constexpr ::std::int64_t x{123};",
+               "::std::int64_t constexpr x{123};", Style);
 
   Style.TypeNames.push_back("bar");
   verifyFormat("constexpr foo::bar x{12};", "foo::bar constexpr x{12};", Style);