mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

html/template: use maps.Copy in escaper.escapeListConditionally 

To make it a little simpler.

Change-Id: Id3c6b0b2570558be396017b8fc877481b79ef837
This commit is contained in:
Jes Cok 2024-09-11 23:33:47 +08:00
parent 9deda35ff8
commit 2eae47fe8b
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/html/template/escape.go
View File

@ -10,6 +10,7 @@ import (
"html" "html"
"internal/godebug" "internal/godebug"
"io" "io"
"maps"
"regexp" "regexp"
"text/template" "text/template"
"text/template/parse" "text/template/parse"
@ -588,22 +589,14 @@ func (e *escaper) escapeListConditionally(c context, n *parse.ListNode, filter f
e1 := makeEscaper(e.ns) e1 := makeEscaper(e.ns)
e1.rangeContext = e.rangeContext e1.rangeContext = e.rangeContext
// Make type inferences available to f. // Make type inferences available to f.
for k, v := range e.output { maps.Copy(e1.output, e.output)
e1.output[k] = v
}
c = e1.escapeList(c, n) c = e1.escapeList(c, n)
ok := filter != nil && filter(&e1, c) ok := filter != nil && filter(&e1, c)
if ok { if ok {
// Copy inferences and edits from e1 back into e. // Copy inferences and edits from e1 back into e.
for k, v := range e1.output { maps.Copy(e.output, e1.output)
e.output[k] = v maps.Copy(e.derived, e1.derived)
} maps.Copy(e.called, e1.called)
for k, v := range e1.derived {
e.derived[k] = v
}
for k, v := range e1.called {
e.called[k] = v
}
for k, v := range e1.actionNodeEdits { for k, v := range e1.actionNodeEdits {
e.editActionNode(k, v) e.editActionNode(k, v)
} }