Handle file ending in list item on HTML conversion

Author: mcecode

generator.go

@@ -168,6 +168,10 @@ func ToHTML(asl ASL) string {
 		prev = e
 	})
 
+	if prev.Type() == ElementTypes.List() {
+		b.WriteString("</ul>\n")
+	}
+
 	if isPreformattedMode {
 		b.WriteString("</pre>")
 

generator_test.go

@@ -20,11 +20,17 @@ func TestToGemtext(t *testing.T) {
 func TestToHTML(t *testing.T) {
 	parsedInput, _ := ParseFile("testdata/input.gmi")
 	actual := ToHTML(parsedInput)
-
 	expectedOutput, _ := os.ReadFile("testdata/output.html")
 	expected := string(expectedOutput)
-
 	if actual != expected {
 		errorfRaw(t, "html", actual, expected)
 	}
+
+	parsedInput, _ = ParseFile("testdata/input_list_only.gmi")
+	actual = ToHTML(parsedInput)
+	expectedOutput, _ = os.ReadFile("testdata/output_list_only.html")
+	expected = string(expectedOutput)
+	if actual != expected {
+		errorfRaw(t, "html_listOnly", actual, expected)
+	}
 }

testdata/input_list_only.gmi

@@ -0,0 +1,3 @@
+* Some
+* Bullet
+*	Points

testdata/output_list_only.html

@@ -0,0 +1,5 @@
+<ul>
+<li>Some</li>
+<li>Bullet</li>
+<li>Points</li>
+</ul>

testdata/update.go

@@ -1,4 +1,4 @@
-// A helper to update test data generated from input.gmi.
+// A helper to update generated test data.
 package main
 
 import (
@@ -27,9 +27,10 @@ func printerrln(a ...any) (int, error) {
 func main() {
 	flag.CommandLine.Init("", flag.ContinueOnError)
 	flag.CommandLine.SetOutput(io.Discard)
-	updateInputDump := flag.Bool("input-dump", false, "")
-	updateOutputGMI := flag.Bool("output-gmi", false, "")
-	updateOutputHTML := flag.Bool("output-html", false, "")
+	updateDump := flag.Bool("dump", false, "")
+	updateGMI := flag.Bool("gmi", false, "")
+	updateHTML := flag.Bool("html", false, "")
+	updateListOnlyHTML := flag.Bool("list-only-html", false, "")
 	flag.Parse()
 
 	if flag.NArg() > 0 || flag.NFlag() < 1 {
@@ -76,7 +77,12 @@ func main() {
 		printerrln(err)
 	}
 
-	if *updateInputDump {
+	listOnlyASL, err := p.ParseFile(filepath.Join(testdataDir, "input_list_only.gmi"))
+	if err != nil {
+		printerrln(err)
+	}
+
+	if *updateDump {
 		if err := os.WriteFile(
 			filepath.Join(testdataDir, "input.dump"),
 			[]byte(dumper.Sdump(asl)),
@@ -86,7 +92,7 @@ func main() {
 		}
 	}
 
-	if *updateOutputGMI {
+	if *updateGMI {
 		if err := p.ToGemtextFile(
 			filepath.Join(testdataDir, "output.gmi"),
 			asl,
@@ -96,7 +102,7 @@ func main() {
 		}
 	}
 
-	if *updateOutputHTML {
+	if *updateHTML {
 		if err := p.ToHTMLFile(
 			filepath.Join(testdataDir, "output.html"),
 			asl,
@@ -105,4 +111,14 @@ func main() {
 			printerrln(err)
 		}
 	}
+
+	if *updateListOnlyHTML {
+		if err := p.ToHTMLFile(
+			filepath.Join(testdataDir, "output_list_only.html"),
+			listOnlyASL,
+			0600,
+		); err != nil {
+			printerrln(err)
+		}
+	}
 }