[clang-format] regression from clang-format v13

[MyDeveloperDay]

Summary

https://github.com/llvm/llvm-project/issues/53567

The following source

namespace A {

template <int N> struct Foo<char[N]> {
  void foo() { std::cout << "Bar"; }
}; // namespace A

is incorrectly formatted as:

namespace A {

template <int N> struct Foo<char[N]>{void foo(){std::cout << "Bar";
}
}
; // namespace A

This looks to be caused by https://github.com/llvm/llvm-project/commit/5c2e7c9ca043d92bed75b08e653fb47c384edd13

[curdeius]

clang/lib/Format/UnwrappedLineParser.cpp

3061

Maybe it would be easier to read if written !(is(tok::r_paren) || isTypeOrIdentifier())?

[MyDeveloperDay]

Simply logic - review comment

[MyDeveloperDay]

De'Morganed!!

clang/lib/Format/UnwrappedLineParser.cpp

if (FormatTok->isOneOf(tok::colon, tok::less)) {
     while (!eof()) {
       if (FormatTok->is(tok::l_brace)) {
         calculateBraceTypes(/*ExpectClassBody=*/true);
         if (!tryToParseBracedList())
           break;
       }
       if (FormatTok->is(tok::l_square)) {
         FormatToken *Previous = FormatTok->Previous;
-        if (!Previous || Previous->isNot(tok::r_paren)) {
+        if (!Previous ||
+            !(Previous->is(tok::r_paren) || Previous->isTypeOrIdentifier())) {
           // Don't try parsing a lambda if we had a closing parenthesis before,
           // it was probably a pointer to an array: int (*)[].
           if (!tryToParseLambda())
             break;
         }
       }
       if (FormatTok->Tok.is(tok::semi))
         return;

clang/unittests/Format/FormatTest.cpp

TEST_F(FormatTest, ShortTemplatedArgumentLists) {
   auto Style = getLLVMStyle();
 
   verifyFormat("template <> struct S : Template<int (*)[]> {};\n", Style);
   verifyFormat("template <> struct S : Template<int (*)[10]> {};\n", Style);
   verifyFormat("struct Y : X<[] { return 0; }> {};", Style);
   verifyFormat("struct Y<[] { return 0; }> {};", Style);
 
   verifyFormat("struct Z : X<decltype([] { return 0; }){}> {};", Style);
+  verifyFormat("template <int N> struct Foo<char[N]> {};", Style);
 }
 
 TEST_F(FormatTest, RemoveBraces) {
   FormatStyle Style = getLLVMStyle();
   Style.RemoveBracesLLVM = true;
 
   // The following eight test cases are fully-braced versions of the examples at
   // "llvm.org/docs/CodingStandards.html#don-t-use-braces-on-simple-single-