KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix overrides not being parsed correctly

Browse Source
This commit is contained in:
Kovid Goyal 2023-03-23 10:39:24 +05:30
parent 29a896f9d8
commit 14b58ba015
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/cmd/diff/highlight.go
View File

@ -144,10 +144,12 @@ func highlight_file(path string) (highlighted string, err error) {
lexer = chroma.Coalesce(lexer) lexer = chroma.Coalesce(lexer)
name := conf.Pygments_style name := conf.Pygments_style
const DEFAULT_LIGHT_THEME = "borland" const DEFAULT_LIGHT_THEME = "borland"
var style *chroma.Style
if name == "default" { if name == "default" {
DefaultStyle() style = DefaultStyle()
} else {
style = styles.Get(name)
} }
style := styles.Get(name)
if style == nil { if style == nil {
if conf.Background.IsDark() && !conf.Foreground.IsDark() { if conf.Background.IsDark() && !conf.Foreground.IsDark() {
style = styles.Get("monokai") style = styles.Get("monokai")

2
tools/cmd/ssh/main.go
View File

@ -106,7 +106,7 @@ func parse_kitten_args(found_extra_args []string, username, hostname_for_match s
literal_env = le literal_env = le
} }
} else if key != "hostname" { } else if key != "hostname" {
overrides = append(overrides, key+" "+val) overrides = append(overrides, key+"="+val)
} }
} }
} }

4
tools/config/api.go
View File

@ -219,7 +219,9 @@ func (self *LinesScanner) Err() error {
} }
func (self *ConfigParser) ParseOverrides(overrides ...string) error { func (self *ConfigParser) ParseOverrides(overrides ...string) error {
s := LinesScanner{lines: overrides} s := LinesScanner{lines: utils.Map(func(x string) string {
return strings.Replace(x, "=", " ", 1)
}, overrides)}
self.seen_includes = make(map[string]bool) self.seen_includes = make(map[string]bool)
return self.parse(&s, "<overrides>", utils.ConfigDir(), 0) return self.parse(&s, "<overrides>", utils.ConfigDir(), 0)
} }