diff --git a/tests/test-dirs/type-enclosing/issue1564.t b/tests/test-dirs/type-enclosing/issue1564.t index 6d30cb7c1..850fac445 100644 --- a/tests/test-dirs/type-enclosing/issue1564.t +++ b/tests/test-dirs/type-enclosing/issue1564.t @@ -20,7 +20,7 @@ On `let |y = x.kind` Verbosity 1 shows the actual type definition of Kind.t $ $MERLIN single type-enclosing -position 8:4 -verbosity 1 \ > -filename ./main.ml < ./main.ml | tr '\r\n' ' ' | jq ".value[0].type" - "type t = A | B" + "type t : immediate = A | B" On `let y = x.k|ind` $ $MERLIN single type-enclosing -position 8:11 -verbosity 0 \ @@ -40,7 +40,7 @@ On `let z = { kind = B }.k|ind` On `let z = { kind = B }.k|ind` $ $MERLIN single type-enclosing -position 9:22 -verbosity 1 \ > -filename ./main.ml < ./main.ml | tr '\r\n' ' ' | jq ".value[0].type" - "type t = A | B" + "type t : immediate = A | B" On `let x = { k|ind = A }` $ $MERLIN single type-enclosing -position 7:12 -verbosity 0 \ diff --git a/tests/test-dirs/type-enclosing/objects.t/run.t b/tests/test-dirs/type-enclosing/objects.t/run.t index a29e9d65e..6cf7e957e 100644 --- a/tests/test-dirs/type-enclosing/objects.t/run.t +++ b/tests/test-dirs/type-enclosing/objects.t/run.t @@ -27,7 +27,7 @@ "line": 2, "col": 24 }, - "type": "int list type 'a list = [] | (::) of 'a * 'a list", + "type": "int list type 'a list : value = [] | (::) of 'a * 'a list", "tail": "no" }, { @@ -85,7 +85,7 @@ "line": 14, "col": 5 }, - "type": "type unit = ()", + "type": "type unit : immediate = ()", "tail": "no" } ] @@ -143,7 +143,7 @@ "line": 14, "col": 16 }, - "type": "type unit = ()", + "type": "type unit : immediate = ()", "tail": "no" } ] diff --git a/tests/test-dirs/type-enclosing/record.t/run.t b/tests/test-dirs/type-enclosing/record.t/run.t index aee28c9d4..226aa7c3b 100644 --- a/tests/test-dirs/type-enclosing/record.t/run.t +++ b/tests/test-dirs/type-enclosing/record.t/run.t @@ -114,7 +114,7 @@ "line": 8, "col": 9 }, - "type": "type t = { mutable b : float; }", + "type": "type t : value = { mutable b : float; }", "tail": "no" }, { @@ -126,7 +126,7 @@ "line": 8, "col": 17 }, - "type": "type unit = ()", + "type": "type unit : immediate = ()", "tail": "no" } ] @@ -185,7 +185,7 @@ FIXME: The following results are not entirely satisfying (`foo.Bar -> foo` could "line": 12, "col": 26 }, - "type": "type foo = Bar of { baz : unit; }", + "type": "type foo : value = Bar of { baz : unit; }", "tail": "no" } ] @@ -243,7 +243,7 @@ FIXME: The following results are not entirely satisfying (`foo.Bar -> foo` could "line": 12, "col": 26 }, - "type": "type Bar = { baz : unit; }", + "type": "type Bar : value = { baz : unit; }", "tail": "no" } ] diff --git a/tests/test-dirs/type-enclosing/types.t/run.t b/tests/test-dirs/type-enclosing/types.t/run.t index d86ca72e2..067247c9e 100644 --- a/tests/test-dirs/type-enclosing/types.t/run.t +++ b/tests/test-dirs/type-enclosing/types.t/run.t @@ -39,7 +39,7 @@ "line": 5, "col": 11 }, - "type": "type x = Foo", + "type": "type x : immediate = Foo", "tail": "no" } ] @@ -115,7 +115,7 @@ Same result regardless of verbosity: "line": 11, "col": 19 }, - "type": "type 'a l = 'a l", + "type": "type 'a l : value = 'a l", "tail": "no" } ] diff --git a/tests/test-dirs/type-enclosing/variants.t/run.t b/tests/test-dirs/type-enclosing/variants.t/run.t index 93df6704a..c237c464e 100644 --- a/tests/test-dirs/type-enclosing/variants.t/run.t +++ b/tests/test-dirs/type-enclosing/variants.t/run.t @@ -207,7 +207,7 @@ FIXME: Not satisfying, expected core not more "line": 9, "col": 13 }, - "type": "type unit = ()", + "type": "type unit : immediate = ()", "tail": "no" } ]