Commit 736fef97 authored by Jonathan Coe's avatar Jonathan Coe
Browse files

[clang-format] Do not format C# array subscript operators as attributes 

Summary:
Fix misidentification of C# array subscript operators.

Reviewers: krasimir

Reviewed By: krasimir

Subscribers: cfe-commits, MyDeveloperDay

Tags: #clang-format, #clang

Differential Revision: https://reviews.llvm.org/D75517
parent 900dee8c

clang/lib/Format/TokenAnnotator.cpp

+11 −0
Original line number Diff line number Diff line
@@ -369,6 +369,17 @@ private: 
    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;

clang/unittests/Format/FormatTestCSharp.cpp

+8 −0
Original line number Diff line number Diff line
@@ -628,5 +628,13 @@ TEST_F(FormatTestCSharp, CSharpNullableTypes) { 
               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