summaryrefslogtreecommitdiffstats
path: root/pkg
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2023-05-25 23:50:33 +1000
committerJesse Duffield <jessedduffield@gmail.com>2023-05-26 09:19:12 +1000
commit9c384c526730765e7fc74c6186e4e01627139e90 (patch)
treec897c73a1dc505304cd16f4954ea1ad2aa936d9f /pkg
parente5534d9781d3e19fb2f2b3c86b737bddf914d405 (diff)
Clean up helix editor preset
Diffstat (limited to 'pkg')
-rw-r--r--pkg/config/editor_presets.go17
1 files 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