Keep property with method

closes #1010 # Conflicts: # Src/CSharpier.Tests/FormattingTests/TestFiles/cs/MemberChains.test
belav · Dec 16, 2023 · a006745 · a006745
1 parent 6c8bd40
commit a006745
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 24 deletions.
diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/MemberChain_PropertiesConsistent.test b/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/MemberChain_PropertiesConsistent.test
@@ -1,14 +1,15 @@
-var someVariable = someObject
-    .Property
-    .CallMethod(someValue => someValue.SomeProperty == someOtherValue___________________________);
+var someVariable = someObject.Property.CallMethod(
+    someValue => someValue.SomeProperty == someOtherValue___________________________
+);
 
 var someVariable = someObject
     .Property()
     .CallMethod(someValue => someValue.SomeProperty == someOtherValue___________________________);
 
 var someVariable = someObject
-    .Property
-    .CallMethod(someValue => someValue.SomeProperty == someOtherValue___________________________)
+    .Property.CallMethod(
+        someValue => someValue.SomeProperty == someOtherValue___________________________
+    )
     .CallMethod();
 
 var someVariable = someObject
@@ -24,8 +25,9 @@ var someVariable = this.Property.CallMethod(
 var someVariable = this.Property()
     .CallMethod(someValue => someValue.SomeProperty == someOtherValue___________________________);
 
-var someVariable = this.Property
-    .CallMethod(someValue => someValue.SomeProperty == someOtherValue___________________________)
+var someVariable = this.Property.CallMethod(
+    someValue => someValue.SomeProperty == someOtherValue___________________________
+)
     .CallMethod();
 
 var someVariable = this.Property()

diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/MemberChains.test b/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/MemberChains.test
@@ -52,13 +52,11 @@ class ClassName
             .Where(o => someLongCondition__________________________);
 
         var someValue = someOtherValue!
-            .Thing!
-            .Where(o => someLongCondition__________________________)
+            .Thing!.Where(o => someLongCondition__________________________)
             .Where(o => someLongCondition__________________________);
 
         var someValue = someOtherValue
-            .Thing
-            .Where(o => someLongCondition__________________________)
+            .Thing.Where(o => someLongCondition__________________________)
             .Where(o => someLongCondition__________________________);
 
         var someValue = someOtherValue
@@ -84,8 +82,7 @@ class ClassName
             );
 
         roleNames
-            .Value
-            .Where(o => o.SomeProperty____________________________________)
+            .Value.Where(o => o.SomeProperty____________________________________)
             .Select(o => o.SomethingElse);
 
         return someCondition
@@ -113,12 +110,9 @@ class ClassName
             someParameter____________________________________
         )!;
 
-        var someVariable = someObject
-            .Property
-            .CallMethod(
-                someValue =>
-                    someValue.SomeProperty == someOtherValue___________________________________
-            );
+        var someVariable = someObject.Property.CallMethod(
+            someValue => someValue.SomeProperty == someOtherValue___________________________________
+        );
 
         CallMethod(
                 firstParameter____________________________,
@@ -238,8 +232,7 @@ class ClassName
             .CallMethod__________________();
 
         someThing_______________________
-            .Property
-            .CallMethod__________________()
+            .Property.CallMethod__________________()
             .CallMethod__________________();
 
         someThing_______________________
@@ -248,8 +241,7 @@ class ClassName
             .CallMethod__________________();
 
         someThing_______________________
-            .Property!
-            .CallMethod__________________()
+            .Property!.CallMethod__________________()
             .CallMethod__________________();
     }
 }
diff --git a/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/InvocationExpression.cs b/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/InvocationExpression.cs
@@ -296,7 +296,6 @@ or ConditionalAccessExpressionSyntax
                 printedNodes[index].Node
                 is (
                     InvocationExpressionSyntax
-                    or MemberAccessExpressionSyntax
                     or ElementAccessExpressionSyntax
                     or MemberBindingExpressionSyntax
                 )