diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp --- a/clang/lib/Format/UnwrappedLineParser.cpp +++ b/clang/lib/Format/UnwrappedLineParser.cpp @@ -3081,8 +3081,15 @@ if (!tryToParseBracedList()) break; } - if (FormatTok->is(tok::l_square) && !tryToParseLambda()) - break; + if (FormatTok->is(tok::l_square)) { + FormatToken *Previous = FormatTok->Previous; + if (!Previous || Previous->isNot(tok::r_paren)) { + // 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; if (Style.isCSharp() && FormatTok->is(Keywords.kw_where)) { 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 @@ -23483,6 +23483,8 @@ TEST_F(FormatTest, ShortTemplatedArgumentLists) { auto Style = getLLVMStyle(); + verifyFormat("template <> struct S : Template {};\n", Style); + verifyFormat("template <> struct S : Template {};\n", Style); verifyFormat("struct Y : X<[] { return 0; }> {};", Style); verifyFormat("struct Y<[] { return 0; }> {};", Style);