mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-25 17:52:02 +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

9
tools/cmd/ask/get_line.go
View File

@@ -16,13 +16,12 @@ import (
var _ = fmt.Print
func get_line(o *Options, items []string) (result map[string]any, err error) {
func get_line(o *Options) (result string, err error) {
lp, err := loop.New(loop.NoAlternateScreen, loop.NoRestoreColors)
if err != nil {
return
}
cwd, _ := os.Getwd()
result = map[string]any{"items": items, "response": ""}
ropts := readline.RlInit{Prompt: o.Prompt}
if o.Name != "" {
base := filepath.Join(utils.CacheDir(), "ask")
@@ -59,7 +58,7 @@ func get_line(o *Options, items []string) (result map[string]any, err error) {
if err == readline.ErrAcceptInput {
hi := readline.HistoryItem{Timestamp: time.Now(), Cmd: rl.AllText(), ExitCode: 0, Cwd: cwd}
rl.AddHistoryItem(hi)
result["response"] = rl.AllText()
result = rl.AllText()
lp.Quit(0)
return nil
}
@@ -83,11 +82,11 @@ func get_line(o *Options, items []string) (result map[string]any, err error) {
err = lp.Run()
rl.Shutdown()
if err != nil {
return nil, err
return "", err
}
ds := lp.DeathSignalName()
if ds != "" {
return nil, fmt.Errorf("Killed by signal: %s", ds)
return "", fmt.Errorf("Killed by signal: %s", ds)
}
return
}