Fix #75: Correct formatting of nested tags with the same name

sibprogrammer · Apr 15, 2024 · 4b7feb6 · 4b7feb6
1 parent ed40073
commit 4b7feb6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/internal/utils/utils.go b/internal/utils/utils.go
@@ -183,6 +183,9 @@ func FormatXml(reader io.Reader, writer io.Writer, indent string, colors int) er
  }
  hasContent = false
  lastTagName = currentTagName
+ if startTagClosed {
+ lastTagName = ""
+ }
  case xml.Directive:
  _, _ = fmt.Fprint(writer, tagColor("<!"), string(typedToken), tagColor(">"))
  _, _ = fmt.Fprint(writer, newline, strings.Repeat(indent, level))

diff --git a/internal/utils/utils_test.go b/internal/utils/utils_test.go
@@ -36,6 +36,7 @@ func TestFormatXml(t *testing.T) {
  "unformatted11.xml": "formatted11.xml",
  "unformatted12.xml": "formatted12.xml",
  "unformatted13.xml": "formatted13.xml",
+ "unformatted14.xml": "formatted14.xml",
  }
 
  for unformattedFile, expectedFile := range files {

diff --git a/test/data/xml/formatted14.xml b/test/data/xml/formatted14.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<svg height="297mm" width="210mm">
+ <g stroke="#2f4f4f" stroke-linecap="round" stroke-linejoin="round">
+ <g fill="#fff"/>
+ </g>
+</svg>
diff --git a/test/data/xml/unformatted14.xml b/test/data/xml/unformatted14.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<svg height="297mm" width="210mm">
+ <g stroke="#2f4f4f" stroke-linecap="round" stroke-linejoin="round">
+ <g fill="#fff">
+ </g>
+ </g>
+</svg>