MyDeveloperDay created this revision.
MyDeveloperDay added a reviewer: owenpan.
MyDeveloperDay added a project: clang-format.
Herald added projects: All, clang.
Herald added reviewers: rymiel, HazardyKnusperkeks.
MyDeveloperDay requested review of this revision.
Refactor the CSharpNullable assignment code to be a little easier to read
(Honestly I don't like it when an if expression get really long and
complicated).
Handle the case where '?' is actually a ternary operator.
Fixes: #58067
https://github.com/llvm/llvm-project/issues/58067
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D148473
Files:
clang/lib/Format/TokenAnnotator.cpp
clang/unittests/Format/TokenAnnotatorTest.cpp
Index: clang/unittests/Format/TokenAnnotatorTest.cpp
===================================================================
--- clang/unittests/Format/TokenAnnotatorTest.cpp
+++ clang/unittests/Format/TokenAnnotatorTest.cpp
@@ -1688,6 +1688,34 @@
EXPECT_TOKEN(Tokens[13], tok::l_brace, TT_FunctionLBrace);
}
+TEST_F(TokenAnnotatorTest, CSharpNullableTypes) {
+ FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
+
+ auto Tokens = annotate("int? a;\n", Style);
+ EXPECT_EQ(Tokens.size(), 5u) << Tokens;
+ EXPECT_TOKEN(Tokens[1], tok::question, TT_CSharpNullable);
+
+ Tokens = annotate("int? a = 1;\n", Style);
+ EXPECT_EQ(Tokens.size(), 7u) << Tokens;
+ EXPECT_TOKEN(Tokens[1], tok::question, TT_CSharpNullable);
+
+ Tokens = annotate("int?)\n", Style);
+ EXPECT_EQ(Tokens.size(), 4u) << Tokens;
+ EXPECT_TOKEN(Tokens[1], tok::question, TT_CSharpNullable);
+
+ Tokens = annotate("int?>\n", Style);
+ EXPECT_EQ(Tokens.size(), 4u) << Tokens;
+ EXPECT_TOKEN(Tokens[1], tok::question, TT_CSharpNullable);
+
+ Tokens = annotate("cond? id : id2\n", Style);
+ EXPECT_EQ(Tokens.size(), 6u) << Tokens;
+ EXPECT_TOKEN(Tokens[1], tok::question, TT_ConditionalExpr);
+
+ Tokens = annotate("cond ? cond2 ? : id1 : id2\n", Style);
+ EXPECT_EQ(Tokens.size(), 9u) << Tokens;
+ EXPECT_TOKEN(Tokens[1], tok::question, TT_ConditionalExpr);
+}
+
} // namespace
} // namespace format
} // namespace clang
Index: clang/lib/Format/TokenAnnotator.cpp
===================================================================
--- clang/lib/Format/TokenAnnotator.cpp
+++ clang/lib/Format/TokenAnnotator.cpp
@@ -1312,11 +1312,34 @@
if (Style.isCSharp()) {
// `Type?)`, `Type?>`, `Type? name;` and `Type? name =` can only be
// nullable types.
+
+ // `Type?)`, `Type?>`, `Type? name;`
+ if (Tok->Next &&
+ (Tok->Next->startsSequence(tok::question, tok::r_paren) ||
+ Tok->Next->startsSequence(tok::question, tok::greater) ||
+ Tok->Next->startsSequence(tok::question, tok::identifier,
+ tok::semi))) {
+ Tok->setType(TT_CSharpNullable);
+ break;
+ }
+
+ // `Type? name =`
+ if (Tok->Next && Tok->Next->is(tok::identifier) && Tok->Next->Next &&
+ Tok->Next->Next->is(tok::equal)) {
+ Tok->setType(TT_CSharpNullable);
+ break;
+ }
+
// Line.MustBeDeclaration will be true for `Type? name;`.
- if ((!Contexts.back().IsExpression && Line.MustBeDeclaration) ||
- (Tok->Next && Tok->Next->isOneOf(tok::r_paren, tok::greater)) ||
- (Tok->Next && Tok->Next->is(tok::identifier) && Tok->Next->Next &&
- Tok->Next->Next->is(tok::equal))) {
+ // But not
+ // cond ? "A" : "B";
+ // cond ? id : "B";
+ // cond ? cond2 ? "A" : "B" : "C";
+ if (!Contexts.back().IsExpression && Line.MustBeDeclaration &&
+ !(Tok->Next &&
+ Tok->Next->isOneOf(tok::identifier, tok::string_literal) &&
+ Tok->Next->Next &&
+ Tok->Next->Next->isOneOf(tok::colon, tok::question))) {
Tok->setType(TT_CSharpNullable);
break;
}
Index: clang/unittests/Format/TokenAnnotatorTest.cpp
===================================================================
--- clang/unittests/Format/TokenAnnotatorTest.cpp
+++ clang/unittests/Format/TokenAnnotatorTest.cpp
@@ -1688,6 +1688,34 @@
EXPECT_TOKEN(Tokens[13], tok::l_brace, TT_FunctionLBrace);
}
+TEST_F(TokenAnnotatorTest, CSharpNullableTypes) {
+ FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
+
+ auto Tokens = annotate("int? a;\n", Style);
+ EXPECT_EQ(Tokens.size(), 5u) << Tokens;
+ EXPECT_TOKEN(Tokens[1], tok::question, TT_CSharpNullable);
+
+ Tokens = annotate("int? a = 1;\n", Style);
+ EXPECT_EQ(Tokens.size(), 7u) << Tokens;
+ EXPECT_TOKEN(Tokens[1], tok::question, TT_CSharpNullable);
+
+ Tokens = annotate("int?)\n", Style);
+ EXPECT_EQ(Tokens.size(), 4u) << Tokens;
+ EXPECT_TOKEN(Tokens[1], tok::question, TT_CSharpNullable);
+
+ Tokens = annotate("int?>\n", Style);
+ EXPECT_EQ(Tokens.size(), 4u) << Tokens;
+ EXPECT_TOKEN(Tokens[1], tok::question, TT_CSharpNullable);
+
+ Tokens = annotate("cond? id : id2\n", Style);
+ EXPECT_EQ(Tokens.size(), 6u) << Tokens;
+ EXPECT_TOKEN(Tokens[1], tok::question, TT_ConditionalExpr);
+
+ Tokens = annotate("cond ? cond2 ? : id1 : id2\n", Style);
+ EXPECT_EQ(Tokens.size(), 9u) << Tokens;
+ EXPECT_TOKEN(Tokens[1], tok::question, TT_ConditionalExpr);
+}
+
} // namespace
} // namespace format
} // namespace clang
Index: clang/lib/Format/TokenAnnotator.cpp
===================================================================
--- clang/lib/Format/TokenAnnotator.cpp
+++ clang/lib/Format/TokenAnnotator.cpp
@@ -1312,11 +1312,34 @@
if (Style.isCSharp()) {
// `Type?)`, `Type?>`, `Type? name;` and `Type? name =` can only be
// nullable types.
+
+ // `Type?)`, `Type?>`, `Type? name;`
+ if (Tok->Next &&
+ (Tok->Next->startsSequence(tok::question, tok::r_paren) ||
+ Tok->Next->startsSequence(tok::question, tok::greater) ||
+ Tok->Next->startsSequence(tok::question, tok::identifier,
+ tok::semi))) {
+ Tok->setType(TT_CSharpNullable);
+ break;
+ }
+
+ // `Type? name =`
+ if (Tok->Next && Tok->Next->is(tok::identifier) && Tok->Next->Next &&
+ Tok->Next->Next->is(tok::equal)) {
+ Tok->setType(TT_CSharpNullable);
+ break;
+ }
+
// Line.MustBeDeclaration will be true for `Type? name;`.
- if ((!Contexts.back().IsExpression && Line.MustBeDeclaration) ||
- (Tok->Next && Tok->Next->isOneOf(tok::r_paren, tok::greater)) ||
- (Tok->Next && Tok->Next->is(tok::identifier) && Tok->Next->Next &&
- Tok->Next->Next->is(tok::equal))) {
+ // But not
+ // cond ? "A" : "B";
+ // cond ? id : "B";
+ // cond ? cond2 ? "A" : "B" : "C";
+ if (!Contexts.back().IsExpression && Line.MustBeDeclaration &&
+ !(Tok->Next &&
+ Tok->Next->isOneOf(tok::identifier, tok::string_literal) &&
+ Tok->Next->Next &&
+ Tok->Next->Next->isOneOf(tok::colon, tok::question))) {
Tok->setType(TT_CSharpNullable);
break;
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
