template: fix quote-handling with formatters

Fixes issue #1896.

R=golang-dev, dsymonds
CC=golang-dev
https://golang.org/cl/4539093

diff --git a/src/pkg/template/template.go b/src/pkg/template/template.go
index c00f72ac949d047222755ab944a5c4c89734298f..1eb0295a55e3381135fc9519a95108511c8165fe 100644 (file)
--- a/src/pkg/template/template.go
+++ b/src/pkg/template/template.go
@@ -395,10 +395,11 @@ func words(buf []byte) []string {
                        } else {
                                i++
                        }
-               } else {
-                       for i < len(buf) && !white(buf[i]) {
-                               i++
-                       }
+               }
+               // Even with quotes, break on whitespace only.  This will
+               // work with e.g. {""|} and catch quoting mistakes properly.
+               for i < len(buf) && !white(buf[i]) {
+                       i++
                }
                s = append(s, string(buf[start:i]))
        }

diff --git a/src/pkg/template/template_test.go b/src/pkg/template/template_test.go
index a5e6a4ecc8a6142f9c1d6c1750bded6ada6dc99d..147a1ca2178569e631afd76e2e38db97812d4e93 100644 (file)
--- a/src/pkg/template/template_test.go
+++ b/src/pkg/template/template_test.go
@@ -762,6 +762,10 @@ var formatterTests = []Test{
                in:  `{"%.02f 0x%02X" 1.1 10|printf}`,
                out: "1.10 0x0A",
        },
+       {
+               in:  `{""|}{""||}{""|printf}`, // Issue #1896.
+               out: "",
+       },
 }
 
 func TestFormatters(t *testing.T) {