Author: mydeveloperday Date: 2023-04-18T10:17:28+01:00 New Revision: 799b794d7699bc7ecf07d8d588e125edb3967507
URL: https://github.com/llvm/llvm-project/commit/799b794d7699bc7ecf07d8d588e125edb3967507 DIFF: https://github.com/llvm/llvm-project/commit/799b794d7699bc7ecf07d8d588e125edb3967507.diff LOG: [clang-format] C# short ternary operator misinterpreted as a CSharpNullable 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 Reviewed By: owenpan, HazardyKnusperkeks Differential Revision: https://reviews.llvm.org/D148473 Added: Modified: clang/lib/Format/TokenAnnotator.cpp clang/unittests/Format/TokenAnnotatorTest.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 8b00b1c141774..06593355d4d5a 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1312,11 +1312,34 @@ class AnnotatingParser { 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; } diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp index c49c4182807e5..cd39661f7f8de 100644 --- a/clang/unittests/Format/TokenAnnotatorTest.cpp +++ b/clang/unittests/Format/TokenAnnotatorTest.cpp @@ -1724,6 +1724,34 @@ TEST_F(TokenAnnotatorTest, UnderstandsConditionParens) { EXPECT_TOKEN(Tokens[8], tok::l_paren, TT_ConditionLParen); } +TEST_F(TokenAnnotatorTest, CSharpNullableTypes) { + FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp); + + auto Tokens = annotate("int? a;", Style); + EXPECT_EQ(Tokens.size(), 5u) << Tokens; + EXPECT_TOKEN(Tokens[1], tok::question, TT_CSharpNullable); + + Tokens = annotate("int? a = 1;", Style); + EXPECT_EQ(Tokens.size(), 7u) << Tokens; + EXPECT_TOKEN(Tokens[1], tok::question, TT_CSharpNullable); + + Tokens = annotate("int?)", Style); + EXPECT_EQ(Tokens.size(), 4u) << Tokens; + EXPECT_TOKEN(Tokens[1], tok::question, TT_CSharpNullable); + + Tokens = annotate("int?>", Style); + EXPECT_EQ(Tokens.size(), 4u) << Tokens; + EXPECT_TOKEN(Tokens[1], tok::question, TT_CSharpNullable); + + Tokens = annotate("cond? id : id2", Style); + EXPECT_EQ(Tokens.size(), 6u) << Tokens; + EXPECT_TOKEN(Tokens[1], tok::question, TT_ConditionalExpr); + + Tokens = annotate("cond ? cond2 ? : id1 : id2", Style); + EXPECT_EQ(Tokens.size(), 9u) << Tokens; + EXPECT_TOKEN(Tokens[1], tok::question, TT_ConditionalExpr); +} + } // namespace } // namespace format } // namespace clang _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
