Dealing with an edge case for conditional access

closes #603
belav · Apr 4, 2022 · 1fe14a9 · 1fe14a9
1 parent f1a0b03
commit 1fe14a9
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/InvocationExpressions.cst b/Src/CSharpier.Tests/FormattingTests/TestFiles/InvocationExpressions.cst
@@ -234,5 +234,13 @@ class ClassName
                 longParameter_______________________________________
             )
             .CallMethod__________________();
+
+        someThing_______________________.Property
+            .CallMethod__________________()
+            .CallMethod__________________();
+
+        someThing_______________________?.Property
+            .CallMethod__________________()
+            .CallMethod__________________();
     }
 }
diff --git a/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/InvocationExpression.cs b/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/InvocationExpression.cs
@@ -245,6 +245,23 @@ List<PrintedNode> printedNodes
         {
             for (; index + 1 < printedNodes.Count; ++index)
             {
+                /* this handles the special case where we want ?.Property on the same line
+                    someThing_______________________?.Property
+                        .CallMethod__________________()
+                        .CallMethod__________________();
+                 */
+                if (
+                    printedNodes[index].Node is ConditionalAccessExpressionSyntax
+                    && printedNodes[index + 1].Node
+                        is MemberBindingExpressionSyntax { Parent: MemberAccessExpressionSyntax }
+                )
+                {
+                    currentGroup.Add(printedNodes[index]);
+                    currentGroup.Add(printedNodes[index + 1]);
+                    index++;
+                    continue;
+                }
+
                 if (
                     (
                         IsMemberish(printedNodes[index].Node)