Index: lib/Format/UnwrappedLineParser.cpp =================================================================== --- lib/Format/UnwrappedLineParser.cpp +++ lib/Format/UnwrappedLineParser.cpp @@ -1387,6 +1387,7 @@ case tok::amp: case tok::star: case tok::kw_const: + case tok::kw_noexcept: case tok::comma: case tok::less: case tok::greater: Index: unittests/Format/FormatTest.cpp =================================================================== --- unittests/Format/FormatTest.cpp +++ unittests/Format/FormatTest.cpp @@ -11522,6 +11522,12 @@ " ;\n" "};"); + verifyFormat("if (a && []() noexcept {\n" + " doo_dah();\n" + " doo_dah();\n" + " }()) {\n" + "}"); + // Lambdas with complex multiline introducers. verifyFormat( "aaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"