Improving formatting of conditional in argument list (#432)

closes #419 Co-authored-by: Lasath Fernando <devel@lasath.org>
belav · Sep 7, 2021 · be056da · be056da
1 parent 3c09eb3
commit be056da
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/ConditionalExpressions.cst b/Src/CSharpier.Tests/FormattingTests/TestFiles/ConditionalExpressions.cst
@@ -34,12 +34,25 @@ public class ClassName
                 ? trueValue
                 : falseValue;
 
+        CallMethod(
+            someValue,
+            someCondition
+              ? trueValue________________________________
+              : falseValue_______________________________,
+            someCondition_____________________________________
+                && someOtherCondition__________________________________
+              ? trueValue________________________________
+              : falseValue_______________________________,
+            someCondition_____________________________________
+                && someOtherCondition__________________________________
+        );
+
         var fileContents = File.ReadAllText(
             file,
             // leading here should break parameters and GetEncoding should still group
             encoding
-                ? File.GetEncoding________________________________(1252)
-                : encoding_____________________,
+              ? File.GetEncoding________________________________(1252)
+              : encoding_____________________,
             cancellationToken
         );
 
@@ -49,13 +62,5 @@ public class ClassName
             encoding ? GetEncoding(1252) : encoding,
             cancellationToken
         );
-
-        var fileContents = File.ReadAllText(
-            file,
-            encoding
-                ? File.GetEncoding________________________________(1252)
-                : encoding_____________________,
-            cancellationToken
-        );
     }
 }
diff --git a/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/BinaryExpression.cs b/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/BinaryExpression.cs
@@ -24,7 +24,6 @@ or EqualsValueClauseSyntax
                     or ArrowExpressionClauseSyntax
                     or ParenthesizedLambdaExpressionSyntax
                     or AssignmentExpressionSyntax
-                    or ConditionalExpressionSyntax
                     or SimpleLambdaExpressionSyntax
                     or IfStatementSyntax
                     or WhileStatementSyntax
@@ -33,7 +32,9 @@ or DoStatementSyntax
                     or CheckedExpressionSyntax
                     or CatchFilterClauseSyntax
                     or ParenthesizedExpressionSyntax
-                    or SwitchStatementSyntax;
+                    or SwitchStatementSyntax
+                || node.Parent is ConditionalExpressionSyntax
+                    && node.Parent.Parent is not ArgumentSyntax;
 
             return shouldNotIndent
                 ? Doc.Group(docs)

diff --git a/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/ConditionalExpression.cs b/Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/ConditionalExpression.cs
@@ -19,7 +19,7 @@ public static Doc Print(ConditionalExpressionSyntax node)
 
             return Doc.Group(
                 Node.Print(node.Condition),
-                node.Parent is ConditionalExpressionSyntax
+                node.Parent is ConditionalExpressionSyntax or ArgumentSyntax
                     ? Doc.Align(2, contents)
                     : Doc.Indent(contents)
             );