diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -3957,6 +3957,9 @@ Left.MatchingParen->endsSequence(tok::l_paren, tok::at)))) { return true; } + // Add space in attribute like `(* ASYNC_REG = "TRUE" *)`. + if (Left.endsSequence(tok::star, tok::l_paren) && Right.is(tok::identifier)) + return true; } if (Left.is(TT_ImplicitStringLiteral)) return Right.hasWhitespaceBefore(); 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 @@ -1456,6 +1456,26 @@ addUnwrappedLine(); return; } + + if (Style.isVerilog()) { + // Skip things that can exist before keywords like 'if' and 'case'. + while (true) { + if (FormatTok->isOneOf(Keywords.kw_priority, Keywords.kw_unique, + Keywords.kw_unique0)) { + nextToken(); + } else if (FormatTok->is(tok::l_paren)) { + const FormatToken *Next = Tokens->peekNextToken(); + if (Next && Next->is(tok::star)) + parseParens(); + else + break; + } else { + break; + } + } + } + + // Tokens that only make sense at the beginning of a line. switch (FormatTok->Tok.getKind()) { case tok::kw_asm: nextToken(); diff --git a/clang/unittests/Format/FormatTestVerilog.cpp b/clang/unittests/Format/FormatTestVerilog.cpp --- a/clang/unittests/Format/FormatTestVerilog.cpp +++ b/clang/unittests/Format/FormatTestVerilog.cpp @@ -71,6 +71,12 @@ TEST_F(FormatTestVerilog, If) { verifyFormat("if (x)\n" " x = x;"); + verifyFormat("unique if (x)\n" + " x = x;"); + verifyFormat("unique0 if (x)\n" + " x = x;"); + verifyFormat("priority if (x)\n" + " x = x;"); verifyFormat("if (x)\n" " x = x;\n" "x = x;"); @@ -137,6 +143,14 @@ " x = {x};\n" "else\n" " {x} = {x};"); + + // With attributes. + verifyFormat("(* x *) if (x)\n" + " x = x;"); + verifyFormat("(* x = \"x\" *) if (x)\n" + " x = x;"); + verifyFormat("(* x, x = \"x\" *) if (x)\n" + " x = x;"); } TEST_F(FormatTestVerilog, Preprocessor) {