+14

src/worker/bin/dune

reviewed

··· 1 1 + (env 2 2 + (_ (js_of_ocaml (compilation_mode whole_program)))) 3 3 + 4 4 + (executable 5 5 + (name merlin_worker) 6 6 + (modules merlin_worker) 7 7 + (promote (until-clean)) 8 8 + (modes js) 9 9 + (libraries worker)) 10 10 + 11 11 + ; (install 12 12 + ; (files merlin_worker.bc.js) 13 13 + ; (section share) 14 14 + ; (package merlin-js))

src/worker/bin/merlin_worker.ml

reviewed

This is a binary file and will not be displayed.

-32

src/worker/dune

reviewed

··· 1 1 - (env 2 2 - (_ (js_of_ocaml (compilation_mode whole_program)))) 3 3 - 4 4 - (executable 5 5 - (name merlin_worker) 6 6 - (promote (until-clean)) 7 7 - (modes js) 8 8 - (js_of_ocaml 9 9 - (javascript_files stubs.js)) 10 10 - (libraries 11 11 - static_files 12 12 - protocol 13 13 - merlin-lib.kernel 14 14 - merlin-lib.utils 15 15 - merlin-lib.query_protocol 16 16 - merlin-lib.query_commands 17 17 - merlin-lib.ocaml_parsing 18 18 - 19 19 - brr 20 20 - js_of_ocaml)) 21 21 - 22 22 - ; (rule 23 23 - ; (deps 24 24 - ; merlin_worker.bc.js 25 25 - ; client/merlin_client.bc.js 26 26 - ; index.jsx 27 27 - ; package.json 28 28 - ; yarn.lock 29 29 - ; (source_tree node_modules)) 30 30 - ; (targets index.js) 31 31 - ; (mode (promote (until-clean))) 32 32 - ; (action (run yarn build)))

+15

src/worker/lib/dune

reviewed

··· 1 1 + (library 2 2 + (name worker) 3 3 + (public_name merlin-js.worker) 4 4 + (js_of_ocaml 5 5 + (javascript_files stubs.js)) 6 6 + (libraries 7 7 + static_files 8 8 + protocol 9 9 + merlin-lib.kernel 10 10 + merlin-lib.utils 11 11 + merlin-lib.query_protocol 12 12 + merlin-lib.query_commands 13 13 + merlin-lib.ocaml_parsing 14 14 + brr 15 15 + js_of_ocaml))

+201

src/worker/lib/worker.ml

reviewed

··· 1 1 + open Merlin_utils 2 2 + open Brr 3 3 + open Std 4 4 + open Merlin_kernel 5 5 + module Location = Ocaml_parsing.Location 6 6 + 7 7 + module Make () : sig end = struct 8 8 + 9 9 + (* Load the CMIs into the pseudo file-system *) 10 10 + (* This add roughly 3mo to the final script. These could be loaded dynamically 11 11 + after the worker *) 12 12 + let () = List.iter ~f:(fun (path, content) -> 13 13 + let name = Filename.(concat "/static/stdlib" (basename path)) in 14 14 + Js_of_ocaml.Sys_js.create_file ~name ~content 15 15 + ) Static_files.stdlib_cmis 16 16 + 17 17 + let config = 18 18 + let initial = Mconfig.initial in 19 19 + { initial with 20 20 + merlin = { initial.merlin with 21 21 + stdlib = Some "/static/stdlib" }} 22 22 + 23 23 + let make_pipeline source = 24 24 + Mpipeline.make config source 25 25 + 26 26 + let dispatch source query = 27 27 + let pipeline = make_pipeline source in 28 28 + Mpipeline.with_pipeline pipeline @@ fun () -> ( 29 29 + Query_commands.dispatch pipeline query 30 30 + ) 31 31 + 32 32 + 33 33 + module Completion = struct 34 34 + (* Prefixing code from ocaml-lsp-server *) 35 35 + let rfindi = 36 36 + let rec loop s ~f i = 37 37 + if i < 0 then 38 38 + None 39 39 + else if f (String.unsafe_get s i) then 40 40 + Some i 41 41 + else 42 42 + loop s ~f (i - 1) 43 43 + in 44 44 + fun ?from s ~f -> 45 45 + let from = 46 46 + let len = String.length s in 47 47 + match from with 48 48 + | None -> len - 1 49 49 + | Some i -> 50 50 + if i > len - 1 then 51 51 + raise @@ Invalid_argument "rfindi: invalid from" 52 52 + else 53 53 + i 54 54 + in 55 55 + loop s ~f from 56 56 + let lsplit2 s ~on = 57 57 + match String.index_opt s on with 58 58 + | None -> None 59 59 + | Some i -> 60 60 + let open String in 61 61 + Some (sub s ~pos:0 ~len:i, sub s ~pos:(i + 1) ~len:(length s - i - 1)) 62 62 + 63 63 + (** @see <https://ocaml.org/manual/lex.html> reference *) 64 64 + let prefix_of_position ?(short_path = false) source position = 65 65 + match Msource.text source with 66 66 + | "" -> "" 67 67 + | text -> 68 68 + let from = 69 69 + let (`Offset index) = Msource.get_offset source position in 70 70 + min (String.length text - 1) (index - 1) 71 71 + in 72 72 + let pos = 73 73 + let should_terminate = ref false in 74 74 + let has_seen_dot = ref false in 75 75 + let is_prefix_char c = 76 76 + if !should_terminate then 77 77 + false 78 78 + else 79 79 + match c with 80 80 + | 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '\'' | '_' 81 81 + (* Infix function characters *) 82 82 + | '$' | '&' | '*' | '+' | '-' | '/' | '=' | '>' 83 83 + | '@' | '^' | '!' | '?' | '%' | '<' | ':' | '~' | '#' -> 84 84 + true 85 85 + | '`' -> 86 86 + if !has_seen_dot then 87 87 + false 88 88 + else ( 89 89 + should_terminate := true; 90 90 + true 91 91 + ) | '.' -> 92 92 + has_seen_dot := true; 93 93 + not short_path 94 94 + | _ -> false 95 95 + in 96 96 + rfindi text ~from ~f:(fun c -> not (is_prefix_char c)) 97 97 + in 98 98 + let pos = 99 99 + match pos with 100 100 + | None -> 0 101 101 + | Some pos -> pos + 1 102 102 + in 103 103 + let len = from - pos + 1 in 104 104 + let reconstructed_prefix = String.sub text ~pos ~len in 105 105 + (* if we reconstructed [~f:ignore] or [?f:ignore], we should take only 106 106 + [ignore], so: *) 107 107 + if 108 108 + String.is_prefixed ~by:"~" reconstructed_prefix 109 109 + || String.is_prefixed ~by:"?" reconstructed_prefix 110 110 + then 111 111 + match lsplit2 reconstructed_prefix ~on:':' with 112 112 + | Some (_, s) -> s 113 113 + | None -> reconstructed_prefix 114 114 + else 115 115 + reconstructed_prefix 116 116 + 117 117 + 118 118 + let at_pos source position = 119 119 + let prefix = prefix_of_position source position in 120 120 + let `Offset to_ = Msource.get_offset source position in 121 121 + let from = 122 122 + to_ - String.length (prefix_of_position ~short_path:true source position) 123 123 + in 124 124 + 125 125 + Console.(log ["Prefix:";prefix]); 126 126 + if prefix = "" then 127 127 + None 128 128 + else 129 129 + let query = Query_protocol.Complete_prefix (prefix, position, [], true, true) 130 130 + in 131 131 + Some (from, to_, dispatch source query) 132 132 + end 133 133 + (* 134 134 + let dump () = 135 135 + let query = Query_protocol.Dump [`String "paths"] in 136 136 + dispatch (Msource.make "") query *) 137 137 + 138 138 + (* let dump_config () = 139 139 + let pipeline = make_pipeline (Msource.make "") in 140 140 + Mpipeline.with_pipeline pipeline @@ fun () -> 141 141 + Mconfig.dump (Mpipeline.final_config pipeline) 142 142 + |> Json.pretty_to_string *) 143 143 + 144 144 + let on_message e = 145 145 + let marshaled_message = Brr_io.Message.Ev.data e in 146 146 + let action : Protocol.action = 147 147 + Marshal.from_bytes marshaled_message 0 148 148 + in 149 149 + Console.(log ["w: Received message:"; action]); 150 150 + let res = 151 151 + match action with 152 152 + | Complete_prefix (source, position) -> 153 153 + let source = Msource.make source in 154 154 + begin match Completion.at_pos source position with 155 155 + | Some (from, to_, compl) -> 156 156 + let entries = compl.entries in 157 157 + Protocol.Completions { from; to_; entries; } 158 158 + | None -> 159 159 + Protocol.Completions { from = 0; to_ = 0; entries = []; } 160 160 + end 161 161 + | Type_enclosing (source, position) -> 162 162 + let source = Msource.make source in 163 163 + let query = Query_protocol.Type_enclosing (None, position, None) in 164 164 + Protocol.Typed_enclosings (dispatch source query) 165 165 + | Protocol.All_errors source -> 166 166 + Console.(log ["w: Query errors"]); 167 167 + let source = Msource.make source in 168 168 + let query = Query_protocol.Errors { 169 169 + lexing = true; 170 170 + parsing = true; 171 171 + typing = true; 172 172 + } 173 173 + in 174 174 + let errors = 175 175 + dispatch source query 176 176 + |> List.map ~f:(fun (Location.{kind; main=_ ; sub; source} as error) -> 177 177 + let of_sub sub = 178 178 + Location.print_sub_msg Format.str_formatter sub; 179 179 + String.trim (Format.flush_str_formatter ()) 180 180 + in 181 181 + let loc = Location.loc_of_report error in 182 182 + let main = 183 183 + Format.asprintf "@[%a@]" Location.print_main error |> String.trim 184 184 + in 185 185 + Protocol.{ 186 186 + kind; 187 187 + loc; 188 188 + main; 189 189 + sub = List.map ~f:of_sub sub; 190 190 + source; 191 191 + }) 192 192 + in 193 193 + Protocol.Errors errors 194 194 + in 195 195 + let res = Marshal.to_bytes res [] in 196 196 + Brr_webworkers.Worker.G.post res 197 197 + 198 198 + let () = Jv.(set global "onmessage" @@ Jv.repr on_message) 199 199 + 200 200 + (* let () = Console.(log [dump (); dump_config ()]) *) 201 201 + end

+1

src/worker/static/dune src/worker/lib/static/dune

reviewed

··· 2 2 3 3 (library 4 4 (name static_files) 5 5 + (public_name merlin-js.worker.static) 5 6 (modules static_files) 6 7 (preprocess (pps ppx_blob)) 7 8 (preprocessor_deps

src/worker/static/gen_static.ml src/worker/lib/static/gen_static.ml

reviewed

src/worker/static/stdlib/bigarray.cmi src/worker/lib/static/stdlib/bigarray.cmi

reviewed

src/worker/static/stdlib/camlinternalAtomic.cmi src/worker/lib/static/stdlib/camlinternalAtomic.cmi

reviewed

src/worker/static/stdlib/camlinternalFormat.cmi src/worker/lib/static/stdlib/camlinternalFormat.cmi

reviewed

src/worker/static/stdlib/camlinternalFormatBasics.cmi src/worker/lib/static/stdlib/camlinternalFormatBasics.cmi

reviewed

src/worker/static/stdlib/camlinternalLazy.cmi src/worker/lib/static/stdlib/camlinternalLazy.cmi

reviewed

src/worker/static/stdlib/camlinternalMod.cmi src/worker/lib/static/stdlib/camlinternalMod.cmi

reviewed

src/worker/static/stdlib/camlinternalOO.cmi src/worker/lib/static/stdlib/camlinternalOO.cmi

reviewed

src/worker/static/stdlib/dynlink.cmi src/worker/lib/static/stdlib/dynlink.cmi

reviewed

src/worker/static/stdlib/profiling.cmi src/worker/lib/static/stdlib/profiling.cmi

reviewed

src/worker/static/stdlib/std_exit.cmi src/worker/lib/static/stdlib/std_exit.cmi

reviewed

src/worker/static/stdlib/stdlib.cmi src/worker/lib/static/stdlib/stdlib.cmi

reviewed

src/worker/static/stdlib/stdlib__Arg.cmi src/worker/lib/static/stdlib/stdlib__Arg.cmi

reviewed

src/worker/static/stdlib/stdlib__Array.cmi src/worker/lib/static/stdlib/stdlib__Array.cmi

reviewed

src/worker/static/stdlib/stdlib__ArrayLabels.cmi src/worker/lib/static/stdlib/stdlib__ArrayLabels.cmi

reviewed

src/worker/static/stdlib/stdlib__Atomic.cmi src/worker/lib/static/stdlib/stdlib__Atomic.cmi

reviewed

src/worker/static/stdlib/stdlib__Bigarray.cmi src/worker/lib/static/stdlib/stdlib__Bigarray.cmi

reviewed

src/worker/static/stdlib/stdlib__Bool.cmi src/worker/lib/static/stdlib/stdlib__Bool.cmi

reviewed

src/worker/static/stdlib/stdlib__Buffer.cmi src/worker/lib/static/stdlib/stdlib__Buffer.cmi

reviewed

src/worker/static/stdlib/stdlib__Bytes.cmi src/worker/lib/static/stdlib/stdlib__Bytes.cmi

reviewed

src/worker/static/stdlib/stdlib__BytesLabels.cmi src/worker/lib/static/stdlib/stdlib__BytesLabels.cmi

reviewed

src/worker/static/stdlib/stdlib__Callback.cmi src/worker/lib/static/stdlib/stdlib__Callback.cmi

reviewed

src/worker/static/stdlib/stdlib__Char.cmi src/worker/lib/static/stdlib/stdlib__Char.cmi

reviewed

src/worker/static/stdlib/stdlib__Complex.cmi src/worker/lib/static/stdlib/stdlib__Complex.cmi

reviewed

src/worker/static/stdlib/stdlib__Digest.cmi src/worker/lib/static/stdlib/stdlib__Digest.cmi

reviewed

src/worker/static/stdlib/stdlib__Either.cmi src/worker/lib/static/stdlib/stdlib__Either.cmi

reviewed

src/worker/static/stdlib/stdlib__Ephemeron.cmi src/worker/lib/static/stdlib/stdlib__Ephemeron.cmi

reviewed

src/worker/static/stdlib/stdlib__Filename.cmi src/worker/lib/static/stdlib/stdlib__Filename.cmi

reviewed

src/worker/static/stdlib/stdlib__Float.cmi src/worker/lib/static/stdlib/stdlib__Float.cmi

reviewed

src/worker/static/stdlib/stdlib__Format.cmi src/worker/lib/static/stdlib/stdlib__Format.cmi

reviewed

src/worker/static/stdlib/stdlib__Fun.cmi src/worker/lib/static/stdlib/stdlib__Fun.cmi

reviewed

src/worker/static/stdlib/stdlib__Gc.cmi src/worker/lib/static/stdlib/stdlib__Gc.cmi

reviewed

src/worker/static/stdlib/stdlib__Genlex.cmi src/worker/lib/static/stdlib/stdlib__Genlex.cmi

reviewed

src/worker/static/stdlib/stdlib__Hashtbl.cmi src/worker/lib/static/stdlib/stdlib__Hashtbl.cmi

reviewed

src/worker/static/stdlib/stdlib__In_channel.cmi src/worker/lib/static/stdlib/stdlib__In_channel.cmi

reviewed

src/worker/static/stdlib/stdlib__Int.cmi src/worker/lib/static/stdlib/stdlib__Int.cmi

reviewed

src/worker/static/stdlib/stdlib__Int32.cmi src/worker/lib/static/stdlib/stdlib__Int32.cmi

reviewed

src/worker/static/stdlib/stdlib__Int64.cmi src/worker/lib/static/stdlib/stdlib__Int64.cmi

reviewed

src/worker/static/stdlib/stdlib__Lazy.cmi src/worker/lib/static/stdlib/stdlib__Lazy.cmi

reviewed

src/worker/static/stdlib/stdlib__Lexing.cmi src/worker/lib/static/stdlib/stdlib__Lexing.cmi

reviewed

src/worker/static/stdlib/stdlib__List.cmi src/worker/lib/static/stdlib/stdlib__List.cmi

reviewed

src/worker/static/stdlib/stdlib__ListLabels.cmi src/worker/lib/static/stdlib/stdlib__ListLabels.cmi

reviewed

src/worker/static/stdlib/stdlib__Map.cmi src/worker/lib/static/stdlib/stdlib__Map.cmi

reviewed

src/worker/static/stdlib/stdlib__Marshal.cmi src/worker/lib/static/stdlib/stdlib__Marshal.cmi

reviewed

src/worker/static/stdlib/stdlib__MoreLabels.cmi src/worker/lib/static/stdlib/stdlib__MoreLabels.cmi

reviewed

src/worker/static/stdlib/stdlib__Nativeint.cmi src/worker/lib/static/stdlib/stdlib__Nativeint.cmi

reviewed

src/worker/static/stdlib/stdlib__Obj.cmi src/worker/lib/static/stdlib/stdlib__Obj.cmi

reviewed

src/worker/static/stdlib/stdlib__Oo.cmi src/worker/lib/static/stdlib/stdlib__Oo.cmi

reviewed

src/worker/static/stdlib/stdlib__Option.cmi src/worker/lib/static/stdlib/stdlib__Option.cmi

reviewed

src/worker/static/stdlib/stdlib__Out_channel.cmi src/worker/lib/static/stdlib/stdlib__Out_channel.cmi

reviewed

src/worker/static/stdlib/stdlib__Parsing.cmi src/worker/lib/static/stdlib/stdlib__Parsing.cmi

reviewed

src/worker/static/stdlib/stdlib__Pervasives.cmi src/worker/lib/static/stdlib/stdlib__Pervasives.cmi

reviewed

src/worker/static/stdlib/stdlib__Printexc.cmi src/worker/lib/static/stdlib/stdlib__Printexc.cmi

reviewed

src/worker/static/stdlib/stdlib__Printf.cmi src/worker/lib/static/stdlib/stdlib__Printf.cmi

reviewed

src/worker/static/stdlib/stdlib__Queue.cmi src/worker/lib/static/stdlib/stdlib__Queue.cmi

reviewed

src/worker/static/stdlib/stdlib__Random.cmi src/worker/lib/static/stdlib/stdlib__Random.cmi

reviewed

src/worker/static/stdlib/stdlib__Result.cmi src/worker/lib/static/stdlib/stdlib__Result.cmi

reviewed

src/worker/static/stdlib/stdlib__Scanf.cmi src/worker/lib/static/stdlib/stdlib__Scanf.cmi

reviewed

src/worker/static/stdlib/stdlib__Seq.cmi src/worker/lib/static/stdlib/stdlib__Seq.cmi

reviewed

src/worker/static/stdlib/stdlib__Set.cmi src/worker/lib/static/stdlib/stdlib__Set.cmi

reviewed

src/worker/static/stdlib/stdlib__Stack.cmi src/worker/lib/static/stdlib/stdlib__Stack.cmi

reviewed

src/worker/static/stdlib/stdlib__StdLabels.cmi src/worker/lib/static/stdlib/stdlib__StdLabels.cmi

reviewed

src/worker/static/stdlib/stdlib__Stream.cmi src/worker/lib/static/stdlib/stdlib__Stream.cmi

reviewed

src/worker/static/stdlib/stdlib__String.cmi src/worker/lib/static/stdlib/stdlib__String.cmi

reviewed

src/worker/static/stdlib/stdlib__StringLabels.cmi src/worker/lib/static/stdlib/stdlib__StringLabels.cmi

reviewed

src/worker/static/stdlib/stdlib__Sys.cmi src/worker/lib/static/stdlib/stdlib__Sys.cmi

reviewed

src/worker/static/stdlib/stdlib__Uchar.cmi src/worker/lib/static/stdlib/stdlib__Uchar.cmi

reviewed

src/worker/static/stdlib/stdlib__Unit.cmi src/worker/lib/static/stdlib/stdlib__Unit.cmi

reviewed

src/worker/static/stdlib/stdlib__Weak.cmi src/worker/lib/static/stdlib/stdlib__Weak.cmi

reviewed

src/worker/static/stdlib/str.cmi src/worker/lib/static/stdlib/str.cmi

reviewed

src/worker/static/stdlib/topdirs.cmi src/worker/lib/static/stdlib/topdirs.cmi

reviewed

src/worker/static/stdlib/unix.cmi src/worker/lib/static/stdlib/unix.cmi

reviewed

src/worker/static/stdlib/unixLabels.cmi src/worker/lib/static/stdlib/unixLabels.cmi

reviewed

src/worker/stubs.js src/worker/lib/stubs.js

reviewed