[PATCH] D75006: Wrap lines for C# property accessors

[Jonathan B Coe via Phabricator via cfe-commits]

jbcoe updated this revision to Diff 246170.
jbcoe added a comment.

Handle C# access modifier `internal `.

Fix typo in test for expression-bodied get/set methods.


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D75006/new/

https://reviews.llvm.org/D75006

Files:
  clang/lib/Format/UnwrappedLineFormatter.cpp
  clang/unittests/Format/FormatTestCSharp.cpp


Index: clang/unittests/Format/FormatTestCSharp.cpp
===================================================================
--- clang/unittests/Format/FormatTestCSharp.cpp
+++ clang/unittests/Format/FormatTestCSharp.cpp
@@ -554,5 +554,25 @@
                Style);
 }
 
+TEST_F(FormatTestCSharp, CSharpPropertyAccessors) {
+  FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
+
+  verifyFormat(R"(//
+int Value { get; set }
+string Name { get; private set }
+string AnotherName { protected get; private set }
+string YetAnotherName { internal get; internal set }
+double Sum { get })",
+               Style);
+
+  // Do not wrap expression body definitions.
+  verifyFormat(R"(//
+public string Name {
+  get => _name;
+  set => _name = value;
+})",
+               Style);
+}
+
 } // namespace format
 } // end namespace clang
Index: clang/lib/Format/UnwrappedLineFormatter.cpp
===================================================================
--- clang/lib/Format/UnwrappedLineFormatter.cpp
+++ clang/lib/Format/UnwrappedLineFormatter.cpp
@@ -292,6 +292,13 @@
       }
     }
 
+    // Try to merge a CSharp property declaration like `{ get; private set }`.
+    if (Style.isCSharp()) {
+      unsigned CSPA = tryMergeCSharpPropertyAccessor(I, E, Limit);
+      if (CSPA > 0)
+        return CSPA;
+    }
+
     // Try to merge a function block with left brace unwrapped
     if (TheLine->Last->is(TT_FunctionLBrace) &&
         TheLine->First != TheLine->Last) {
@@ -421,6 +428,53 @@
     return 0;
   }
 
+  unsigned tryMergeCSharpPropertyAccessor(
+      SmallVectorImpl<AnnotatedLine *>::const_iterator I,
+      SmallVectorImpl<AnnotatedLine *>::const_iterator E, unsigned /*Limit*/) {
+    // Does line start with `{`
+    if (I[0]->Last->isNot(TT_FunctionLBrace))
+      return 0;
+
+    // Does line start with `[access-modifier] get`
+    if (I + 1 == E)
+      return 0;
+    auto *GetToken = I[1]->First;
+    if (GetToken && GetToken->isOneOf(tok::kw_public, tok::kw_protected,
+                                      tok::kw_private, Keywords.kw_internal))
+      GetToken = GetToken->Next;
+    if (!GetToken || GetToken->TokenText != "get")
+      return 0;
+    // Keep `get => some_code;` on a single line.
+    if (GetToken->Next && GetToken->Next->isNot(tok::semi))
+      return 0;
+
+    // Does line start with `[access-modifier] set` or `{`
+    if (I + 2 == E)
+      return 0;
+    auto *SetToken = I[2]->First;
+    if (SetToken && SetToken->isOneOf(tok::kw_public, tok::kw_protected,
+                                      tok::kw_private, Keywords.kw_internal))
+      SetToken = SetToken->Next;
+
+    if (SetToken && SetToken->is(tok::r_brace))
+      return 2;
+
+    if (!SetToken || SetToken->TokenText != "set")
+      return 0;
+    // Keep `set => some_code;` on a single line.
+    if (SetToken->Next)
+      return 0;
+
+    // Does line start with `}`
+    if (I + 3 == E)
+      return 0;
+    auto *RBrace = I[3]->First;
+    if (!RBrace || !RBrace->is(tok::r_brace))
+      return 0;
+
+    return 3;
+  }
+
   unsigned
   tryMergeSimplePPDirective(SmallVectorImpl<AnnotatedLine *>::const_iterator I,
                             SmallVectorImpl<AnnotatedLine *>::const_iterator E,

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits