diff --git a/kitty/conf/generate.py b/kitty/conf/generate.py index 42813365a..46a5a82e6 100644 --- a/kitty/conf/generate.py +++ b/kitty/conf/generate.py @@ -453,14 +453,14 @@ def go_type_data(parser_func: ParserFuncType, ctype: str) -> Tuple[str, str]: if p == 'float': return 'float64', 'strconv.ParseFloat(val, 10, 64)' if p == 'to_bool': - return 'bool', 'utils.StringToBool(val), nil' + return 'bool', 'config.StringToBool(val), nil' th = get_type_hints(parser_func) rettype = th['return'] return {int: 'int64', str: 'string', float: 'float64'}[rettype], f'{p}(val)' def gen_go_code(defn: Definition) -> str: - lines = ['import "fmt"', 'import "strconv"', 'import "kitty/tools/utils"', 'var _ = fmt.Println', 'var _ = utils.StringToBool', 'var _ = strconv.Atoi'] + lines = ['import "fmt"', 'import "strconv"', 'import "kitty/tools/config"', 'var _ = fmt.Println', 'var _ = config.StringToBool', 'var _ = strconv.Atoi'] a = lines.append choices = {} go_types = {} diff --git a/tools/utils/config.go b/tools/config/api.go similarity index 97% rename from tools/utils/config.go rename to tools/config/api.go index 3eecc4f3e..7f4967762 100644 --- a/tools/utils/config.go +++ b/tools/config/api.go @@ -1,6 +1,6 @@ // License: GPLv3 Copyright: 2023, Kovid Goyal, -package utils +package config import ( "bufio" @@ -9,6 +9,7 @@ import ( "fmt" "io" "io/fs" + "kitty/tools/utils" "os" "path/filepath" "strings" @@ -173,5 +174,5 @@ func (self *LinesScanner) Err() error { func (self *ConfigParser) ParseOverrides(overrides ...string) error { s := LinesScanner{lines: overrides} self.seen_includes = make(map[string]bool) - return self.parse(&s, "", ConfigDir(), 0) + return self.parse(&s, "", utils.ConfigDir(), 0) } diff --git a/tools/utils/config_test.go b/tools/config/api_test.go similarity index 98% rename from tools/utils/config_test.go rename to tools/config/api_test.go index 07430f78b..9c830bdef 100644 --- a/tools/utils/config_test.go +++ b/tools/config/api_test.go @@ -1,6 +1,6 @@ // License: GPLv3 Copyright: 2023, Kovid Goyal, -package utils +package config import ( "fmt"