fixup! Rename "Custom Command" to "Shell Command"

jesseduffield · Aug 6, 2024 · 08803bf · 08803bf
1 parent 10624f1
commit 08803bf
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go
@@ -385,7 +385,7 @@ type KeybindingUniversalConfig struct {
 	ScrollDownMainAlt1                string   `yaml:"scrollDownMain-alt1"`
 	ScrollUpMainAlt2                  string   `yaml:"scrollUpMain-alt2"`
 	ScrollDownMainAlt2                string   `yaml:"scrollDownMain-alt2"`
-	ExecuteCustomCommand              string   `yaml:"executeCustomCommand"`
+	ExecuteShellCommand               string   `yaml:"executeCustomCommand"`
 	CreateRebaseOptionsMenu           string   `yaml:"createRebaseOptionsMenu"`
 	Push                              string   `yaml:"pushFiles"` // 'Files' appended for legacy reasons
 	Pull                              string   `yaml:"pullFiles"` // 'Files' appended for legacy reasons
@@ -824,7 +824,7 @@ func GetDefaultConfig() *UserConfig {
 				ScrollDownMainAlt1:                "J",
 				ScrollUpMainAlt2:                  "<c-u>",
 				ScrollDownMainAlt2:                "<c-d>",
-				ExecuteCustomCommand:              ":",
+				ExecuteShellCommand:               ":",
 				CreateRebaseOptionsMenu:           "m",
 				Push:                              "P",
 				Pull:                              "p",

diff --git a/pkg/gui/controllers/global_controller.go b/pkg/gui/controllers/global_controller.go
@@ -22,7 +22,7 @@ func NewGlobalController(
 func (self *GlobalController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding {
 	return []*types.Binding{
 		{
-			Key:         opts.GetKey(opts.Config.Universal.ExecuteCustomCommand),
+			Key:         opts.GetKey(opts.Config.Universal.ExecuteShellCommand),
 			Handler:     self.shellCommand,
 			Description: self.c.Tr.ExecuteShellCommand,
 			Tooltip:     self.c.Tr.ExecuteShellCommandTooltip,

diff --git a/pkg/integration/tests/filter_and_search/filter_updates_when_model_changes.go b/pkg/integration/tests/filter_and_search/filter_updates_when_model_changes.go
@@ -47,7 +47,7 @@ var FilterUpdatesWhenModelChanges = NewIntegrationTest(NewIntegrationTestArgs{
 		t.Views().Files().Focus()
 
 		// To do that, we use a custom command to create a new branch that matches the filter
-		t.GlobalPress(keys.Universal.ExecuteCustomCommand)
+		t.GlobalPress(keys.Universal.ExecuteShellCommand)
 		t.ExpectPopup().Prompt().
 			Title(Equals("Shell command:")).
 			Type("git branch new-branch").

diff --git a/pkg/integration/tests/shell_commands/basic_shell_command.go b/pkg/integration/tests/shell_commands/basic_shell_command.go
@@ -17,7 +17,7 @@ var BasicShellCommand = NewIntegrationTest(NewIntegrationTestArgs{
 		t.Views().Files().
 			IsEmpty().
 			IsFocused().
-			Press(keys.Universal.ExecuteCustomCommand)
+			Press(keys.Universal.ExecuteShellCommand)
 
 		t.ExpectPopup().Prompt().
 			Title(Equals("Shell command:")).

diff --git a/pkg/integration/tests/shell_commands/complex_shell_command.go b/pkg/integration/tests/shell_commands/complex_shell_command.go
@@ -17,7 +17,7 @@ var ComplexShellCommand = NewIntegrationTest(NewIntegrationTestArgs{
 		t.Views().Files().
 			IsEmpty().
 			IsFocused().
-			Press(keys.Universal.ExecuteCustomCommand)
+			Press(keys.Universal.ExecuteShellCommand)
 
 		t.ExpectPopup().Prompt().
 			Title(Equals("Shell command:")).

diff --git a/pkg/integration/tests/shell_commands/delete_from_history.go b/pkg/integration/tests/shell_commands/delete_from_history.go
@@ -13,7 +13,7 @@ var DeleteFromHistory = NewIntegrationTest(NewIntegrationTestArgs{
 	SetupConfig:  func(cfg *config.AppConfig) {},
 	Run: func(t *TestDriver, keys config.KeybindingConfig) {
 		createCustomCommand := func(command string) {
-			t.GlobalPress(keys.Universal.ExecuteCustomCommand)
+			t.GlobalPress(keys.Universal.ExecuteShellCommand)
 			t.ExpectPopup().Prompt().
 				Title(Equals("Shell command:")).
 				Type(command).
@@ -24,7 +24,7 @@ var DeleteFromHistory = NewIntegrationTest(NewIntegrationTestArgs{
 		createCustomCommand("echo 2")
 		createCustomCommand("echo 3")
 
-		t.GlobalPress(keys.Universal.ExecuteCustomCommand)
+		t.GlobalPress(keys.Universal.ExecuteShellCommand)
 		t.ExpectPopup().Prompt().
 			Title(Equals("Shell command:")).
 			SuggestionLines(

diff --git a/pkg/integration/tests/shell_commands/edit_history.go b/pkg/integration/tests/shell_commands/edit_history.go
@@ -12,13 +12,13 @@ var EditHistory = NewIntegrationTest(NewIntegrationTestArgs{
 	SetupRepo:    func(shell *Shell) {},
 	SetupConfig:  func(cfg *config.AppConfig) {},
 	Run: func(t *TestDriver, keys config.KeybindingConfig) {
-		t.GlobalPress(keys.Universal.ExecuteCustomCommand)
+		t.GlobalPress(keys.Universal.ExecuteShellCommand)
 		t.ExpectPopup().Prompt().
 			Title(Equals("Shell command:")).
 			Type("echo x").
 			Confirm()
 
-		t.GlobalPress(keys.Universal.ExecuteCustomCommand)
+		t.GlobalPress(keys.Universal.ExecuteShellCommand)
 		t.ExpectPopup().Prompt().
 			Title(Equals("Shell command:")).
 			Type("ec").

diff --git a/pkg/integration/tests/shell_commands/history.go b/pkg/integration/tests/shell_commands/history.go
@@ -12,20 +12,20 @@ var History = NewIntegrationTest(NewIntegrationTestArgs{
 	SetupRepo:    func(shell *Shell) {},
 	SetupConfig:  func(cfg *config.AppConfig) {},
 	Run: func(t *TestDriver, keys config.KeybindingConfig) {
-		t.GlobalPress(keys.Universal.ExecuteCustomCommand)
+		t.GlobalPress(keys.Universal.ExecuteShellCommand)
 		t.ExpectPopup().Prompt().
 			Title(Equals("Shell command:")).
 			Type("echo 1").
 			Confirm()
 
-		t.GlobalPress(keys.Universal.ExecuteCustomCommand)
+		t.GlobalPress(keys.Universal.ExecuteShellCommand)
 		t.ExpectPopup().Prompt().
 			Title(Equals("Shell command:")).
 			SuggestionLines(Contains("1")).
 			Type("echo 2").
 			Confirm()
 
-		t.GlobalPress(keys.Universal.ExecuteCustomCommand)
+		t.GlobalPress(keys.Universal.ExecuteShellCommand)
 		t.ExpectPopup().Prompt().
 			Title(Equals("Shell command:")).
 			SuggestionLines(
@@ -36,7 +36,7 @@ var History = NewIntegrationTest(NewIntegrationTestArgs{
 			Type("echo 3").
 			Confirm()
 
-		t.GlobalPress(keys.Universal.ExecuteCustomCommand)
+		t.GlobalPress(keys.Universal.ExecuteShellCommand)
 		t.ExpectPopup().Prompt().
 			Title(Equals("Shell command:")).
 			SuggestionLines(
@@ -48,7 +48,7 @@ var History = NewIntegrationTest(NewIntegrationTestArgs{
 			Confirm()
 
 		// Executing a command again should move it to the front:
-		t.GlobalPress(keys.Universal.ExecuteCustomCommand)
+		t.GlobalPress(keys.Universal.ExecuteShellCommand)
 		t.ExpectPopup().Prompt().
 			Title(Equals("Shell command:")).
 			SuggestionLines(

diff --git a/pkg/integration/tests/shell_commands/omit_from_history.go b/pkg/integration/tests/shell_commands/omit_from_history.go
@@ -14,21 +14,21 @@ var OmitFromHistory = NewIntegrationTest(NewIntegrationTestArgs{
 	},
 	SetupConfig: func(cfg *config.AppConfig) {},
 	Run: func(t *TestDriver, keys config.KeybindingConfig) {
-		t.GlobalPress(keys.Universal.ExecuteCustomCommand)
+		t.GlobalPress(keys.Universal.ExecuteShellCommand)
 		t.ExpectPopup().Prompt().
 			Title(Equals("Shell command:")).
 			Type("echo aubergine").
 			Confirm()
 
-		t.GlobalPress(keys.Universal.ExecuteCustomCommand)
+		t.GlobalPress(keys.Universal.ExecuteShellCommand)
 		t.ExpectPopup().Prompt().
 			Title(Equals("Shell command:")).
 			SuggestionLines(Contains("aubergine")).
 			SuggestionLines(DoesNotContain("tangerine")).
 			Type(" echo tangerine").
 			Confirm()
 
-		t.GlobalPress(keys.Universal.ExecuteCustomCommand)
+		t.GlobalPress(keys.Universal.ExecuteShellCommand)
 		t.ExpectPopup().Prompt().
 			Title(Equals("Shell command:")).
 			SuggestionLines(Contains("aubergine")).