+5 -4

src/app/app.ml src/example/app.ml

reviewed

··· 7 7 8 8 let init ?doc ?(exts = [||]) () = 9 9 let open Editor in 10 10 + let extensions = 11 11 + Array.append [| basic_setup; Merlin_codemirror.ocaml |] exts 12 12 + in 10 13 let config = 11 11 - State.Config.create ?doc 12 12 - ~extensions:(Array.concat [ [| basic_setup |]; exts ]) 13 13 - () 14 14 + State.Config.create ?doc ~extensions () 14 15 in 15 16 let state = State.create ~config () in 16 17 let opts = View.opts ··· 20 21 let view : View.t = View.create ~opts () in 21 22 (state, view) 22 23 23 23 - let _editor = init ~exts:(Merlin.all_extensions) () 24 24 + let _editor = init ~exts:Merlin.all_extensions ()

+1 -1

src/app/dune src/example/dune

reviewed

··· 10 10 11 11 (copy_files 12 12 (mode promote) 13 13 - (files ../worker/merlin_worker.bc.js)) 13 13 + (files worker/merlin_worker.bc.js)) 14 14 15 15 (alias 16 16 (name all-js)

src/app/index.html src/example/index.html

reviewed

+9

src/example/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 + (modules merlin_worker) 7 7 + (promote (until-clean)) 8 8 + (modes js) 9 9 + (libraries worker))

+1

src/example/worker/merlin_worker.ml

reviewed

··· 1 1 + let () = Worker.run ()