Commit 6992960
committed
chore: update merlin
Signed-off-by: Rudi Grinberg <[email protected]>1 parent f3b9c72 commit 6992960
1 file changed
+1
-1
lines changed- CHANGES.md+14-2
- src/frontend/ocamlmerlin/new/new_merlin.ml+2
- src/kernel/mbrowse.ml+4-1
- src/kernel/mconfig.ml+21
- src/kernel/mconfig_dot.ml+65-17
- src/kernel/mpipeline.ml+8-6
- src/kernel/mreader.ml+17-10
- src/kernel/mreader.mli+1-1
- src/ocaml/driver/pparse.ml+20-2
- src/ocaml/driver/pparse.mli+2-1
- src/ocaml/merlin_specific/browse_raw.ml+2-2
- src/ocaml/typing/printtyped.ml+4-2
- src/ocaml/typing/tast_iterator.ml+1
- src/ocaml/typing/tast_mapper.ml+1
- src/ocaml/typing/typecore.ml+1-1
- src/ocaml/typing/typedtree.ml+2-1
- src/ocaml/typing/typedtree.mli+8-2
- src/ocaml/typing/untypeast.ml+2-1
- src/ocaml/utils/warnings.ml+7
- tests/test-dirs/alerts.t/run.t+13
- tests/test-dirs/type-enclosing/merlin-hide.t+40
0 commit comments