Keep empty arrays on a single line in destructured output

verticalsoftware · Aug 13, 2022 · c95b563 · c95b563
1 parent f7a5487
commit c95b563
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/Destructuring/DestructuringWriter.cs b/src/Destructuring/DestructuringWriter.cs
@@ -81,7 +81,6 @@ private void WriteStartSection(string c)
             if (_options.WriteIndented)
             {
                 _buffer.Margin += _indentation;
-                _buffer.WriteLine();
             }
         }
 
@@ -114,6 +113,11 @@ private bool WriteNode(string? key, object? value, int maxCount)
                 return false;
             }
 
+            if (_innerCount == 1 && _options.WriteIndented)
+            {
+                _buffer.WriteLine();
+            }
+
             if (_innerCount > 1)
             {
                 _buffer.Write(", ");

diff --git a/test/Destructuring/DestructuringWriterTests.cs b/test/Destructuring/DestructuringWriterTests.cs
@@ -83,7 +83,19 @@ public void WriteEmptyArrayIndentedRendersExpectedContent()
 
             DestructuringWriter.Write(buffer, profile, Array.Empty<string>());
 
-            buffer.ToString().ShouldBe("[[" + Environment.NewLine + "]]");
+            buffer.ToString().ShouldBe("[[]]");
+        }
+
+        [Fact]
+        public void WriteEmptyDictionaryIndentedRendersExpectedContent()
+        {
+            var buffer = new WriteBuffer(Substitute.For<IConsoleWriter>());
+            var profile = new LogLevelProfile(LogLevel.Information);
+            profile.ConfigureOptions<DestructuringOptions>(opt => opt.WriteIndented = true);
+
+            DestructuringWriter.Write(buffer, profile, new Dictionary<string, string>());
+
+            buffer.ToString().ShouldBe("{}");
         }
 
         [Fact]