template: retain leading space if the line is not an action.

R=rsc
CC=golang-dev
https://golang.org/cl/1985042

diff --git a/src/pkg/template/template.go b/src/pkg/template/template.go
index debcad4c0b2711a5343f537088fbedd10391cd5f..19d94c8fe253d4bf188be1b5feecce867e9f1348 100644 (file)
--- a/src/pkg/template/template.go
+++ b/src/pkg/template/template.go
@@ -234,9 +234,7 @@ func (t *Template) nextItem() []byte {
                        break
                }
        }
-       if trimSpace {
-               start = i
-       } else if i > start {
+       if !trimSpace && i > start {
                // white space is valid text
                t.p = i
                return t.buf[start:i]
@@ -252,6 +250,9 @@ Switch:
                i += len(t.ldelim) // position after delimiter
                if i+1 < len(t.buf) && (t.buf[i] == '.' || t.buf[i] == '#') {
                        special = true
+                       if trimSpace {
+                               start = i - len(t.ldelim)
+                       }
                }
                for ; i < len(t.buf); i++ {
                        if t.buf[i] == '\n' {

diff --git a/src/pkg/template/template_test.go b/src/pkg/template/template_test.go
index 8157972e42330cb7a5410999a72d6e8741ba7ba7..3ce6a4bb400b9e611afe3e86d7c585a81e033fcf 100644 (file)
--- a/src/pkg/template/template_test.go
+++ b/src/pkg/template/template_test.go
@@ -98,6 +98,7 @@ var tests = []*Test{
        &Test{" {.space}   \n", " ", ""},
        &Test{" {.tab}   \n", "\t", ""},
        &Test{"     {#comment}   \n", "", ""},
+       &Test{"\tSome Text\t\n", "\tSome Text\t\n", ""},
 
        // Variables at top level
        &Test{