owenpan created this revision.
Herald added projects: All, clang, clang-format.
Herald added a subscriber: cfe-commits.
Herald added reviewers: rymiel, HazardyKnusperkeks, MyDeveloperDay.
owenpan requested review of this revision.
Fixes https://github.com/llvm/llvm-project/issues/64229.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D156655
Files:
clang/lib/Format/UnwrappedLineParser.cpp
clang/unittests/Format/FormatTest.cpp
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -3023,6 +3023,26 @@
" some_other_code();\n"
"}\n"
"}");
+ verifyFormat("{\n"
+ "L0:\n"
+ "[[foo]] L1:\n"
+ "[[bar]] [[baz]] L2:\n"
+ " g();\n"
+ "}");
+ verifyFormat("{\n"
+ "[[foo]] L1: {\n"
+ "[[bar]] [[baz]] L2:\n"
+ " g();\n"
+ "}\n"
+ "}");
+ verifyFormat("{\n"
+ "[[foo]] L1:\n"
+ " f();\n"
+ " {\n"
+ " [[bar]] [[baz]] L2:\n"
+ " g();\n"
+ " }\n"
+ "}");
FormatStyle Style = getLLVMStyle();
Style.IndentGotoLabels = false;
verifyFormat("void f() {\n"
@@ -3046,12 +3066,22 @@
" some_code();\n"
"test_label:;\n"
" int i = 0;\n"
- "}");
+ "}",
+ Style);
verifyFormat("{\n"
" some_code();\n"
"test_label: { some_other_code(); }\n"
"}",
Style);
+ verifyFormat("{\n"
+ "[[foo]] L1:\n"
+ " f();\n"
+ " {\n"
+ "[[bar]] [[baz]] L2:\n"
+ " g();\n"
+ " }\n"
+ "}",
+ Style);
// The opening brace may either be on the same unwrapped line as the colon or
// on a separate one. The formatter should recognize both.
Style = getLLVMStyle();
@@ -3064,6 +3094,14 @@
"}\n"
"}",
Style);
+ verifyFormat("{\n"
+ "[[foo]] L1:\n"
+ "{\n"
+ "[[bar]] [[baz]] L2:\n"
+ " g();\n"
+ "}\n"
+ "}",
+ Style);
}
TEST_F(FormatTest, MultiLineControlStatements) {
Index: clang/lib/Format/UnwrappedLineParser.cpp
===================================================================
--- clang/lib/Format/UnwrappedLineParser.cpp
+++ clang/lib/Format/UnwrappedLineParser.cpp
@@ -1398,7 +1398,10 @@
return;
}
- if (Style.isVerilog()) {
+ if (Style.isCpp()) {
+ while (FormatTok->is(tok::l_square) && handleCppAttributes()) {
+ }
+ } else if (Style.isVerilog()) {
if (Keywords.isVerilogStructuredProcedure(*FormatTok)) {
parseForOrWhileLoop(/*HasParens=*/false);
return;
@@ -1634,6 +1637,17 @@
parseNamespace();
return;
}
+ // In Verilog labels can be any expression, so we don't do them here.
+ if (!Style.isVerilog() && Tokens->peekNextToken()->is(tok::colon) &&
+ !Line->MustBeDeclaration) {
+ nextToken();
+ Line->Tokens.begin()->Tok->MustBreakBefore = true;
+ FormatTok->setFinalizedType(TT_GotoLabelColon);
+ parseLabel(!Style.IndentGotoLabels);
+ if (HasLabel)
+ *HasLabel = true;
+ return;
+ }
// In all other cases, parse the declaration.
break;
default:
@@ -1938,16 +1952,6 @@
return I != E && (++I == E);
};
if (OneTokenSoFar()) {
- // In Verilog labels can be any expression, so we don't do them here.
- if (!Style.isVerilog() && FormatTok->is(tok::colon) &&
- !Line->MustBeDeclaration) {
- Line->Tokens.begin()->Tok->MustBreakBefore = true;
- FormatTok->setFinalizedType(TT_GotoLabelColon);
- parseLabel(!Style.IndentGotoLabels);
- if (HasLabel)
- *HasLabel = true;
- return;
- }
// Recognize function-like macro usages without trailing semicolon as
// well as free-standing macros like Q_OBJECT.
bool FunctionLike = FormatTok->is(tok::l_paren);
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
