github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-03-29 22:27:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

Use json5 for config files

Browse Source
This commit is contained in:
Zachary Yedidia
2016-09-01 20:17:42 -04:00
parent 226cf399ba
commit b45fcf5bd7
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/micro/bindings.go
View File

@@ -1,11 +1,11 @@
package main package main
import ( import (
"encoding/json"
"io/ioutil" "io/ioutil"
"os" "os"
"strings" "strings"
"github.com/yosuke-furukawa/json5/encoding/json5"
"github.com/zyedidia/tcell" "github.com/zyedidia/tcell"
) )
@@ -236,7 +236,7 @@ func InitBindings() {
return return
} }
err = json.Unmarshal(input, &parsed) err = json5.Unmarshal(input, &parsed)
if err != nil { if err != nil {
TermMessage("Error reading bindings.json:", err.Error()) TermMessage("Error reading bindings.json:", err.Error())
} }

10
cmd/micro/settings.go
View File

@@ -1,7 +1,6 @@
package main package main
import ( import (
"encoding/json"
"errors" "errors"
"io/ioutil" "io/ioutil"
"os" "os"
@@ -9,6 +8,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/yosuke-furukawa/json5/encoding/json5"
"github.com/zyedidia/glob" "github.com/zyedidia/glob"
) )
@@ -30,7 +30,7 @@ func InitGlobalSettings() {
return return
} }
err = json.Unmarshal(input, &parsed) err = json5.Unmarshal(input, &parsed)
if err != nil { if err != nil {
TermMessage("Error reading settings.json:", err.Error()) TermMessage("Error reading settings.json:", err.Error())
} }
@@ -70,7 +70,7 @@ func InitLocalSettings(buf *Buffer) {
return return
} }
err = json.Unmarshal(input, &parsed) err = json5.Unmarshal(input, &parsed)
if err != nil { if err != nil {
TermMessage("Error reading settings.json:", err.Error()) TermMessage("Error reading settings.json:", err.Error())
} }
@@ -110,7 +110,7 @@ func WriteSettings(filename string) error {
return err return err
} }
err = json.Unmarshal(input, &parsed) err = json5.Unmarshal(input, &parsed)
if err != nil { if err != nil {
TermMessage("Error reading settings.json:", err.Error()) TermMessage("Error reading settings.json:", err.Error())
} }
@@ -125,7 +125,7 @@ func WriteSettings(filename string) error {
} }
} }
txt, _ := json.MarshalIndent(parsed, "", " ") txt, _ := json5.MarshalIndent(parsed, "", " ")
err = ioutil.WriteFile(filename, txt, 0644) err = ioutil.WriteFile(filename, txt, 0644)
} }
return err return err