Use double dash for disambuating path in editor templates

Author: jesseduffield

pkg/config/editor_presets.go

@@ -58,35 +58,35 @@ func getPreset(osConfig *OSConfig, guessDefaultEditor func() string) *editPreset
 			editTemplate:              "hx -- {{filename}}",
 			editAtLineTemplate:        "hx -- {{filename}}:{{line}}",
 			editAtLineAndWaitTemplate: "hx -- {{filename}}:{{line}}",
-			openDirInEditorTemplate:   "hx {{dir}}",
+			openDirInEditorTemplate:   "hx -- {{dir}}",
 			editInTerminal:            true,
 		},
 		"vscode": {
 			editTemplate:              "code --reuse-window -- {{filename}}",
 			editAtLineTemplate:        "code --reuse-window --goto -- {{filename}}:{{line}}",
 			editAtLineAndWaitTemplate: "code --reuse-window --goto --wait -- {{filename}}:{{line}}",
-			openDirInEditorTemplate:   "code {{dir}}",
+			openDirInEditorTemplate:   "code -- {{dir}}",
 			editInTerminal:            false,
 		},
 		"sublime": {
 			editTemplate:              "subl -- {{filename}}",
 			editAtLineTemplate:        "subl -- {{filename}}:{{line}}",
 			editAtLineAndWaitTemplate: "subl --wait -- {{filename}}:{{line}}",
-			openDirInEditorTemplate:   "subl {{dir}}",
+			openDirInEditorTemplate:   "subl -- {{dir}}",
 			editInTerminal:            false,
 		},
 		"bbedit": {
 			editTemplate:              "bbedit -- {{filename}}",
 			editAtLineTemplate:        "bbedit +{{line}} -- {{filename}}",
 			editAtLineAndWaitTemplate: "bbedit +{{line}} --wait -- {{filename}}",
-			openDirInEditorTemplate:   "bbedit {{dir}}",
+			openDirInEditorTemplate:   "bbedit -- {{dir}}",
 			editInTerminal:            false,
 		},
 		"xcode": {
 			editTemplate:              "xed -- {{filename}}",
 			editAtLineTemplate:        "xed --line {{line}} -- {{filename}}",
 			editAtLineAndWaitTemplate: "xed --line {{line}} --wait -- {{filename}}",
-			openDirInEditorTemplate:   "xed {{dir}}",
+			openDirInEditorTemplate:   "xed -- {{dir}}",
 			editInTerminal:            false,
 		},
 	}
@@ -122,7 +122,7 @@ func standardTerminalEditorPreset(editor string) *editPreset {
 		editTemplate:              editor + " -- {{filename}}",
 		editAtLineTemplate:        editor + " +{{line}} -- {{filename}}",
 		editAtLineAndWaitTemplate: editor + " +{{line}} -- {{filename}}",
-		openDirInEditorTemplate:   editor + " {{dir}}",
+		openDirInEditorTemplate:   editor + " -- {{dir}}",
 		editInTerminal:            true,
 	}
 }