fix indentation

narve · Oct 24, 2023 · eccf71d · eccf71d
1 parent d7f56a7
commit eccf71d
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 20 deletions.
diff --git a/DV8.Html.Tests/Helpers.cs b/DV8.Html.Tests/Helpers.cs
@@ -13,8 +13,8 @@ public static string Canonical(this string s)
         s = Regex.Replace(s, attrPattern, "='$1'");
 
         // Replace indents: 
-        var indentPattern = ">(\\s+)<";
-        s = Regex.Replace(s, indentPattern, "><");
+        var indentPattern = new Regex(@"(\s+)<");
+        s = indentPattern.Replace(s, "<");
 
         // Replace spaces before end-of-element: 
         var endPattern = @" +\/\>";

diff --git a/DV8.Html.Tests/HtmlElementTests/PrettyPrintTest.cs b/DV8.Html.Tests/HtmlElementTests/PrettyPrintTest.cs
@@ -5,12 +5,12 @@ namespace DV8.Html.Tests.HtmlElementTests;
 
 public class PrettyPrintTest
 {
-    // [Test]
-    // public void ShouldIncludeLineBreaks()
-    // {
-    //     var d = new Div(new P("text"));
-    //     var s = d.ToHtml();
-    //     Assert.AreEqual("<div>\r\n  <p>text</p>\r\n</div>\r\n", s);
-    // }
+    [Test]
+    public void ShouldIncludeLineBreaks()
+    {
+        var d = new Div(new P("text"));
+        var s = d.ToHtml();
+        Assert.AreEqual("<div>\r\n  <p>text</p>\r\n</div>", s);
+    }
 
 }
diff --git a/DV8.Html.Tests/HtmlElementTests/UnderscoreTests.cs b/DV8.Html.Tests/HtmlElementTests/UnderscoreTests.cs
@@ -31,8 +31,13 @@ public void TestIt()
 
         var exp = @"
 <!DOCTYPE html><html>
-<head><title>Hello, World!</title></head>
-<body><h1>Hello, World!</h1><p>This is a paragraph with &lt;&gt;. <ul><li>Apple</li><li>Banana</li><li>Cherry</li></ul></p>
+<head>
+    <title>Hello, World!</title>
+</head>
+<body>
+<h1>Hello, World!</h1>
+<p>This is a paragraph with &lt;&gt;. 
+<ul><li>Apple</li><li>Banana</li><li>Cherry</li></ul></p>
 This will <em>not</em> be escaped
 </body></html>";
 

diff --git a/DV8.Html/DV8.Html.csproj b/DV8.Html/DV8.Html.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <PackageVersion>2.18</PackageVersion>
+        <PackageVersion>2.19</PackageVersion>
         <PackageDescription>C# package with a HTML DSL and support for generating HTML elements and serializing object graphs to HTML</PackageDescription>
         <RootNamespace>DV8.Html</RootNamespace>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>

diff --git a/DV8.Html/Elements/Em.cs b/DV8.Html/Elements/Em.cs
@@ -4,6 +4,7 @@ namespace DV8.Html.Elements;
 
 public class Em: HtmlElement
 {
+    protected override bool IsInlineBlock => true;
     public Em()
     {
     }

diff --git a/DV8.Html/Elements/H1.cs b/DV8.Html/Elements/H1.cs
@@ -4,6 +4,7 @@ namespace DV8.Html.Elements;
 
 public class H1 : HtmlElement
 {
+    protected override bool IsInlineBlock => true;
     public H1()
     {
     }

diff --git a/DV8.Html/Elements/Option.cs b/DV8.Html/Elements/Option.cs
@@ -1,34 +1,37 @@
 using DV8.Html.Framework;
+
 // ReSharper disable PropertyCanBeMadeInitOnly.Global
 // ReSharper disable MemberCanBePrivate.Global
 
 namespace DV8.Html.Elements;
 
 public class Option : HtmlElement
 {
-     public string? Value 
+    protected override bool IsInlineBlock => true;
+
+    public string? Value
     {
         get => Get("value");
         set => Set("value", value);
     }
-        
-     public bool Selected 
+
+    public bool Selected
     {
         get => GetBool("selected");
         set => SetBool("selected", value);
-    }        
+    }
 
-     public bool Disabled
+    public bool Disabled
     {
         get => GetBool("disabled");
         set => SetBool("disabled", value);
-    }        
+    }
 
     public Option()
     {
     }
 
-    public Option(string value, string? text = null): base(null, text) => 
+    public Option(string value, string? text = null) : base(null, text) =>
         Value = value;
 
     public Option WithSelected(bool selected)

diff --git a/DV8.Html/Elements/P.cs b/DV8.Html/Elements/P.cs
@@ -4,11 +4,21 @@ namespace DV8.Html.Elements;
 
 public class P : HtmlElement
 {
+    protected override bool IsInlineBlock => true;
+
     public P()
     {
     }
 
     public P(string s) : base(null, s)
     {
     }
+
+    // protected P(params IHtmlElement[] htmlElements) : base(htmlElements)
+    // {
+    // }
+    //
+    // public P(string text, params IHtmlElement[] htmlElements) : base(null, htmlElements)
+    // {
+    // }
 }
diff --git a/DV8.Html/Elements/Pre.cs b/DV8.Html/Elements/Pre.cs
@@ -1,10 +1,13 @@
 using DV8.Html.Framework;
+
 // ReSharper disable UnusedType.Global
 
 namespace DV8.Html.Elements;
 
 public class Pre : HtmlElement
 {
+    protected override bool IsInlineBlock => true;
+
     public Pre()
     {
     }

diff --git a/DV8.Html/Elements/Span.cs b/DV8.Html/Elements/Span.cs
@@ -4,6 +4,7 @@ namespace DV8.Html.Elements;
 
 public class Span : HtmlElement
 {
+    protected override bool IsInlineBlock => true;
     public Span()
     {
     }

diff --git a/DV8.Html/Elements/Textarea.cs b/DV8.Html/Elements/Textarea.cs
@@ -6,5 +6,6 @@ namespace DV8.Html.Elements;
 
 public class Textarea : InputElement, IFormElement
 {
+    protected override bool IsInlineBlock => true;
 
 }
diff --git a/DV8.Html/Framework/HtmlElement.cs b/DV8.Html/Framework/HtmlElement.cs
@@ -27,6 +27,12 @@ public class HtmlElement : IHtmlElement
     /// </summary>
     protected virtual bool IsSelfClosing => false;
 
+    /// <summary>
+    /// Hints whether this is mostly a text-container (like span, p, h1) or a block (like div).
+    /// Blocks elements will use prefix to enable pretty printing. 
+    /// </summary>
+    protected virtual bool IsInlineBlock => false;
+
 
     public string? Id
     {
@@ -183,11 +189,20 @@ public string GetDefaultTag()
 
     public virtual void WriteHtml(HtmlWriter writer, string prefix = "")
     {
-        // writer.WriteRaw(prefix);
+        // Assume we start at beginning of line
+        // if (!IsInlineBlock)
+        {
+            writer.WriteRaw(prefix);
+        }
         writer.WriteStartOfElement(Tag);
         WriteAttributes(writer);
         writer.WriteEndOfElementTag();
 
+        if (!IsInlineBlock)
+        {
+            writer.WriteRaw("\r\n");
+        }
+
         // bool hasTextContent = Children.Any(s => s is TextContent or UnsafeTextContent);
         // if(!hasTextContent)
         //     writer.WriteRaw("\r\n");
@@ -198,6 +213,10 @@ public virtual void WriteHtml(HtmlWriter writer, string prefix = "")
 
         if (!IsSelfClosing)
         {
+            if (!IsInlineBlock)
+            {
+                writer.WriteRaw("\r\n");
+            }
             // writer.WriteRaw(prefix);
             writer.WriteEndElement(Tag);
         }