Fix the help example, read padding past the shape gate, catch a stray closing brace, and stop the fieldless hint naming a spelling that fails

This commit is contained in:
2026-09-03 20:58:01 +02:00
parent d8048df169
commit 0cdbdb7bf4
2 changed files with 21 additions and 6 deletions
+16 -1
View File
@@ -165,7 +165,11 @@ func checkArm(name string, fields map[string]node) error {
return fmt.Errorf("%q is an option and can never be a field", a.key)
}
if len(fields) == 0 {
return fmt.Errorf("no field %q; a token names a sibling field, and a bare string has none — write {/%s} to reference the data", a.key, name)
hint := ""
if hintableRef(name) {
hint = fmt.Sprintf(" — write {/%s} to reference the data", name)
}
return fmt.Errorf("no field %q; a token names a sibling field, and this template has none%s", a.key, hint)
}
return fmt.Errorf("no field %q", a.key)
}
@@ -175,6 +179,17 @@ func checkArm(name string, fields map[string]node) error {
return nil
}
// hintableRef reports whether {/name} is a reference the grammar accepts, so the
// hint never names a spelling that fails too.
func hintableRef(name string) bool {
for _, seg := range strings.Split(name, ".") {
if checkName(seg) != nil {
return false
}
}
return true
}
// tokenOperands lists the fields one {token} body reads as operands, empty for a
// field token or a builtin that reads none.
func tokenOperands(body string) []string {