+1 -1

merlin-js.opam

··· 10 10 ["dune" "build" "-p" name "-j" jobs] 11 11 ] 12 12 depends: [ 13 13 - "ocaml" {>= "5.0"} 13 13 + "ocaml" {>= "5.2" & < "5.3"} 14 14 "dune" {>= "3.0"} 15 15 "merlin-lib" 16 16 "yojson" {>= "1.6.0"}

src/worker/static/stdlib/camlinternalFormat.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/camlinternalFormatBasics.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/camlinternalLazy.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/camlinternalMod.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/camlinternalOO.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/dynlink.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/event.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/nat.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/num.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/profiling.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/runtime_events.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/std_exit.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Arg.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Array.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__ArrayLabels.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Atomic.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Bigarray.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Bool.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Buffer.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Bytes.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__BytesLabels.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Callback.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Char.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Complex.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Condition.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Digest.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Domain.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Dynarray.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Effect.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Either.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Ephemeron.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Filename.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Float.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Format.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Fun.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Gc.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Hashtbl.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__In_channel.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Int.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Int32.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Int64.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Lazy.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Lexing.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__List.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__ListLabels.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Map.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Marshal.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__MoreLabels.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Mutex.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Nativeint.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Obj.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Oo.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Option.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Out_channel.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Parsing.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Printexc.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Printf.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Queue.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Random.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Result.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Scanf.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Semaphore.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Seq.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Set.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Stack.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__StdLabels.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__String.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__StringLabels.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Sys.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Type.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Uchar.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Unit.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/stdlib__Weak.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/str.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/thread.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/topdirs.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/unix.cmi

This is a binary file and will not be displayed.

src/worker/static/stdlib/unixLabels.cmi

This is a binary file and will not be displayed.

+8 -9

src/worker/worker.ml

··· 18 18 None) 19 19 (fun b -> Some (Typed_array.String.of_arrayBuffer b)) 20 20 | _ -> None 21 21 - 21 21 + 22 22 let filename_of_module unit_name = 23 23 Printf.sprintf "%s.cmi" (String.uncapitalize_ascii unit_name) 24 24 25 25 let reset_dirs () = 26 26 Ocaml_utils.Directory_content_cache.clear (); 27 27 let open Ocaml_utils.Load_path in 28 28 - let dirs = get_paths () in 28 28 + let { visible; hidden } = get_paths () in 29 29 reset (); 30 30 - List.iter ~f:(fun p -> 31 31 - prepend_dir (Dir.create p)) dirs 30 30 + init ~auto_include:no_auto_include ~visible ~hidden 32 31 33 32 let add_dynamic_cmis dcs = 34 33 let open Ocaml_typing.Persistent_env.Persistent_signature in ··· 49 48 Js_of_ocaml.Sys_js.create_file ~name ~content 50 49 | None -> ()) dcs.dcs_toplevel_modules; 51 50 52 52 - let new_load ~unit_name = 51 51 + let new_load ~allow_hidden ~unit_name = 53 52 let filename = filename_of_module unit_name in 54 53 let fs_name = Filename.(concat "/static/stdlib" filename) in 55 55 - (* Check if it's already been downloaded. This will be the 54 54 + (* Check if it's already been downloaded. This will be the 56 55 case for all toplevel cmis. Also check whether we're supposed 57 56 to handle this cmi *) 58 57 if ··· 70 69 Printf.eprintf "Warning: Expected to find cmi at: %s\n%!" 71 70 (Filename.concat dcs.Protocol.dcs_url filename) 72 71 end; 73 73 - old_loader ~unit_name 72 72 + old_loader ~allow_hidden ~unit_name 74 73 in 75 74 load := new_load 76 76 - 75 75 + 77 76 let add_cmis { Protocol.static_cmis; dynamic_cmis } = 78 77 List.iter static_cmis ~f:(fun { Protocol.sc_name; sc_content } -> 79 78 let filename = Printf.sprintf "%s.cmi" (String.uncapitalize_ascii sc_name) in ··· 81 80 Js_of_ocaml.Sys_js.create_file ~name ~content:sc_content); 82 81 Option.iter ~f:add_dynamic_cmis dynamic_cmis; 83 82 Protocol.Added_cmis 84 84 - 83 83 + 85 84 let config = 86 85 let initial = Mconfig.initial in 87 86 { initial with