fix: format single line raw go code (#767)

a-h · Jun 1, 2024 · aaa0049 · aaa0049
1 parent 599b54f
commit aaa0049
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/parser/v2/format_test.go b/parser/v2/format_test.go
@@ -5,11 +5,17 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/a-h/templ/cfg"
 	"github.com/google/go-cmp/cmp"
 	"golang.org/x/tools/txtar"
 )
 
 func TestFormatting(t *testing.T) {
+	oldFlags := cfg.Experiment
+	t.Cleanup(func() {
+		cfg.Experiment = oldFlags
+	})
+	cfg.Experiment.RawGo = true
 	files, _ := filepath.Glob("formattestdata/*.txt")
 	if len(files) == 0 {
 		t.Errorf("no test files found")

diff --git a/parser/v2/formattestdata/raw_go_is_formatted.txt b/parser/v2/formattestdata/raw_go_is_formatted.txt
@@ -0,0 +1,12 @@
+-- in --
+package test
+
+templ nameList(items []Item) {
+	{{ first  := items[0] }}
+}
+-- out --
+package test
+
+templ nameList(items []Item) {
+	{{ first := items[0] }}
+}
diff --git a/parser/v2/types.go b/parser/v2/types.go
@@ -1136,14 +1136,14 @@ func (gc GoCode) Write(w io.Writer, indent int) error {
 	if isWhitespace(gc.Expression.Value) {
 		gc.Expression.Value = ""
 	}
-	if !gc.Multiline {
-		return writeIndent(w, indent, `{{ `, gc.Expression.Value, ` }}`)
-	}
-	formatted, err := format.Source([]byte(gc.Expression.Value))
+	source, err := format.Source([]byte(gc.Expression.Value))
 	if err != nil {
-		return err
+		source = []byte(gc.Expression.Value)
+	}
+	if !gc.Multiline {
+		return writeIndent(w, indent, `{{ `, string(source), ` }}`)
 	}
-	if err := writeIndent(w, indent, "{{"+string(formatted)+"\n"); err != nil {
+	if err := writeIndent(w, indent, "{{"+string(source)+"\n"); err != nil {
 		return err
 	}
 	return writeIndent(w, indent, "}}")