curdeius created this revision. curdeius added reviewers: MyDeveloperDay, HazardyKnusperkeks, owenpan. Herald added a project: All. curdeius requested review of this revision. Herald added a project: clang. Herald added a subscriber: cfe-commits.
Fixes https://github.com/llvm/llvm-project/issues/53153. Depends on D121132 <https://reviews.llvm.org/D121132>. Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D121136 Files: clang/lib/Format/TokenAnnotator.cpp clang/unittests/Format/FormatTestCSharp.cpp Index: clang/unittests/Format/FormatTestCSharp.cpp =================================================================== --- clang/unittests/Format/FormatTestCSharp.cpp +++ clang/unittests/Format/FormatTestCSharp.cpp @@ -1078,6 +1078,16 @@ MicrosoftStyle); } +TEST_F(FormatTestCSharp, DefaultLiteral) { + FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp); + + verifyFormat( + "T[] InitializeArray<T>(int length, T initialValue = default) {}", Style); + verifyFormat("System.Numerics.Complex fillValue = default;", Style); + verifyFormat("int Value { get } = default;", Style); + verifyFormat("int Value { get } = default!;", Style); +} + TEST_F(FormatTestCSharp, CSharpSpaces) { FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp); Style.SpaceBeforeSquareBrackets = false; Index: clang/lib/Format/TokenAnnotator.cpp =================================================================== --- clang/lib/Format/TokenAnnotator.cpp +++ clang/lib/Format/TokenAnnotator.cpp @@ -1650,9 +1650,9 @@ : Current.Previous->is(tok::identifier); if (IsIdentifier || Current.Previous->isOneOf( - tok::kw_namespace, tok::r_paren, tok::r_square, tok::r_brace, - tok::kw_false, tok::kw_true, Keywords.kw_type, Keywords.kw_get, - Keywords.kw_init, Keywords.kw_set) || + tok::kw_default, tok::kw_namespace, tok::r_paren, tok::r_square, + tok::r_brace, tok::kw_false, tok::kw_true, Keywords.kw_type, + Keywords.kw_get, Keywords.kw_init, Keywords.kw_set) || Current.Previous->Tok.isLiteral()) { Current.setType(TT_NonNullAssertion); return;
Index: clang/unittests/Format/FormatTestCSharp.cpp =================================================================== --- clang/unittests/Format/FormatTestCSharp.cpp +++ clang/unittests/Format/FormatTestCSharp.cpp @@ -1078,6 +1078,16 @@ MicrosoftStyle); } +TEST_F(FormatTestCSharp, DefaultLiteral) { + FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp); + + verifyFormat( + "T[] InitializeArray<T>(int length, T initialValue = default) {}", Style); + verifyFormat("System.Numerics.Complex fillValue = default;", Style); + verifyFormat("int Value { get } = default;", Style); + verifyFormat("int Value { get } = default!;", Style); +} + TEST_F(FormatTestCSharp, CSharpSpaces) { FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp); Style.SpaceBeforeSquareBrackets = false; Index: clang/lib/Format/TokenAnnotator.cpp =================================================================== --- clang/lib/Format/TokenAnnotator.cpp +++ clang/lib/Format/TokenAnnotator.cpp @@ -1650,9 +1650,9 @@ : Current.Previous->is(tok::identifier); if (IsIdentifier || Current.Previous->isOneOf( - tok::kw_namespace, tok::r_paren, tok::r_square, tok::r_brace, - tok::kw_false, tok::kw_true, Keywords.kw_type, Keywords.kw_get, - Keywords.kw_init, Keywords.kw_set) || + tok::kw_default, tok::kw_namespace, tok::r_paren, tok::r_square, + tok::r_brace, tok::kw_false, tok::kw_true, Keywords.kw_type, + Keywords.kw_get, Keywords.kw_init, Keywords.kw_set) || Current.Previous->Tok.isLiteral()) { Current.setType(TT_NonNullAssertion); return;
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits