printer: handle labels properly while printing tags

mateusz834 · Nov 8, 2024 · 1d08a46 · 1d08a46
1 parent 3fe510e
commit 1d08a46
Show file tree

Hide file tree

Showing 4 changed files with 100 additions and 20 deletions.
diff --git a/printer/nodes.go b/printer/nodes.go
@@ -1203,7 +1203,7 @@ func (p *printer) stmtList(list []ast.Stmt, nindent int, nextIsRBrace bool) {
 		tagOneLine       = make([]bool, 1, 32)
 	)
 
-	openTagIndent, endTagUnindent, oneline := p.tagIndent(list)
+	openPair, endPair, oneline := p.tagIndent(list)
 
 	for _, s := range list {
 		// ignore empty statements (was issue 3466)
@@ -1216,26 +1216,28 @@ func (p *printer) stmtList(list []ast.Stmt, nindent int, nextIsRBrace bool) {
 				p.linebreak(p.lineFor(s.Pos()), 1, ignore, i == 0 || nindent == 0 || p.linesFrom(line) > 0)
 			}
 
-			if v, ok := s.(*ast.EndTagStmt); ok {
-				if _, ok := endTagUnindent[v]; ok {
+			if v, ok := unlabel(s).(*ast.EndTagStmt); ok {
+				if _, ok := endPair[v]; ok {
 					p.print(unindent)
+					forceNextNewline = !tagOneLine[len(tagOneLine)-1]
+					tagOneLine = tagOneLine[:len(tagOneLine)-1]
+					if forceNextNewline && p.commentBefore(p.posFor(s.Pos())) {
+						p.linebreak(p.lineFor(s.Pos()), 0, ignore, false)
+					}
 				}
-				forceNextNewline = !tagOneLine[len(tagOneLine)-1]
-				tagOneLine = tagOneLine[:len(tagOneLine)-1]
-				if forceNextNewline && p.commentBefore(p.posFor(s.Pos())) {
-					p.linebreak(p.lineFor(s.Pos()), 0, ignore, false)
+			} else if v, ok := unlabel(s).(*ast.OpenTagStmt); ok {
+				if _, ok := openPair[v]; ok {
+					forceNextNewline = false
+					_, ok := oneline[v]
+					tagOneLine = append(tagOneLine, ok)
 				}
-			} else if v, ok := s.(*ast.OpenTagStmt); ok {
-				forceNextNewline = false
-				_, ok := oneline[v]
-				tagOneLine = append(tagOneLine, ok)
 			}
 
 			p.recordLine(&line)
 			p.stmt(s, nextIsRBrace && i == len(list)-1)
 
-			if v, ok := s.(*ast.OpenTagStmt); ok {
-				if _, ok := openTagIndent[v]; ok {
+			if v, ok := unlabel(s).(*ast.OpenTagStmt); ok {
+				if _, ok := openPair[v]; ok {
 					p.print(indent)
 				}
 			}

diff --git a/printer/testdata/tgo/void_elements.formatted b/printer/testdata/tgo/void_elements.formatted
@@ -7,6 +7,21 @@ func test() {
 	</div>
 }
 
+func test() {
+	<div>
+		<br>
+		_ = 3
+	</div>
+	_ = 3
+}
+
+func test() {
+	<div>
+		_ = 3
+	</div>
+	_ = 3
+}
+
 func test() {
 	<div>
 		<br>
@@ -61,3 +76,22 @@ func test() {
 	</div>
 	</div>
 }
+
+func test() {
+a:
+	<div>
+	goto a
+}
+
+func test() {
+a:
+	</div>
+	goto a
+}
+
+func test() {
+a:
+	<div>
+	</div>
+	goto a
+}
diff --git a/printer/testdata/tgo/void_elements.tgo b/printer/testdata/tgo/void_elements.tgo
@@ -7,6 +7,21 @@ func test() {
 	</div>
 }
 
+func test() {
+	<div>
+	<br>
+	_ = 3
+	</div>
+	_ = 3
+}
+
+func test() {
+	<div>
+	_ = 3
+	</div>
+	_ = 3
+}
+
 func test() {
 	<div>
 	<br>
@@ -61,3 +76,22 @@ func test() {
 	</div>
 	</div>
 }
+
+func test() {
+	a:
+		<div>
+	goto a
+}
+
+func test() {
+	a:
+		</div>
+	goto a
+}
+
+func test() {
+	a:
+		<div>
+		</div>
+	goto a
+}
diff --git a/printer/tgo.go b/printer/tgo.go
@@ -139,24 +139,34 @@ func (p *printer) templateLiteralExpr(x *ast.TemplateLiteralExpr) {
 	}
 }
 
-func (p *printer) tagIndent(list []ast.Stmt) (indent map[*ast.OpenTagStmt]struct{}, unindent map[*ast.EndTagStmt]struct{}, oneline map[*ast.OpenTagStmt]struct{}) {
-	indent = make(map[*ast.OpenTagStmt]struct{})
-	unindent = make(map[*ast.EndTagStmt]struct{})
+func unlabel(s ast.Stmt) ast.Stmt {
+	for {
+		if l, ok := s.(*ast.LabeledStmt); ok {
+			s = l.Stmt
+			continue
+		}
+		return s
+	}
+}
+
+func (p *printer) tagIndent(list []ast.Stmt) (openPair map[*ast.OpenTagStmt]struct{}, endPair map[*ast.EndTagStmt]struct{}, oneline map[*ast.OpenTagStmt]struct{}) {
+	openPair = make(map[*ast.OpenTagStmt]struct{})
+	endPair = make(map[*ast.EndTagStmt]struct{})
 	oneline = make(map[*ast.OpenTagStmt]struct{})
 
 	deep := make([]int, 0, 32)
 	for i, v := range list {
-		switch v := v.(type) {
+		switch v := unlabel(v).(type) {
 		case *ast.OpenTagStmt:
 			deep = append(deep, i)
 		case *ast.EndTagStmt:
 			for len(deep) != 0 {
 				openTagIndex := deep[len(deep)-1]
-				openTag := list[openTagIndex].(*ast.OpenTagStmt)
+				openTag := unlabel(list[openTagIndex]).(*ast.OpenTagStmt)
 				deep = deep[:len(deep)-1]
 				if openTag.Name.Name == v.Name.Name {
-					indent[openTag] = struct{}{}
-					unindent[v] = struct{}{}
+					openPair[openTag] = struct{}{}
+					endPair[v] = struct{}{}
 					if p.lineFor(openTag.Pos()) == p.lineFor(v.End()) && !p.willHaveNewLine(openTag, list[openTagIndex+1:i]) {
 						oneline[openTag] = struct{}{}
 					}