diff options
| -rw-r--r-- | src/html/template/js.go | 8 | ||||
| -rw-r--r-- | src/html/template/js_test.go | 11 |
2 files changed, 14 insertions, 5 deletions
diff --git a/src/html/template/js.go b/src/html/template/js.go index fe7054efe5..4e05c14557 100644 --- a/src/html/template/js.go +++ b/src/html/template/js.go @@ -13,6 +13,11 @@ import ( "unicode/utf8" ) +// jsWhitespace contains all of the JS whitespace characters, as defined +// by the \s character class. +// See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_expressions/Character_classes. +const jsWhitespace = "\f\n\r\t\v\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u2028\u2029\u202f\u205f\u3000\ufeff" + // nextJSCtx returns the context that determines whether a slash after the // given run of tokens starts a regular expression instead of a division // operator: / or /=. @@ -26,7 +31,8 @@ import ( // JavaScript 2.0 lexical grammar and requires one token of lookbehind: // https://www.mozilla.org/js/language/js20-2000-07/rationale/syntax.html func nextJSCtx(s []byte, preceding jsCtx) jsCtx { - s = bytes.TrimRight(s, "\t\n\f\r \u2028\u2029") + // Trim all JS whitespace characters + s = bytes.TrimRight(s, jsWhitespace) if len(s) == 0 { return preceding } diff --git a/src/html/template/js_test.go b/src/html/template/js_test.go index e07c695f7a..e52180cc11 100644 --- a/src/html/template/js_test.go +++ b/src/html/template/js_test.go @@ -81,14 +81,17 @@ func TestNextJsCtx(t *testing.T) { {jsCtxDivOp, "0"}, // Dots that are part of a number are div preceders. {jsCtxDivOp, "0."}, + // Some JS interpreters treat NBSP as a normal space, so + // we must too in order to properly escape things. + {jsCtxRegexp, "=\u00A0"}, } for _, test := range tests { - if nextJSCtx([]byte(test.s), jsCtxRegexp) != test.jsCtx { - t.Errorf("want %s got %q", test.jsCtx, test.s) + if ctx := nextJSCtx([]byte(test.s), jsCtxRegexp); ctx != test.jsCtx { + t.Errorf("%q: want %s got %s", test.s, test.jsCtx, ctx) } - if nextJSCtx([]byte(test.s), jsCtxDivOp) != test.jsCtx { - t.Errorf("want %s got %q", test.jsCtx, test.s) + if ctx := nextJSCtx([]byte(test.s), jsCtxDivOp); ctx != test.jsCtx { + t.Errorf("%q: want %s got %s", test.s, test.jsCtx, ctx) } } |