for which any
diff --git a/parser/v2/forexpressionparser.go b/parser/v2/forexpressionparser.go
index 3f8bc2ec1..2e498105c 100644
--- a/parser/v2/forexpressionparser.go
+++ b/parser/v2/forexpressionparser.go
@@ -10,7 +10,10 @@ var forExpression parse.Parser[Node] = forExpressionParser{}
type forExpressionParser struct{}
func (forExpressionParser) Parse(pi *parse.Input) (n Node, ok bool, err error) {
- var r ForExpression
+ r := ForExpression{
+ // Default behavior is always a trailing space
+ TrailingSpace: SpaceVertical,
+ }
start := pi.Index()
// Strip leading whitespace and look for `for `.
@@ -48,5 +51,11 @@ func (forExpressionParser) Parse(pi *parse.Input) (n Node, ok bool, err error) {
return
}
+ // Parse trailing whitespace.
+ r.TrailingSpace, err = parseTrailingSpace(pi, true, true)
+ if err != nil {
+ return r, false, err
+ }
+
return r, true, nil
}
diff --git a/parser/v2/forexpressionparser_test.go b/parser/v2/forexpressionparser_test.go
index 4a012e7b2..630dc17ad 100644
--- a/parser/v2/forexpressionparser_test.go
+++ b/parser/v2/forexpressionparser_test.go
@@ -64,6 +64,7 @@ func TestForExpressionParser(t *testing.T) {
TrailingSpace: SpaceVertical,
},
},
+ TrailingSpace: SpaceVertical,
},
},
{
@@ -117,6 +118,7 @@ func TestForExpressionParser(t *testing.T) {
TrailingSpace: SpaceVertical,
},
},
+ TrailingSpace: SpaceVertical,
},
},
}
diff --git a/parser/v2/formattestdata/calltemplate_newline_is_preserved.txt b/parser/v2/formattestdata/calltemplate_newline_is_preserved.txt
new file mode 100644
index 000000000..d04232fc4
--- /dev/null
+++ b/parser/v2/formattestdata/calltemplate_newline_is_preserved.txt
@@ -0,0 +1,34 @@
+-- in --
+package main
+
+templ test() {
+
+
+
+ {! Other(p.Test) }
+ {!Other(p.Test)} Home
+
+
Some standard templ
+
+{!Other(p.Test) }
+
+
+
+
+
+}
+-- out --
+package main
+
+templ test() {
+
+
+ @Other(p.Test)
+ @Other(p.Test) Home
+
Some standard templ
+
+ @Other(p.Test)
+
+
+
+}
diff --git a/parser/v2/formattestdata/comments_newline_is_preserved.txt b/parser/v2/formattestdata/comments_newline_is_preserved.txt
new file mode 100644
index 000000000..30f7ca4af
--- /dev/null
+++ b/parser/v2/formattestdata/comments_newline_is_preserved.txt
@@ -0,0 +1,31 @@
+-- in --
+package main
+
+templ test() {
+
+
+ // This is not included in the output.
+
Some standard templ
+
+
+ /* This is not included in the output too. */
+ /*
+ Leave this alone.
+ */
+
+
+}
+-- out --
+package main
+
+templ test() {
+
+
+ // This is not included in the output.
+
Some standard templ
+
+ /* This is not included in the output too. */
+ /*
+ Leave this alone.
+ */
+}
diff --git a/parser/v2/formattestdata/element_double_newline_after_component.txt b/parser/v2/formattestdata/element_double_newline_after_component.txt
new file mode 100644
index 000000000..5792f45fd
--- /dev/null
+++ b/parser/v2/formattestdata/element_double_newline_after_component.txt
@@ -0,0 +1,29 @@
+-- in --
+package main
+
+templ x() {
+
+ @Hero()
+
+
+
+ @Hero()
+
+
+
+
+
+}
+-- out --
+package main
+
+templ x() {
+
+ @Hero()
+
+
+ @Hero()
+
+
+
+}
diff --git a/parser/v2/formattestdata/element_double_newline_indent_issue.txt b/parser/v2/formattestdata/element_double_newline_indent_issue.txt
new file mode 100644
index 000000000..4732a5a3b
--- /dev/null
+++ b/parser/v2/formattestdata/element_double_newline_indent_issue.txt
@@ -0,0 +1,25 @@
+-- in --
+package main
+
+templ x() {
+
+
+
+ // This line is indented incorrectly
+
+
+
+}
+
+-- out --
+package main
+
+templ x() {
+
+
+
+ // This line is indented incorrectly
+
+
+
+}
diff --git a/parser/v2/formattestdata/element_double_newline_is_preserved.txt b/parser/v2/formattestdata/element_double_newline_is_preserved.txt
new file mode 100644
index 000000000..383dfc262
--- /dev/null
+++ b/parser/v2/formattestdata/element_double_newline_is_preserved.txt
@@ -0,0 +1,28 @@
+-- in --
+package main
+
+templ x() {
+
+ Hello
+
+ World
+
+
+
+
+ Foo Bar
+
+}
+-- out --
+package main
+
+templ x() {
+
+
+ Hello
+ World
+
+
+ Foo Bar
+
+}
diff --git a/parser/v2/formattestdata/element_double_newline_string_literal_termination_issue.txt b/parser/v2/formattestdata/element_double_newline_string_literal_termination_issue.txt
new file mode 100644
index 000000000..0962cc808
--- /dev/null
+++ b/parser/v2/formattestdata/element_double_newline_string_literal_termination_issue.txt
@@ -0,0 +1,25 @@
+-- in --
+package main
+
+// The below template caused the generated code to not strip newlines, causing error
+templ x() {
+
+}
+-- out --
+package main
+
+// The below template caused the generated code to not strip newlines, causing error
+templ x() {
+
+}
diff --git a/parser/v2/formattestdata/for_loops_are_placed_on_a_new_line.txt b/parser/v2/formattestdata/for_loops_are_placed_on_a_new_line.txt
index 97f7d586f..0ca1de359 100644
--- a/parser/v2/formattestdata/for_loops_are_placed_on_a_new_line.txt
+++ b/parser/v2/formattestdata/for_loops_are_placed_on_a_new_line.txt
@@ -4,7 +4,7 @@ package test
templ input(items []string) {
{ "the" }
{ "other" }
for _, item := range items {
{ item }
-}
+}
After closing bracket