mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-26 18:22:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

get rid of interface{} since we now require Go 1.18

Browse Source
This commit is contained in:
Kovid Goyal
2022-09-21 08:11:46 +05:30
parent a44c89504b
commit 2cacd7a64a
15 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gen-go-code.py
View File

@@ -152,7 +152,7 @@ def generate_completions_for_kitty() -> None:
# rc command wrappers {{{ # rc command wrappers {{{
json_field_types: Dict[str, str] = { json_field_types: Dict[str, str] = {
'bool': 'bool', 'str': 'string', 'list.str': '[]string', 'dict.str': 'map[string]string', 'float': 'float64', 'int': 'int', 'bool': 'bool', 'str': 'string', 'list.str': '[]string', 'dict.str': 'map[string]string', 'float': 'float64', 'int': 'int',
'scroll_amount': 'interface{}', 'spacing': 'interface{}', 'colors': 'interface{}', 'scroll_amount': 'any', 'spacing': 'any', 'colors': 'any',
} }

4
tools/cli/option-from-string.go
View File

@@ -52,7 +52,7 @@ func is_string_slice(f reflect.Value) bool {
return f.Type().Elem().Kind() == reflect.String return f.Type().Elem().Kind() == reflect.String
} }
func OptionsFromStruct(pointer_to_options_struct interface{}) ([]*Option, error) { func OptionsFromStruct(pointer_to_options_struct any) ([]*Option, error) {
val := reflect.ValueOf(pointer_to_options_struct).Elem() val := reflect.ValueOf(pointer_to_options_struct).Elem()
if val.Kind() != reflect.Struct { if val.Kind() != reflect.Struct {
return nil, fmt.Errorf("Need a pointer to a struct to set option values on") return nil, fmt.Errorf("Need a pointer to a struct to set option values on")
@@ -105,7 +105,7 @@ func option_from_string(overrides map[string]string, entries ...string) (*Option
} }
ans := Option{ ans := Option{
values_from_cmdline: make([]string, 0, 1), values_from_cmdline: make([]string, 0, 1),
parsed_values_from_cmdline: make([]interface{}, 0, 1), parsed_values_from_cmdline: make([]any, 0, 1),
} }
scanner := utils.NewScanLines(entries...) scanner := utils.NewScanLines(entries...)
in_help := false in_help := false

10
tools/cli/types.go
View File

@@ -50,8 +50,8 @@ type Option struct {
Parent *Command Parent *Command
values_from_cmdline []string values_from_cmdline []string
parsed_values_from_cmdline []interface{} parsed_values_from_cmdline []any
parsed_default interface{} parsed_default any
seen_option string seen_option string
} }
@@ -79,7 +79,7 @@ func NormalizeOptionName(name string) string {
return strings.ReplaceAll(strings.TrimLeft(name, "-"), "_", "-") return strings.ReplaceAll(strings.TrimLeft(name, "-"), "_", "-")
} }
func (self *Option) parsed_value() interface{} { func (self *Option) parsed_value() any {
if len(self.values_from_cmdline) == 0 { if len(self.values_from_cmdline) == 0 {
return self.parsed_default return self.parsed_default
} }
@@ -96,7 +96,7 @@ func (self *Option) parsed_value() interface{} {
} }
} }
func (self *Option) parse_value(val string) (interface{}, error) { func (self *Option) parse_value(val string) (any, error) {
switch self.OptionType { switch self.OptionType {
case BoolOption: case BoolOption:
switch val { switch val {
@@ -455,7 +455,7 @@ type Context struct {
SeenCommands []*Command SeenCommands []*Command
} }
func (self *Command) GetOptionValues(pointer_to_options_struct interface{}) error { func (self *Command) GetOptionValues(pointer_to_options_struct any) error {
m := make(map[string]*Option, 128) m := make(map[string]*Option, 128)
for _, g := range self.OptionGroups { for _, g := range self.OptionGroups {
for _, o := range g.Options { for _, o := range g.Options {

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

@@ -83,7 +83,7 @@ func simple_serializer(rc *utils.RemoteControlCmd) (ans []byte, err error) {
type serializer_func func(rc *utils.RemoteControlCmd) ([]byte, error) type serializer_func func(rc *utils.RemoteControlCmd) ([]byte, error)
func debug_to_log(args ...interface{}) { func debug_to_log(args ...any) {
f, err := os.OpenFile("/tmp/kdlog", os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0666) f, err := os.OpenFile("/tmp/kdlog", os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0666)
if err == nil { if err == nil {
fmt.Fprintln(f, args...) fmt.Fprintln(f, args...)

4
tools/cmd/at/scroll_window.go
View File

@@ -8,8 +8,8 @@ import (
"strings" "strings"
) )
func parse_scroll_amount(amt string) ([]interface{}, error) { func parse_scroll_amount(amt string) ([]any, error) {
var ans = make([]interface{}, 2) var ans = make([]any, 2)
if amt == "start" || amt == "end" { if amt == "start" || amt == "end" {
ans[0] = amt ans[0] = amt
ans[1] = nil ans[1] = nil

6
tools/cmd/at/set_colors.go
View File

@@ -26,7 +26,7 @@ var nullable_colors = map[string]bool{
// NULLABLE_COLORS_END // NULLABLE_COLORS_END
} }
func set_color_in_color_map(key, val string, ans map[string]interface{}, check_nullable, skip_nullable bool) error { func set_color_in_color_map(key, val string, ans map[string]any, check_nullable, skip_nullable bool) error {
if val == "none" { if val == "none" {
if check_nullable && !nullable_colors[key] { if check_nullable && !nullable_colors[key] {
if skip_nullable { if skip_nullable {
@@ -45,8 +45,8 @@ func set_color_in_color_map(key, val string, ans map[string]interface{}, check_n
return nil return nil
} }
func parse_colors_and_files(args []string) (map[string]interface{}, error) { func parse_colors_and_files(args []string) (map[string]any, error) {
ans := make(map[string]interface{}, len(args)) ans := make(map[string]any, len(args))
for _, arg := range args { for _, arg := range args {
key, val, found := utils.Cut(strings.ToLower(arg), "=") key, val, found := utils.Cut(strings.ToLower(arg), "=")
if found { if found {

4
tools/cmd/at/set_spacing.go
View File

@@ -10,8 +10,8 @@ import (
"kitty/tools/utils" "kitty/tools/utils"
) )
func parse_set_spacing(args []string) (map[string]interface{}, error) { func parse_set_spacing(args []string) (map[string]any, error) {
ans := make(map[string]interface{}, len(args)) ans := make(map[string]any, len(args))
mapper := make(map[string][]string, 32) mapper := make(map[string][]string, 32)
types := [2]string{"margin", "padding"} types := [2]string{"margin", "padding"}
for _, q := range types { for _, q := range types {

4
tools/cmd/at/set_tab_color.go
View File

@@ -11,8 +11,8 @@ import (
var valid_color_names = map[string]bool{"active_fg": true, "active_bg": true, "inactive_fg": true, "inactive_bg": true} var valid_color_names = map[string]bool{"active_fg": true, "active_bg": true, "inactive_fg": true, "inactive_bg": true}
func parse_tab_colors(args []string) (map[string]interface{}, error) { func parse_tab_colors(args []string) (map[string]any, error) {
ans := make(map[string]interface{}, len(args)) ans := make(map[string]any, len(args))
for _, arg := range args { for _, arg := range args {
key, val, found := utils.Cut(strings.ToLower(arg), "=") key, val, found := utils.Cut(strings.ToLower(arg), "=")
if !found { if !found {

2
tools/completion/bash.go
View File

@@ -13,7 +13,7 @@ var _ = fmt.Print
func bash_output_serializer(completions []*Completions, shell_state map[string]string) ([]byte, error) { func bash_output_serializer(completions []*Completions, shell_state map[string]string) ([]byte, error) {
output := strings.Builder{} output := strings.Builder{}
f := func(format string, args ...interface{}) { fmt.Fprintf(&output, format+"\n", args...) } f := func(format string, args ...any) { fmt.Fprintf(&output, format+"\n", args...) }
n := completions[0].Delegate.NumToRemove n := completions[0].Delegate.NumToRemove
if n > 0 { if n > 0 {
f("compopt +o nospace") f("compopt +o nospace")

2
tools/completion/fish.go
View File

@@ -14,7 +14,7 @@ var _ = fmt.Print
func fish_output_serializer(completions []*Completions, shell_state map[string]string) ([]byte, error) { func fish_output_serializer(completions []*Completions, shell_state map[string]string) ([]byte, error) {
output := strings.Builder{} output := strings.Builder{}
f := func(format string, args ...interface{}) { fmt.Fprintf(&output, format+"\n", args...) } f := func(format string, args ...any) { fmt.Fprintf(&output, format+"\n", args...) }
n := completions[0].Delegate.NumToRemove n := completions[0].Delegate.NumToRemove
fm := markup.New(false) // fish freaks out if there are escape codes in the description strings fm := markup.New(false) // fish freaks out if there are escape codes in the description strings
if n > 0 { if n > 0 {

4
tools/completion/main.go
View File

@@ -15,11 +15,11 @@ import (
"kitty/tools/utils" "kitty/tools/utils"
) )
func debug(args ...interface{}) { func debug(args ...any) {
tty.DebugPrintln(args...) tty.DebugPrintln(args...)
} }
func debugf(format string, args ...interface{}) { func debugf(format string, args ...any) {
debug(fmt.Sprintf(format, args...)) debug(fmt.Sprintf(format, args...))
} }

4
tools/tty/tty.go
View File

@@ -278,7 +278,7 @@ func (self *Term) WriteString(b string) (int, error) {
return self.os_file.WriteString(b) return self.os_file.WriteString(b)
} }
func (self *Term) DebugPrintln(a ...interface{}) { func (self *Term) DebugPrintln(a ...any) {
msg := []byte(fmt.Sprintln(a...)) msg := []byte(fmt.Sprintln(a...))
const limit = 2048 const limit = 2048
encoded := make([]byte, limit*2) encoded := make([]byte, limit*2)
@@ -308,7 +308,7 @@ func (self *Term) GetSize() (*unix.Winsize, error) {
// go doesnt have a wrapper for ctermid() // go doesnt have a wrapper for ctermid()
func Ctermid() string { return "/dev/tty" } func Ctermid() string { return "/dev/tty" }
func DebugPrintln(a ...interface{}) { func DebugPrintln(a ...any) {
term, err := OpenControllingTerm() term, err := OpenControllingTerm()
if err == nil { if err == nil {
defer term.Close() defer term.Close()

2
tools/tui/loop/api.go
View File

@@ -139,7 +139,7 @@ func (self *Loop) KillIfSignalled() {
} }
} }
func (self *Loop) DebugPrintln(args ...interface{}) { func (self *Loop) DebugPrintln(args ...any) {
if self.controlling_term != nil { if self.controlling_term != nil {
const limit = 2048 const limit = 2048
msg := fmt.Sprintln(args...) msg := fmt.Sprintln(args...)

4
tools/utils/style/api.go
View File

@@ -11,11 +11,11 @@ type Context struct {
AllowEscapeCodes bool AllowEscapeCodes bool
} }
func (self *Context) SprintFunc(spec string) func(args ...interface{}) string { func (self *Context) SprintFunc(spec string) func(args ...any) string {
p := prefix_for_spec(spec) p := prefix_for_spec(spec)
s := suffix_for_spec(spec) s := suffix_for_spec(spec)
return func(args ...interface{}) string { return func(args ...any) string {
body := fmt.Sprint(args...) body := fmt.Sprint(args...)
if !self.AllowEscapeCodes { if !self.AllowEscapeCodes {
return body return body

20
tools/utils/types.go
View File

@@ -3,16 +3,16 @@
package utils package utils
type RemoteControlCmd struct { type RemoteControlCmd struct {
Cmd string `json:"cmd"` Cmd string `json:"cmd"`
Version [3]int `json:"version"` Version [3]int `json:"version"`
NoResponse bool `json:"no_response,omitempty"` NoResponse bool `json:"no_response,omitempty"`
Timestamp int64 `json:"timestamp,omitempty"` Timestamp int64 `json:"timestamp,omitempty"`
Password string `json:"password,omitempty"` Password string `json:"password,omitempty"`
Async string `json:"async,omitempty"` Async string `json:"async,omitempty"`
CancelAsync bool `json:"cancel_async,omitempty"` CancelAsync bool `json:"cancel_async,omitempty"`
Stream bool `json:"stream,omitempty"` Stream bool `json:"stream,omitempty"`
StreamId string `json:"stream_id,omitempty"` StreamId string `json:"stream_id,omitempty"`
Payload interface{} `json:"payload,omitempty"` Payload any `json:"payload,omitempty"`
} }
type EncryptedRemoteControlCmd struct { type EncryptedRemoteControlCmd struct {