diff --git a/tests/test-dirs/document/issue1513.t b/tests/test-dirs/document/issue1513.t index b9e18604f9..1a3e2e7744 100644 --- a/tests/test-dirs/document/issue1513.t +++ b/tests/test-dirs/document/issue1513.t @@ -21,7 +21,7 @@ FIXME: We should not rely on "fallbacking". This requires a compiler change. > -log-file - -log-section locate \ > -filename main.ml &1 | > grep "Uid not found in the cmt table" - Uid not found in the cmt table. Fallbacking to the node's location: File "naux.ml", line 2, characters 2-5 + Uid not found in the cmt table. Fallbacking to the node's location: File "naux.ml", line 2, characters 2-3 FIXME: expected "B Comment" $ $MERLIN single document -position 2:13 \ diff --git a/tests/test-dirs/locate/context-detection/cd-test.t/run.t b/tests/test-dirs/locate/context-detection/cd-test.t/run.t index 34e4cce900..8ac17c8d9f 100644 --- a/tests/test-dirs/locate/context-detection/cd-test.t/run.t +++ b/tests/test-dirs/locate/context-detection/cd-test.t/run.t @@ -7,7 +7,7 @@ Trying them all: "file": "$TESTCASE_ROOT/test.ml", "pos": { "line": 1, - "col": 0 + "col": 9 } }, "notifications": [] @@ -109,7 +109,7 @@ FIXME we failed to parse/reconstruct the ident, that's interesting "file": "$TESTCASE_ROOT/test.ml", "pos": { "line": 1, - "col": 0 + "col": 9 } }, "notifications": [] diff --git a/tests/test-dirs/locate/issue802.t/run.t b/tests/test-dirs/locate/issue802.t/run.t index 73505e98d8..355a215325 100644 --- a/tests/test-dirs/locate/issue802.t/run.t +++ b/tests/test-dirs/locate/issue802.t/run.t @@ -15,7 +15,7 @@ Test jumping from a normal constructor: "file": "$TESTCASE_ROOT/error.ml", "pos": { "line": 1, - "col": 0 + "col": 9 } }, "notifications": [] diff --git a/tests/test-dirs/locate/locate-constrs.t b/tests/test-dirs/locate/locate-constrs.t index 6df036bc09..b7bcf81191 100644 --- a/tests/test-dirs/locate/locate-constrs.t +++ b/tests/test-dirs/locate/locate-constrs.t @@ -3,46 +3,47 @@ **/ $ cat >constr.ml < type t = A of int | B - > let foo : t = A 42 + > module C = struct type t = A of int | B end + > let foo : C.t = C.A 42 > EOF - $ $MERLIN single locate -look-for mli -position 2:14 \ +We expect 1:27 + $ $MERLIN single locate -look-for mli -position 2:18 \ > -filename ./constr.ml < ./constr.ml | jq '.value' { "file": "$TESTCASE_ROOT/constr.ml", "pos": { "line": 1, - "col": 9 + "col": 27 } } FIXME: this is not a very satisfying answer. -We could expect 1:9 - $ $MERLIN single locate -look-for ml -position 2:14 \ +We expect 1:18 + $ $MERLIN single locate -look-for ml -position 2:12 \ > -filename ./constr.ml < ./constr.ml | jq '.value' { "file": "$TESTCASE_ROOT/constr.ml", "pos": { "line": 1, - "col": 0 + "col": 18 } } With the declaration in another compilation unit: $ cat >other_module.ml < let foo = Constr.B + > let foo = Constr.C.B > EOF $ $OCAMLC -c -bin-annot constr.ml - $ $MERLIN single locate -look-for mli -position 1:17 \ + $ $MERLIN single locate -look-for mli -position 1:19 \ > -filename ./other_module.ml < ./other_module.ml | jq '.value' { "file": "$TESTCASE_ROOT/constr.ml", "pos": { "line": 1, - "col": 18 + "col": 36 } }