infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-07-15 02:14:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

update to latest sconf, for improved error messages for mixed tab/space indenting in config files

Browse Source 
based on chat with niklas/broitzer
This commit is contained in:
Mechiel Lukkien
2024-06-10 18:02:47 +02:00
parent aef99a72d8
commit dde2258f69
4 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
vendor/github.com/mjl-/sconf/parse.go generated vendored
View File

@ -225,20 +225,24 @@ func (p *parser) parseStruct0(v reflect.Value) {
var more string
if strings.TrimSpace(s) == "" {
more = " (perhaps stray whitespace)"
} else if strings.HasPrefix(l[0], " ") {
more = " (perhaps mixed tab/space indenting)"
}
p.stop(fmt.Sprintf("missing colon for key/value on non-empty line %q%s", origs, more))
p.stop(fmt.Sprintf("missing colon for struct key/value on non-empty line %q%s", origs, more))
}
k := l[0]
if k == "" {
p.stop("empty key")
p.stop("empty key in struct")
} else if strings.HasPrefix(k, " ") {
p.stop("key in struct starting with space (perhaps mixed tab/space indenting)")
}
if _, ok := seen[k]; ok {
p.stop("duplicate key")
p.stop("duplicate key in struct")
}
seen[k] = struct{}{}
s = l[1]
if s != "" && !strings.HasPrefix(s, " ") {
p.stop("missing space after colon")
p.stop("missing space after colon in struct")
}
if s != "" {
s = s[1:]
@ -288,20 +292,26 @@ func (p *parser) parseMap0(v reflect.Value) {
var more string
if strings.TrimSpace(s) == "" {
more = " (perhaps stray whitespace)"
} else if strings.HasPrefix(l[0], " ") {
more = " (perhaps mixed tab/space indenting)"
}
p.stop(fmt.Sprintf("missing colon for key/value on non-empty line %q%s", origs, more))
p.stop(fmt.Sprintf("missing colon for map key/value on non-empty line %q%s", origs, more))
}
k := l[0]
if k == "" {
p.stop("empty key")
p.stop("empty key in map")
}
if _, ok := seen[k]; ok {
p.stop("duplicate key")
p.stop("duplicate key in map")
}
seen[k] = struct{}{}
s = l[1]
if s != "" && !strings.HasPrefix(s, " ") {
p.stop("missing space after colon")
var more string
if strings.HasPrefix(k, " ") {
more = " (key starts with space, perhaps mixed tab/space indenting)"
}
p.stop("missing space after colon in map" + more)
}
if s != "" {
s = s[1:]

2
vendor/modules.txt vendored
View File

@ -19,7 +19,7 @@ github.com/mjl-/autocert
# github.com/mjl-/bstore v0.0.6
## explicit; go 1.19
github.com/mjl-/bstore
# github.com/mjl-/sconf v0.0.6
# github.com/mjl-/sconf v0.0.7
## explicit; go 1.12
github.com/mjl-/sconf
# github.com/mjl-/sherpa v0.6.7