[clang-format] Add TT_AfterPPDirective for better annotation (#121622)
For now, we only need to annotate the token after #error or #warning.
Fixes #117706.
GitOrigin-RevId: 44b83e81b5a48d543bf718907f00a21179ec03a4
diff --git a/lib/Format/FormatToken.h b/lib/Format/FormatToken.h
index 8917049..0fd3a49 100644
--- a/lib/Format/FormatToken.h
+++ b/lib/Format/FormatToken.h
@@ -25,6 +25,7 @@
namespace format {
#define LIST_TOKEN_TYPES \
+ TYPE(AfterPPDirective) \
TYPE(ArrayInitializerLSquare) \
TYPE(ArraySubscriptLSquare) \
TYPE(AttributeColon) \
diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp
index b0f5709..fad3757 100644
--- a/lib/Format/TokenAnnotator.cpp
+++ b/lib/Format/TokenAnnotator.cpp
@@ -4941,6 +4941,10 @@
Right.is(TT_ModulePartitionColon)) {
return true;
}
+
+ if (Right.is(TT_AfterPPDirective))
+ return true;
+
// No space between import foo:bar but keep a space between import :bar;
if (Left.is(tok::identifier) && Right.is(TT_ModulePartitionColon))
return false;
diff --git a/lib/Format/UnwrappedLineParser.cpp b/lib/Format/UnwrappedLineParser.cpp
index 5375eef..46fd566 100644
--- a/lib/Format/UnwrappedLineParser.cpp
+++ b/lib/Format/UnwrappedLineParser.cpp
@@ -1030,6 +1030,12 @@
case tok::pp_pragma:
parsePPPragma();
break;
+ case tok::pp_error:
+ case tok::pp_warning:
+ nextToken();
+ if (!eof() && Style.isCpp())
+ FormatTok->setFinalizedType(TT_AfterPPDirective);
+ [[fallthrough]];
default:
parsePPUnknown();
break;
@@ -1209,9 +1215,8 @@
}
void UnwrappedLineParser::parsePPUnknown() {
- do {
+ while (!eof())
nextToken();
- } while (!eof());
if (Style.IndentPPDirectives != FormatStyle::PPDIS_None)
Line->Level += PPBranchLevel + 1;
addUnwrappedLine();
diff --git a/unittests/Format/TokenAnnotatorTest.cpp b/unittests/Format/TokenAnnotatorTest.cpp
index d61b9ad..875feff 100644
--- a/unittests/Format/TokenAnnotatorTest.cpp
+++ b/unittests/Format/TokenAnnotatorTest.cpp
@@ -3635,6 +3635,13 @@
EXPECT_TOKEN(Tokens[9], tok::l_brace, TT_FunctionLBrace);
}
+TEST_F(TokenAnnotatorTest, AfterPPDirective) {
+ auto Tokens = annotate("#error -- My error message");
+
+ ASSERT_EQ(Tokens.size(), 7u) << Tokens;
+ EXPECT_TOKEN(Tokens[2], tok::minusminus, TT_AfterPPDirective);
+}
+
} // namespace
} // namespace format
} // namespace clang
