From fe0f9261155c20fe4ecadbe3ee345485fe58a51e Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Sun, 17 Nov 2024 14:37:54 -0800 Subject: [PATCH 1/2] fix(merlin): tolerate files without extension Signed-off-by: Antonio Nuno Monteiro --- src/dune_rules/merlin/merlin.ml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/dune_rules/merlin/merlin.ml b/src/dune_rules/merlin/merlin.ml index a94b191fc57..d685d60ccbe 100644 --- 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 ;; From 52388dacb8f3d8e368172777bee1a920881d09c5 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Mon, 18 Nov 2024 14:22:48 -0800 Subject: [PATCH 2/2] chore: add changelog entry Signed-off-by: Antonio Nuno Monteiro --- doc/changes/11128.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 doc/changes/11128.md diff --git a/doc/changes/11128.md b/doc/changes/11128.md new file mode 100644 index 00000000000..13c7d4668a1 --- /dev/null +++ b/doc/changes/11128.md @@ -0,0 +1,2 @@ +- Tolerate files without extension when generating merlin rules. + (#11128, @anmonteiro)