Fixed file path quoting determination for text file opening

darrenldl · Nov 6, 2024 · 8537dc7 · 8537dc7
1 parent 207b9f0
commit 8537dc7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/bin/docfd.ml b/bin/docfd.ml
@@ -931,6 +931,7 @@ let run
               close_term ();
               Misc_utils.gen_command_to_open_text_file_to_line_num
                 ~editor:!Params.text_editor
+                ~quote_path:true
                 ~path:file
                 ~line_num:(max 1 (Dynarray.length snapshots - 1))
               |> Sys.command

diff --git a/bin/misc_utils.ml b/bin/misc_utils.ml
@@ -98,8 +98,13 @@ let normalize_filter_glob_if_not_empty (s : string) =
     normalize_glob_to_absolute s
   )
 
-let gen_command_to_open_text_file_to_line_num ~editor ~path ~line_num =
-  let path = Filename.quote path in
+let gen_command_to_open_text_file_to_line_num ~editor ~quote_path ~path ~line_num =
+  let path =
+    if quote_path then
+      Filename.quote path
+    else
+      path
+  in
   let fallback = Fmt.str "%s %s" editor path in
   match Filename.basename editor with
   | "nano" ->

diff --git a/bin/path_open.ml b/bin/path_open.ml
@@ -129,6 +129,7 @@ let pdf index ~path ~search_result =
   Proc_utils.run_in_background cmd |> ignore
 
 let text index document_src ~editor ~path ~search_result =
+  let path = Filename.quote path in
   let fallback = Fmt.str "%s %s" editor path in
   let cmd =
     match search_result with
@@ -142,7 +143,7 @@ let text index document_src ~editor ~path ~search_result =
                        |> (fun x -> x + 1)
         in
         Misc_utils.gen_command_to_open_text_file_to_line_num
-          ~editor ~path ~line_num
+          ~editor ~quote_path:false ~path ~line_num
       )
   in
   let cmd =