summaryrefslogtreecommitdiffstats
path: root/output/layout_base.go
diff options
context:
space:
mode:
Diffstat (limited to 'output/layout_base.go')
-rw-r--r--output/layout_base.go10
1 files changed, 7 insertions, 3 deletions
diff --git a/output/layout_base.go b/output/layout_base.go
index 31e1194f4..d3c52347c 100644
--- a/output/layout_base.go
+++ b/output/layout_base.go
@@ -58,6 +58,10 @@ type TemplateLookupDescriptor struct {
ContainsAny func(filename string, subslices [][]byte) (bool, error)
}
+func isShorthCodeOrPartial(name string) bool {
+ return strings.HasPrefix(name, "shortcodes/") || strings.HasPrefix(name, "partials/")
+}
+
func CreateTemplateNames(d TemplateLookupDescriptor) (TemplateNames, error) {
name := filepath.ToSlash(d.RelPath)
@@ -104,13 +108,13 @@ func CreateTemplateNames(d TemplateLookupDescriptor) (TemplateNames, error) {
}
// Ace and Go templates may have both a base and inner template.
- pathDir := filepath.Dir(d.RelPath)
-
- if ext == "amber" || strings.HasSuffix(pathDir, "partials") || strings.HasSuffix(pathDir, "shortcodes") {
+ if ext == "amber" || isShorthCodeOrPartial(name) {
// No base template support
return id, nil
}
+ pathDir := filepath.Dir(d.RelPath)
+
innerMarkers := goTemplateInnerMarkers
var baseFilename string