Fix

Signed-off-by: Nicolás Ojeda Bär <[email protected]>

src/dialect.ml

@@ -57,7 +57,7 @@ let decode =
       field name ~default:Filter.No_filter
         (map ~f (located Action_dune_lang.decode))
     in
-    let+ extension  = field "extension"  string
+    let+ extension  = field "extension" (map ~f:(fun s -> "." ^ s) string)
     and+ preprocess = filter "preprocess"
     and+ format     = filter "format"
     in
@@ -90,8 +90,8 @@ let ocaml =
     ; format     = Filter.No_filter
     }
   in
-  let intf = file_kind Ml_kind.Intf "mli" in
-  let impl = file_kind Ml_kind.Impl "ml"  in
+  let intf = file_kind Ml_kind.Intf ".mli" in
+  let impl = file_kind Ml_kind.Impl ".ml"  in
   { name       = "ocaml"
   ; file_kinds = Ml_kind.Dict.make ~intf ~impl
   }
@@ -118,8 +118,8 @@ let reason =
     ; format     = Filter.Action (Loc.none, format)
     }
   in
-  let intf = file_kind Ml_kind.Intf "rei" in
-  let impl = file_kind Ml_kind.Impl "re"  in
+  let intf = file_kind Ml_kind.Intf ".rei" in
+  let impl = file_kind Ml_kind.Impl ".re"  in
   { name       = "reason"
   ; file_kinds = Ml_kind.Dict.make ~intf ~impl
   }

src/dialect.mli

@@ -36,7 +36,6 @@ val to_dyn : t -> Dyn.t
 val decode : t Dune_lang.Decoder.t
 
 val extension : t -> Ml_kind.t -> string
-(* The corresponding extension *without* the leading '.' *)
 
 val preprocess : t -> Ml_kind.t -> Filter.t
 

src/dir_contents.ml

@@ -98,7 +98,7 @@ let modules_of_files ~dialects ~dir ~files =
          filenames such as foo.cppo.ml *)
       match String.lsplit2 fn ~on:'.' with
       | Some (s, ext) ->
-        begin match Dialect.S.find_by_extension dialects ext with
+        begin match Dialect.S.find_by_extension dialects ("." ^ ext) with
         | Some (dialect, Ml_kind.Impl) -> Left  (make_module dialect s fn)
         | Some (dialect, Ml_kind.Intf) -> Right (make_module dialect s fn)
         | None                         -> Skip

src/module.ml

@@ -37,7 +37,7 @@ module Name = struct
     Lib_name.Local.of_string_exn s
 
   let basename n ~(ml_kind : Ml_kind.t) ~(dialect : Dialect.t) =
-    String.lowercase n ^ "." ^ Dialect.extension dialect ml_kind
+    String.lowercase n ^ Dialect.extension dialect ml_kind
 end
 
 module File = struct