Commit c67212a
committed
[merlin] update upstream
Signed-off-by: Rudi Grinberg <[email protected]>1 parent 9442973 commit c67212a
1 file changed
+1
-1
lines changed- CHANGES.md+2
- src/analysis/type_enclosing.ml+1
- src/analysis/typedtrie.ml+5
- src/frontend/query_commands.ml+17-6
- src/kernel/mconfig.ml+1-1
- src/ocaml/merlin_specific/browse_raw.ml+9-1
- src/ocaml/merlin_specific/browse_raw.mli+5-1
- src/ocaml/merlin_specific/typer_raw.ml+1
- src/ocaml/parsing/ast_helper.ml+1
- src/ocaml/parsing/ast_helper.mli+1
- src/ocaml/parsing/ast_iterator.ml+1
- src/ocaml/parsing/ast_mapper.ml+1
- src/ocaml/parsing/parsetree.mli+2
- src/ocaml/parsing/pprintast.ml+2
- src/ocaml/parsing/printast.ml+2
- src/ocaml/preprocess/parser_raw.ml+2.7k-2.7k
- src/ocaml/preprocess/parser_raw.mly+5-2
- src/ocaml/preprocess/parser_recover.ml+1.7k-1.7k
- src/ocaml/typing/btype.ml+1
- src/ocaml/typing/ctype.ml+2-1
- src/ocaml/typing/env.ml+4-2
- src/ocaml/typing/includemod.ml+2
- src/ocaml/typing/mtype.ml+5-1
- src/ocaml/typing/oprint.ml+1
- src/ocaml/typing/outcometree.mli+1
- src/ocaml/typing/printtyp.ml+1
- src/ocaml/typing/printtyped.ml+1
- src/ocaml/typing/rec_check.ml+1
- src/ocaml/typing/subst.ml+1
- src/ocaml/typing/tast_iterator.ml+1-1
- src/ocaml/typing/tast_mapper.ml+1
- src/ocaml/typing/typecore.ml+3-2
- src/ocaml/typing/typedtree.ml+1
- src/ocaml/typing/typedtree.mli+1
- src/ocaml/typing/typemod.ml+12-1
- src/ocaml/typing/types.ml+1
- src/ocaml/typing/types.mli+1
- src/ocaml/typing/untypeast.ml+1
- tests/test-dirs/config/check/dune+4
- tests/test-dirs/config/dot-merlin-reader/dune+4
- tests/test-dirs/config/dune+4
- tests/test-dirs/config/flags/dune+4
- tests/test-dirs/construct/holes.t+12
- tests/test-dirs/dune+5
- tests/test-dirs/locate/ambiguity/dune+4
- tests/test-dirs/locate/context-detection/dune+4
- tests/test-dirs/locate/dune+5
- tests/test-dirs/locate/functors/dune+5
- tests/test-dirs/locate/local-definitions/dune+4
- tests/test-dirs/locate/non-local/dune+4
- tests/test-dirs/locate/reconstruct-identifier/dune+4
- tests/test-dirs/locate/with-holes.t/run.t+29
- tests/test-dirs/pp/dune+4
- tests/test-dirs/recovery.t+60-2
- tests/test-dirs/type-enclosing/hole.t+159
- tests/test-dirs/type-enclosing/issueLSP444.t+45
0 commit comments