No close tag if no content, close inside first tag

theplant · Sep 18, 2021 · 6717c0d · 6717c0d
1 parent 609b712
commit 6717c0d
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 18 deletions.
diff --git a/example_test.go b/example_test.go
@@ -45,13 +45,13 @@ func ExampleTag_02fullhtml() {
 	//
 	// <html>
 	// <head>
-	// <meta charset='utf8'></meta>
+	// <meta charset='utf8'/>
 	//
 	// <title>My test page</title>
 	// </head>
 	//
 	// <body>
-	// <img src='images/firefox-icon.png' alt='My test image'></img>
+	// <img src='images/firefox-icon.png' alt='My test image'/>
 	// </body>
 	// </html>
 }
@@ -85,7 +85,7 @@ func ExampleTag_03rawhtmlandcomponent() {
 	// <div class='userProfile'>
 	// <h1 class='profileName'>felix&lt;h1&gt;</h1>
 	//
-	// <img src='http://image.com/img1.png' class='profileImage'></img>
+	// <img src='http://image.com/img1.png' class='profileImage'/>
 	// <svg>complicated svg</svg>
 	// </div>
 	// </li>
@@ -94,7 +94,7 @@ func ExampleTag_03rawhtmlandcomponent() {
 	// <div class='userProfile'>
 	// <h1 class='profileName'>john</h1>
 	//
-	// <img src='http://image.com/img2.png' class='profileImage'></img>
+	// <img src='http://image.com/img2.png' class='profileImage'/>
 	// <svg>complicated svg</svg>
 	// </div>
 	// </li>
@@ -305,7 +305,7 @@ func ExampleTag_06httphandler() {
 	//
 	// <html>
 	// <head>
-	// <meta charset='utf8'></meta>
+	// <meta charset='utf8'/>
 	// </head>
 	//
 	// <body>
@@ -341,9 +341,9 @@ func ExampleTag_07MutipleTypeAttrs() {
 	Fprint(os.Stdout, comp, context.TODO())
 	//Output:
 	// <div>
-	// <input name='username' type='checkbox' checked more-data='{"Name":"felix","Count":100}' max-length='10'></input>
+	// <input name='username' type='checkbox' checked more-data='{"Name":"felix","Count":100}' max-length='10'/>
 	//
-	// <input name='username2' type='checkbox'></input>
+	// <input name='username2' type='checkbox'/>
 	// </div>
 }
 
@@ -356,7 +356,7 @@ func ExampleTag_08styles() {
 		StyleIf("color:blue", true)
 	Fprint(os.Stdout, comp, context.TODO())
 	//Output:
-	// <div style='background-color:red; border:1px solid red; color:blue;'></div>
+	// <div style='background-color:red; border:1px solid red; color:blue;'/>
 }
 
 /*

diff --git a/go.mod b/go.mod
@@ -0,0 +1,8 @@
+module github.com/theplant/htmlgo
+
+go 1.17
+
+require (
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/theplant/testingutils v0.0.0-20190603093022-26d8b4d95c61 // indirect
+)
diff --git a/go.sum b/go.sum
@@ -0,0 +1,4 @@
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/theplant/testingutils v0.0.0-20190603093022-26d8b4d95c61 h1:757/ruZNgTsOf5EkQBo0i3Bx/P2wgF5ljVkODeUX/uA=
+github.com/theplant/testingutils v0.0.0-20190603093022-26d8b4d95c61/go.mod h1:p22Q3Bg5ML+hdI3QSQkB/pZ2+CjfOnGugoQIoyE2Ub8=
diff --git a/tag.go b/tag.go
@@ -332,8 +332,14 @@ func (b *HTMLTagBuilder) MarshalHTML(ctx context.Context) (r []byte, err error)
 	}
 
 	buf := bytes.NewBuffer(nil)
-	buf.WriteString(fmt.Sprintf("\n<%s%s>", b.tag, attrStr))
-	if !b.omitEndTag {
+	tagClosed := false
+	if len(cs) == 0 && !b.omitEndTag {
+		tagClosed = true
+		buf.WriteString(fmt.Sprintf("\n<%s%s/>\n", b.tag, attrStr))
+	} else {
+		buf.WriteString(fmt.Sprintf("\n<%s%s>", b.tag, attrStr))
+	}
+	if !b.omitEndTag && !tagClosed {
 		if len(cs) > 0 {
 			// buf.WriteString("\n")
 			for _, c := range cs {

diff --git a/tag_test.go b/tag_test.go
@@ -51,19 +51,35 @@ var htmltagCases = []struct {
 <div>
 <div class='menu' id='the><&"&#39;-menu'>Hello</div>
 </div>
+`,
+	},
+	{
+		name: "void tag",
+		tag: Div(),
+		expected: `
+<div/>
+`,
+	},
+	{
+		name: "void tag",
+		tag: Img("a"),
+		expected: `
+<img src='a'/>
 `,
 	},
 }
 
 func TestHtmlTag(t *testing.T) {
 	for _, c := range htmltagCases {
-		r, err := c.tag.MarshalHTML(context.TODO())
-		if err != nil {
-			panic(err)
-		}
-		diff := testingutils.PrettyJsonDiff(c.expected, string(r))
-		if len(diff) > 0 {
-			t.Error(c.name, diff)
-		}
+		t.Run(c.name, func(t *testing.T){
+			r, err := c.tag.MarshalHTML(context.TODO())
+			if err != nil {
+				panic(err)
+			}
+			diff := testingutils.PrettyJsonDiff(c.expected, string(r))
+			if len(diff) > 0 {
+				t.Error(c.name, diff)
+			}
+		})
 	}
 }