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 @@ -369,6 +369,17 @@ if (!Style.isCSharp()) return false; + // `identifier[i]` is not an attribute. + if (Tok.Previous && Tok.Previous->is(tok::identifier)) + return false; + + // Chains [] in of `identifier[i][j][k]` are not attributes. + if (Tok.Previous && Tok.Previous->is(tok::r_square)) { + auto *MatchingParen = Tok.Previous->MatchingParen; + if (!MatchingParen || MatchingParen->is(TT_ArraySubscriptLSquare)) + return false; + } + const FormatToken *AttrTok = Tok.Next; if (!AttrTok) return false; diff --git a/clang/unittests/Format/FormatTestCSharp.cpp b/clang/unittests/Format/FormatTestCSharp.cpp --- a/clang/unittests/Format/FormatTestCSharp.cpp +++ b/clang/unittests/Format/FormatTestCSharp.cpp @@ -628,5 +628,13 @@ Style); // An array of a nullable type. } +TEST_F(FormatTestCSharp, CSharpArraySubscripts) { + FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp); + + // Do not format array subscript operators as attributes. + verifyFormat(R"(if (someThings[index].Contains(myThing)) {)", Style); + verifyFormat(R"(if (someThings[i][j][k].Contains(myThing)) {)", Style); +} + } // namespace format } // end namespace clang