PenaDevops/delve
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pkg/terminal: use default for Y/n empty response (#3248)

Browse Source 
The typical convention with `[Y/n]` type command line questions
is that the capitalized letter represents the default if the user
simply hits "enter" instead of typing an actual response.
This patch fixes our implementation to use the implied default response.
This commit is contained in:
Derek Parker 2023-01-05 23:49:15 -08:00 committed by GitHub
parent 9c44954860
commit 8db9be977c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/terminal/command.go
View File

@ -1754,7 +1754,7 @@ func setBreakpoint(t *Term, ctx callContext, tracepoint bool, argstr string) ([]
if findLocErr != nil && shouldAskToSuspendBreakpoint(t) {
fmt.Fprintf(os.Stderr, "Command failed: %s\n", findLocErr.Error())
findLocErr = nil
answer, err := yesno(t.line, "Set a suspended breakpoint (Delve will try to set this breakpoint when a plugin is loaded) [Y/n]?")
answer, err := yesno(t.line, "Set a suspended breakpoint (Delve will try to set this breakpoint when a plugin is loaded) [Y/n]?", "yes")
if err != nil {
return nil, err
}

11
pkg/terminal/terminal.go
View File

@ -432,13 +432,16 @@ func (t *Term) promptForInput() (string, error) {
return l, nil
}
func yesno(line *liner.State, question string) (bool, error) {
func yesno(line *liner.State, question, defaultAnswer string) (bool, error) {
for {
answer, err := line.Prompt(question)
if err != nil {
return false, err
}
answer = strings.ToLower(strings.TrimSpace(answer))
if answer == "" {
answer = defaultAnswer
}
switch answer {
case "n", "no":
return false, nil
@ -469,7 +472,7 @@ func (t *Term) handleExit() (int, error) {
if err != nil {
if isErrProcessExited(err) {
if t.client.IsMulticlient() {
answer, err := yesno(t.line, "Remote process has exited. Would you like to kill the headless instance? [Y/n] ")
answer, err := yesno(t.line, "Remote process has exited. Would you like to kill the headless instance? [Y/n] ", "yes")
if err != nil {
return 2, io.EOF
}
@ -495,7 +498,7 @@ func (t *Term) handleExit() (int, error) {
doDetach := true
if t.client.IsMulticlient() {
answer, err := yesno(t.line, "Would you like to kill the headless instance? [Y/n] ")
answer, err := yesno(t.line, "Would you like to kill the headless instance? [Y/n] ", "yes")
if err != nil {
return 2, io.EOF
}
@ -505,7 +508,7 @@ func (t *Term) handleExit() (int, error) {
if doDetach {
kill := true
if t.client.AttachedToExistingProcess() {
answer, err := yesno(t.line, "Would you like to kill the process? [Y/n] ")
answer, err := yesno(t.line, "Would you like to kill the process? [Y/n] ", "yes")
if err != nil {
return 2, io.EOF
}