summaryrefslogtreecommitdiffstats
path: root/tpl/tplimpl/template_ast_transformers.go
diff options
context:
space:
mode:
Diffstat (limited to 'tpl/tplimpl/template_ast_transformers.go')
-rw-r--r--tpl/tplimpl/template_ast_transformers.go47
1 files changed, 5 insertions, 42 deletions
diff --git a/tpl/tplimpl/template_ast_transformers.go b/tpl/tplimpl/template_ast_transformers.go
index 8d5d8d1b3..92558a903 100644
--- a/tpl/tplimpl/template_ast_transformers.go
+++ b/tpl/tplimpl/template_ast_transformers.go
@@ -14,17 +14,14 @@
package tplimpl
import (
+ "errors"
"fmt"
- "regexp"
- "strings"
htmltemplate "github.com/gohugoio/hugo/tpl/internal/go_templates/htmltemplate"
texttemplate "github.com/gohugoio/hugo/tpl/internal/go_templates/texttemplate"
"github.com/gohugoio/hugo/tpl/internal/go_templates/texttemplate/parse"
- "errors"
-
"github.com/gohugoio/hugo/common/maps"
"github.com/gohugoio/hugo/tpl"
"github.com/mitchellh/mapstructure"
@@ -41,7 +38,6 @@ const (
type templateContext struct {
visited map[string]bool
templateNotFound map[string]bool
- identityNotFound map[string]bool
lookupFn func(name string) *templateState
// The last error encountered.
@@ -74,19 +70,20 @@ func (c templateContext) getIfNotVisited(name string) *templateState {
func newTemplateContext(
t *templateState,
- lookupFn func(name string) *templateState) *templateContext {
+ lookupFn func(name string) *templateState,
+) *templateContext {
return &templateContext{
t: t,
lookupFn: lookupFn,
visited: make(map[string]bool),
templateNotFound: make(map[string]bool),
- identityNotFound: make(map[string]bool),
}
}
func applyTemplateTransformers(
t *templateState,
- lookupFn func(name string) *templateState) (*templateContext, error) {
+ lookupFn func(name string) *templateState,
+) (*templateContext, error) {
if t == nil {
return nil, errors.New("expected template, but none provided")
}
@@ -179,7 +176,6 @@ func (c *templateContext) applyTransformations(n parse.Node) (bool, error) {
}
case *parse.CommandNode:
- c.collectPartialInfo(x)
c.collectInner(x)
keep := c.collectReturnNode(x)
@@ -280,39 +276,6 @@ func (c *templateContext) collectInner(n *parse.CommandNode) {
}
}
-var partialRe = regexp.MustCompile(`^partial(Cached)?$|^partials\.Include(Cached)?$`)
-
-func (c *templateContext) collectPartialInfo(x *parse.CommandNode) {
- if len(x.Args) < 2 {
- return
- }
-
- first := x.Args[0]
- var id string
- switch v := first.(type) {
- case *parse.IdentifierNode:
- id = v.Ident
- case *parse.ChainNode:
- id = v.String()
- }
-
- if partialRe.MatchString(id) {
- partialName := strings.Trim(x.Args[1].String(), "\"")
- if !strings.Contains(partialName, ".") {
- partialName += ".html"
- }
- partialName = "partials/" + partialName
- info := c.lookupFn(partialName)
-
- if info != nil {
- c.t.Add(info)
- } else {
- // Delay for later
- c.identityNotFound[partialName] = true
- }
- }
-}
-
func (c *templateContext) collectReturnNode(n *parse.CommandNode) bool {
if c.t.typ != templatePartial || c.returnNode != nil {
return true