fix kitty config format

Author: ImSingee

internal/config/config.go

@@ -1,14 +1,15 @@
 package config
 
 import (
-	"encoding/json"
 	"fmt"
 	"os"
 	"path/filepath"
 
 	"github.com/ImSingee/go-ex/ee"
 	"github.com/ImSingee/go-ex/exjson"
 	"github.com/ysmood/gson"
+
+	"github.com/ImSingee/kitty/internal/lib/jsonfmt"
 )
 
 var ConfigFileNames = []string{
@@ -100,7 +101,12 @@ func PatchKittyConfig(dir string, patch func(map[string]gson.JSON) (save bool, e
 }
 
 func saveKittyConfig(filename string, c map[string]gson.JSON) error {
-	data, err := json.MarshalIndent(c, "", "  ")
+	raw := make(map[string]any, len(c))
+	for key, value := range c {
+		raw[key] = value.Val()
+	}
+
+	data, err := jsonfmt.Marshal(raw, "  ")
 	if err != nil {
 		return ee.Wrap(err, "cannot json encode config")
 	}

internal/ext/format/json.go

@@ -1,10 +1,11 @@
 package format
 
 import (
-	"bytes"
 	"encoding/json"
 
 	"github.com/ImSingee/go-ex/ee"
+
+	"github.com/ImSingee/kitty/internal/lib/jsonfmt"
 )
 
 type JsonFormatter struct {
@@ -18,17 +19,7 @@ func (f *JsonFormatter) Format(filename string, content []byte) ([]byte, error)
 		return nil, ee.New("invalid json")
 	}
 
-	var buf bytes.Buffer
-	encoder := json.NewEncoder(&buf)
-	encoder.SetEscapeHTML(false)
-	encoder.SetIndent("", f.Indent)
-
-	err = encoder.Encode(v)
-	if err != nil {
-		return nil, err
-	}
-
-	return bytes.TrimSuffix(buf.Bytes(), []byte("\n")), nil
+	return jsonfmt.Marshal(v, f.Indent)
 }
 
 func (o *options) jsonFormatter() *JsonFormatter {

internal/lib/jsonfmt/json.go

@@ -0,0 +1,20 @@
+package jsonfmt
+
+import (
+	"bytes"
+	"encoding/json"
+)
+
+func Marshal(v any, indent string) ([]byte, error) {
+	var buf bytes.Buffer
+	encoder := json.NewEncoder(&buf)
+	encoder.SetEscapeHTML(false)
+	encoder.SetIndent("", indent)
+
+	err := encoder.Encode(v)
+	if err != nil {
+		return nil, err
+	}
+
+	return bytes.TrimSuffix(buf.Bytes(), []byte("\n")), nil
+}

internal/lib/jsonfmt/json_test.go

@@ -0,0 +1,25 @@
+package jsonfmt
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestMarshalDoesNotEscapeHTML(t *testing.T) {
+	data, err := Marshal(map[string]any{
+		"html": "<div>&</div>",
+	}, "  ")
+	if err != nil {
+		t.Fatalf("Marshal returned error: %v", err)
+	}
+
+	got := string(data)
+	if strings.Contains(got, "\\u003c") || strings.Contains(got, "\\u003e") || strings.Contains(got, "\\u0026") {
+		t.Fatalf("Marshal escaped html-sensitive characters: %s", got)
+	}
+
+	want := "{\n  \"html\": \"<div>&</div>\"\n}"
+	if got != want {
+		t.Fatalf("unexpected formatted json:\nwant:\n%s\ngot:\n%s", want, got)
+	}
+}