mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2025-03-05 20:49:04 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(config): always strip comments from json

Browse source
This commit is contained in:
Jan De Dobbeleer 2024-03-12 15:35:39 +01:00 committed by Jan De Dobbeleer
parent ae806a1942
commit 8e2419452c
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/engine/config.go
View file

@ -143,13 +143,11 @@ func loadConfig(env platform.Environment) *Config {
cfg.Format = YAML cfg.Format = YAML
err = yaml.Unmarshal(data, &cfg) err = yaml.Unmarshal(data, &cfg)
case "jsonc", "json": case "jsonc", "json":
if cfg.Format == "jsonc" {
str := jsonutil.StripComments(string(data))
data = []byte(str)
}
cfg.Format = JSON cfg.Format = JSON
str := jsonutil.StripComments(string(data))
data = []byte(str)
decoder := json.NewDecoder(bytes.NewReader(data)) decoder := json.NewDecoder(bytes.NewReader(data))
err = decoder.Decode(&cfg) err = decoder.Decode(&cfg)
case "toml", "tml": case "toml", "tml":