Make sure null conditionals break like regular expressions (#593)

closes #561 Co-authored-by: Lasath Fernando <devel@lasath.org>
belav · Feb 7, 2022 · 38400ba · 38400ba
1 parent 6be42ee
commit 38400ba
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/InvocationExpressions.cst b/Src/CSharpier.Tests/FormattingTests/TestFiles/InvocationExpressions.cst
@@ -8,6 +8,10 @@ class ClassName
             .DoSomething___________________()
             .DoSomething___________________();
 
+        this.DoSomething___________________()
+            ?.DoSomething___________________()
+            ?.DoSomething___________________();
+
         base.DoSomething___________________()
             .DoSomething___________________()
             .DoSomething___________________();
@@ -157,8 +161,8 @@ class ClassName
                 two__________________________________
             );
 
-        SomeObject?
-            .CallMethod(parameter_______________________________________________________________)
+        SomeObject
+            ?.CallMethod(parameter_______________________________________________________________)
             .ToArray();
 
         SomeObject

diff --git a/Src/CSharpier/DocTypes/Doc.cs b/Src/CSharpier/DocTypes/Doc.cs
@@ -2,6 +2,11 @@ namespace CSharpier.DocTypes;
 
 internal abstract class Doc
 {
+    public override string ToString()
+    {
+        return DocSerializer.Serialize(this);
+    }
+
     public static implicit operator Doc(string value)
     {
         return new StringDoc(value);

diff --git a/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/InvocationExpression.cs b/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/InvocationExpression.cs
@@ -104,13 +104,11 @@ And we want to work with them from Left to Right
         }
         else if (expression is ConditionalAccessExpressionSyntax conditionalAccessExpressionSyntax)
         {
+            FlattenAndPrintNodes(conditionalAccessExpressionSyntax.Expression, printedNodes);
             printedNodes.Add(
                 new PrintedNode(
                     conditionalAccessExpressionSyntax,
-                    Doc.Concat(
-                        Node.Print(conditionalAccessExpressionSyntax.Expression),
-                        Token.Print(conditionalAccessExpressionSyntax.OperatorToken)
-                    )
+                    Token.Print(conditionalAccessExpressionSyntax.OperatorToken)
                 )
             );
             FlattenAndPrintNodes(conditionalAccessExpressionSyntax.WhenNotNull, printedNodes);