mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-27 10:41:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

DRYer

Browse Source
This commit is contained in:
Kovid Goyal
2023-03-07 17:15:21 +05:30
parent f157882856
commit cd332eb2d5
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/cmd/ask/choices.go
View File

@@ -61,11 +61,11 @@ func extra_for(width, screen_width int) int {
return utils.Max(0, screen_width-width)/2 + 1
}
func choices(o *Options, items []string) (ans map[string]any, err error) {
response := ""
func choices(o *Options) (response string, err error) {
response = ""
lp, err := loop.New()
if err != nil {
return nil, err
return "", err
}
lp.MouseTrackingMode(loop.BUTTONS_ONLY_MOUSE_TRACKING)
@@ -114,7 +114,7 @@ func choices(o *Options, items []string) (ans map[string]any, err error) {
if hidden_text_start_pos > -1 {
raw, err := io.ReadAll(os.Stdin)
if err != nil {
return nil, fmt.Errorf("Failed to read hidden text from STDIN: %w", err)
return "", fmt.Errorf("Failed to read hidden text from STDIN: %w", err)
}
hidden_text = strings.TrimRightFunc(utils.UnsafeBytesToString(raw), unicode.IsSpace)
hidden_text_end_pos = hidden_text_start_pos + len(replacement_text)
@@ -422,14 +422,13 @@ func choices(o *Options, items []string) (ans map[string]any, err error) {
err = lp.Run()
if err != nil {
return nil, err
return "", err
}
ds := lp.DeathSignalName()
if ds != "" {
fmt.Println("Killed by signal: ", ds)
lp.KillIfSignalled()
return nil, fmt.Errorf("Filled by signal: %s", ds)
return "", fmt.Errorf("Filled by signal: %s", ds)
}
ans = map[string]any{"items": items, "response": response}
return
return response, nil
}