From 9c384c526730765e7fc74c6186e4e01627139e90 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Thu, 25 May 2023 23:50:33 +1000
Subject: [PATCH] Clean up helix editor preset

---
 pkg/config/editor_presets.go | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkg/config/editor_presets.go b/pkg/config/editor_presets.go
index 38e41ec49..eef1c7bed 100644
--- a/pkg/config/editor_presets.go
+++ b/pkg/config/editor_presets.go
@@ -44,7 +44,12 @@ func getPreset(osConfig *OSConfig, guessDefaultEditor func() string) *editPreset
 		"emacs":   standardTerminalEditorPreset("emacs"),
 		"nano":    standardTerminalEditorPreset("nano"),
 		"kakoune": standardTerminalEditorPreset("kakoune"),
-		"hx":      helixEditorPreset(),
+		"helix": {
+			editTemplate:              "hx -- {{filename}}",
+			editAtLineTemplate:        "hx -- {{filename}}:{{line}}",
+			editAtLineAndWaitTemplate: "hx -- {{filename}}:{{line}}",
+			editInTerminal:            true,
+		},
 		"vscode": {
 			editTemplate:              "code --reuse-window -- {{filename}}",
 			editAtLineTemplate:        "code --reuse-window --goto -- {{filename}}:{{line}}",
@@ -74,6 +79,7 @@ func getPreset(osConfig *OSConfig, guessDefaultEditor func() string) *editPreset
 	// Some of our presets have a different name than the editor they are using.
 	editorToPreset := map[string]string{
 		"kak":  "kakoune",
+		"hx":   "helix",
 		"code": "vscode",
 		"subl": "sublime",
 		"xed":  "xcode",
@@ -105,15 +111,6 @@ func standardTerminalEditorPreset(editor string) *editPreset {
 	}
 }
 
-func helixEditorPreset() *editPreset {
-	return &editPreset{
-		editTemplate:              "hx -- {{filename}}",
-		editAtLineTemplate:        "hx -- {{filename}}:{{line}}",
-		editAtLineAndWaitTemplate: "hx -- {{filename}}:{{line}}",
-		editInTerminal:            true,
-	}
-}
-
 func getEditInTerminal(osConfig *OSConfig, preset *editPreset) bool {
 	if osConfig.EditInTerminal != nil {
 		return *osConfig.EditInTerminal