Don't print trailing comma for enumerable constants (#22925)

* Don't print trailing comma for enumerable constants * Flip condition * Update src/EFCore/Query/ExpressionPrinter.cs Co-authored-by: Smit Patel <smitpatel@users.noreply.github.com>
dotnet · Oct 9, 2020 · ec3df8f · ec3df8f
1 parent 7122369
commit ec3df8f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/src/EFCore/Query/ExpressionPrinter.cs b/src/EFCore/Query/ExpressionPrinter.cs
@@ -459,13 +459,22 @@ private void Print(object value)
                 && !(value is string))
             {
                 _stringBuilder.Append(value.GetType().ShortDisplayName() + " { ");
+
+                var first = true;
                 foreach (var item in enumerable)
                 {
+                    if (first)
+                    {
+                        first = false;
+                    }
+                    else
+                    {
+                        _stringBuilder.Append(", ");
+                    }
                     Print(item);
-                    _stringBuilder.Append(", ");
                 }
 
-                _stringBuilder.Append("}");
+                _stringBuilder.Append(" }");
                 return;
             }
 

diff --git a/test/EFCore.Tests/Query/ExpressionPrinterTest.cs b/test/EFCore.Tests/Query/ExpressionPrinterTest.cs
@@ -197,5 +197,15 @@ public void Linq_methods_printed_as_extensions()
                 _expressionPrinter.Print(expr.Body),
                 ignoreLineEndingDifferences: true);
         }
+
+        [ConditionalFact]
+        public void Enumerable_Constant_printed_correctly()
+        {
+            Assert.Equal(
+                @"int[] { 1, 2, 3 }",
+                _expressionPrinter.Print(
+                    Expression.Constant(
+                        new[] { 1, 2, 3 })));
+        }
     }
 }