fix(merlin): tolerate files without extension (ocaml#11128)

* fix(merlin): tolerate files without extension Signed-off-by: Antonio Nuno Monteiro <[email protected]> * chore: add changelog entry Signed-off-by: Antonio Nuno Monteiro <[email protected]> --------- Signed-off-by: Antonio Nuno Monteiro <[email protected]> Signed-off-by: Chris Armstrong <[email protected]>
chris-armstrong · Jan 29, 2025 · 1f7fe79 · 1f7fe79
1 parent 7a6597f
commit 1f7fe79
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/doc/changes/11128.md b/doc/changes/11128.md
@@ -0,0 +1,2 @@
+- Tolerate files without extension when generating merlin rules.
+  (#11128, @anmonteiro)
diff --git a/src/dune_rules/merlin/merlin.ml b/src/dune_rules/merlin/merlin.ml
@@ -3,7 +3,12 @@ open Memo.O
 
 let remove_extension file =
   let dir = Path.Build.parent_exn file in
-  let basename, _ext = String.lsplit2_exn (Path.Build.basename file) ~on:'.' in
+  let basename =
+    let basename = Path.Build.basename file in
+    match String.lsplit2 basename ~on:'.' with
+    | Some (basename, _ext) -> basename
+    | None -> basename
+  in
   Path.Build.relative dir basename
 ;;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- Tolerate files without extension when generating merlin rules.
		(#11128, @anmonteiro)