mirror of
https://github.com/gohugoio/hugo.git
synced 2026-08-24 15:28:54 +00:00
Bjørn Erik Pedersen
8405b802cf
Replace the partial return template rewriting with a sentinel error
trapped in the template executor:
* return now works in any template, not just partials.
* return can be used anywhere in the template, e.g. inside if/range;
it stops execution of the current template, so a bare return in a
block or template include ends just that template.
* {{ return <value> }} sets the return value of the enclosing partial;
using it outside a partial is now an error (it was silently ignored).
The fork changes are limited to hugo_template.go plus one mechanical
rename (walkTemplate -> walkTemplateOld) mirrored in the fork script.
Closes #15212
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
47 lines
1.3 KiB
Go
47 lines
1.3 KiB
Go
// Copyright 2025 The Hugo Authors. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package tplimpl
|
|
|
|
// Increments on breaking changes.
|
|
const TemplateVersion = 2
|
|
|
|
// ParseInfo holds information about a parsed ntemplate.
|
|
type ParseInfo struct {
|
|
// Set for shortcode templates with any {{ .Inner }}
|
|
IsInner bool
|
|
|
|
// Set for partial templates with any {{ inner }} or {{ templates.Inner }}
|
|
HasPartialInner bool
|
|
|
|
// Config extracted from template.
|
|
Config ParseConfig
|
|
}
|
|
|
|
func (info ParseInfo) IsZero() bool {
|
|
return info.Config.Version == 0
|
|
}
|
|
|
|
// ParseConfig holds configuration extracted from the template.
|
|
type ParseConfig struct {
|
|
Version int
|
|
}
|
|
|
|
var defaultParseConfig = ParseConfig{
|
|
Version: TemplateVersion,
|
|
}
|
|
|
|
var defaultParseInfo = ParseInfo{
|
|
Config: defaultParseConfig,
|
|
}
|