Don't delete a suggestion when there is no suggestion selected

Deleting the last entry in the shell command history leaves the
suggestions list focused but empty. An empty list reports its selected
index as -1 (ListCursor.clampValue), and the delete keybinding passes
that index straight to HandleDeleteSuggestion, which subscripts
GetItems() with it. Pressing delete a second time panics and takes
lazygit down with it.

To reproduce: press ":" and run any command, press ":" again, tab into
the suggestions, then press "d" twice.

The handler two lines below already returns early on a -1, with a
comment saying it should never happen. That index comes from lo.IndexOf,
so this one never got the same scrutiny.

We guard the binding the way ConfirmSuggestion directly above it is
already guarded, with singleItemSelected. The key is then disabled with
the usual reason instead of firing on an empty list
This commit is contained in:
Uzair Aftab 2026-09-01 12:22:51 +02:00
parent 3f6be3b3ee
commit c3c346e430
3 changed files with 38 additions and 0 deletions

View file

@ -49,6 +49,7 @@ func (self *SuggestionsController) GetKeybindings(opts types.KeybindingsOpts) []
Handler: func() error {
return self.context().State.OnDeleteSuggestion()
},
GetDisabledReason: self.require(self.singleItemSelected()),
},
{
Keys: opts.GetKeys(opts.Config.Universal.Edit),

View file

@ -0,0 +1,36 @@
package shell_commands
import (
"github.com/jesseduffield/lazygit/pkg/config"
. "github.com/jesseduffield/lazygit/pkg/integration/components"
)
var DeleteSuggestionWhenNoneSelected = NewIntegrationTest(NewIntegrationTestArgs{
Description: "Press the delete key again after deleting the last entry in the shell command history",
ExtraCmdArgs: []string{},
Skip: false,
SetupRepo: func(shell *Shell) {},
SetupConfig: func(cfg *config.AppConfig) {},
Run: func(t *TestDriver, keys config.KeybindingConfig) {
t.GlobalPress(keys.Universal.ExecuteShellCommand)
t.ExpectPopup().Prompt().
Title(Equals("Shell command:")).
Type("echo 1").
Confirm()
// Deleting the only suggestion leaves the list focused but empty, so
// there is nothing for a second delete to act on.
t.GlobalPress(keys.Universal.ExecuteShellCommand)
t.ExpectPopup().Prompt().
Title(Equals("Shell command:")).
SuggestionLines(Contains("echo 1")).
DeleteSuggestion(Contains("echo 1"))
t.Views().Suggestions().
IsFocused().
IsEmpty().
Press(keys.Universal.Remove)
t.ExpectToast(Equals("Disabled: No item selected"))
},
})

View file

@ -411,6 +411,7 @@ var tests = []*components.IntegrationTest{
shell_commands.BasicShellCommand,
shell_commands.ComplexShellCommand,
shell_commands.DeleteFromHistory,
shell_commands.DeleteSuggestionWhenNoneSelected,
shell_commands.EditHistory,
shell_commands.History,
shell_commands.OmitFromHistory,