test: promote positive changes to the test suite

voodoos · voodoos · commit a1ffdc028a35 · 2022-12-01T18:10:10.000+01:00
diff --git a/tests/test-dirs/locate-type.t/run.t b/tests/test-dirs/locate-type.t/run.t
@@ -7,7 +7,7 @@
       "file": "$TESTCASE_ROOT/a.ml",
       "pos": {
         "line": 2,
-        "col": 2
+        "col": 7
       }
     },
     "notifications": []
@@ -20,7 +20,7 @@
       "file": "$TESTCASE_ROOT/a.ml",
       "pos": {
         "line": 2,
-        "col": 2
+        "col": 7
       }
     },
     "notifications": []
diff --git a/tests/test-dirs/locate/context-detection/cd-field.t/run.t b/tests/test-dirs/locate/context-detection/cd-field.t/run.t
@@ -6,7 +6,7 @@
       "file": "$TESTCASE_ROOT/field.ml",
       "pos": {
         "line": 1,
-        "col": 0
+        "col": 5
       }
     },
     "notifications": []
@@ -19,7 +19,7 @@
       "file": "$TESTCASE_ROOT/field.ml",
       "pos": {
         "line": 1,
-        "col": 0
+        "col": 5
       }
     },
     "notifications": []
@@ -34,7 +34,7 @@ the field bar rather than the identifier.
       "file": "$TESTCASE_ROOT/field.ml",
       "pos": {
         "line": 10,
-        "col": 2
+        "col": 7
       }
     },
     "notifications": []
diff --git a/tests/test-dirs/locate/context-detection/cd-label.t/run.t b/tests/test-dirs/locate/context-detection/cd-label.t/run.t
@@ -42,14 +42,14 @@
   }
 
 FIXME: this is not a very satisfying answer. 
-We could expect 2:12 or at least 2:4
+We could expect 2:12
   $ $MERLIN single locate  -look-for ml -position 3:24 \
   > -filename ./record.ml < ./record.ml | jq '.value'
   {
     "file": "$TESTCASE_ROOT/record.ml",
     "pos": {
       "line": 1,
-      "col": 0
+      "col": 5
     }
   }
 
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
@@ -13,6 +13,8 @@ Trying them all:
     "notifications": []
   }
 
+FIXME we would expect 3:13
+
   $ $MERLIN single locate -look-for ml -position 7:17 -filename ./test.ml < ./test.ml
   {
     "class": "return",
@@ -54,14 +56,16 @@ FIXME this should say "Already at definition point" (we're defining the label):
     "notifications": []
   }
 
+We expect 1:5
+
   $ $MERLIN single locate -look-for ml -position 13:16 -filename ./test.ml < ./test.ml
   {
     "class": "return",
     "value": {
       "file": "$TESTCASE_ROOT/test.ml",
       "pos": {
         "line": 1,
-        "col": 0
+        "col": 5
       }
     },
     "notifications": []
@@ -89,14 +93,16 @@ FIXME we failed to parse/reconstruct the ident, that's interesting
     "notifications": []
   }
 
+We expect 1:5
+
   $ $MERLIN single locate -look-for ml -position 16:20 -filename ./test.ml < ./test.ml
   {
     "class": "return",
     "value": {
       "file": "$TESTCASE_ROOT/test.ml",
       "pos": {
         "line": 1,
-        "col": 0
+        "col": 5
       }
     },
     "notifications": []
@@ -115,6 +121,8 @@ FIXME we failed to parse/reconstruct the ident, that's interesting
     "notifications": []
   }
 
+FIXME unprecise, we expect 11:11
+
   $ $MERLIN single locate -look-for ml -position 18:15 -filename ./test.ml < ./test.ml
   {
     "class": "return",
@@ -144,14 +152,16 @@ FIXME this should jump to line 11:
     "notifications": []
   }
 
+FIXME unprecise, we want 13:12
+
   $ $MERLIN single locate -look-for ml -position 23:13 -filename ./test.ml < ./test.ml
   {
     "class": "return",
     "value": {
       "file": "$TESTCASE_ROOT/test.ml",
       "pos": {
         "line": 13,
-        "col": 0
+        "col": 5
       }
     },
     "notifications": []
@@ -177,7 +187,7 @@ FIXME this should jump to line 11:
       "file": "$TESTCASE_ROOT/test.ml",
       "pos": {
         "line": 13,
-        "col": 0
+        "col": 5
       }
     },
     "notifications": []
diff --git a/tests/test-dirs/locate/functors/f-all_local.t/run.t b/tests/test-dirs/locate/functors/f-all_local.t/run.t
@@ -7,7 +7,7 @@ Check that we can jump locally inside the functor:
       "file": "$TESTCASE_ROOT/all_local.ml",
       "pos": {
         "line": 12,
-        "col": 2
+        "col": 7
       }
     },
     "notifications": []
@@ -53,7 +53,7 @@ Check the argument is substituted for the parameter
       "file": "$TESTCASE_ROOT/all_local.ml",
       "pos": {
         "line": 6,
-        "col": 2
+        "col": 7
       }
     },
     "notifications": []
diff --git a/tests/test-dirs/locate/functors/f-from_application.t/run.t b/tests/test-dirs/locate/functors/f-from_application.t/run.t
@@ -23,7 +23,7 @@ Jump from inside the functor application to inside the functor application:
       "file": "$TESTCASE_ROOT/from_application.ml",
       "pos": {
         "line": 14,
-        "col": 4
+        "col": 9
       }
     },
     "notifications": []
@@ -38,7 +38,7 @@ Jump from inside the functor application to the outer scope:
       "file": "$TESTCASE_ROOT/from_application.ml",
       "pos": {
         "line": 9,
-        "col": 0
+        "col": 5
       }
     },
     "notifications": []
diff --git a/tests/test-dirs/locate/functors/f-nested_applications.t/run.t b/tests/test-dirs/locate/functors/f-nested_applications.t/run.t
@@ -7,7 +7,7 @@
       "file": "$TESTCASE_ROOT/nested_applications.ml",
       "pos": {
         "line": 10,
-        "col": 2
+        "col": 7
       }
     },
     "notifications": []
@@ -21,7 +21,7 @@
       "file": "$TESTCASE_ROOT/nested_applications.ml",
       "pos": {
         "line": 10,
-        "col": 2
+        "col": 7
       }
     },
     "notifications": []
@@ -35,7 +35,7 @@
       "file": "$TESTCASE_ROOT/nested_applications.ml",
       "pos": {
         "line": 10,
-        "col": 2
+        "col": 7
       }
     },
     "notifications": []
@@ -49,7 +49,7 @@
       "file": "$TESTCASE_ROOT/nested_applications.ml",
       "pos": {
         "line": 10,
-        "col": 2
+        "col": 7
       }
     },
     "notifications": []
@@ -63,7 +63,7 @@
       "file": "$TESTCASE_ROOT/nested_applications.ml",
       "pos": {
         "line": 10,
-        "col": 2
+        "col": 7
       }
     },
     "notifications": []
diff --git a/tests/test-dirs/locate/locate-constrs.t b/tests/test-dirs/locate/locate-constrs.t
@@ -18,15 +18,14 @@ We expect 1:27
     }
   }
 
-FIXME: this is not a very satisfying answer. 
-We expect 1:18
+We expect 1:23
   $ $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": 18
+      "col": 23
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -42,14 +42,14 @@`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`FIXME: this is not a very satisfying answer.`
`45`		`-We could expect 2:12 or at least 2:4`
	`45`	`+We could expect 2:12`
`46`	`46`	`$ $MERLIN single locate -look-for ml -position 3:24 \`
`47`	`47`	`> -filename ./record.ml < ./record.ml \| jq '.value'`
`48`	`48`	`{`
`49`	`49`	`"file": "$TESTCASE_ROOT/record.ml",`
`50`	`50`	`"pos": {`
`51`	`51`	`"line": 1,`
`52`		`- "col": 0`
	`52`	`+ "col": 5`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@ Trying them all:`
`13`	`13`	`"notifications": []`
`14`	`14`	`}`
`15`	`15`
	`16`	`+FIXME we would expect 3:13`
	`17`	`+`
`16`	`18`	`$ $MERLIN single locate -look-for ml -position 7:17 -filename ./test.ml < ./test.ml`
`17`	`19`	`{`
`18`	`20`	`"class": "return",`
`@@ -54,14 +56,16 @@ FIXME this should say "Already at definition point" (we're defining the label):`
`54`	`56`	`"notifications": []`
`55`	`57`	`}`
`56`	`58`
	`59`	`+We expect 1:5`
	`60`	`+`
`57`	`61`	`$ $MERLIN single locate -look-for ml -position 13:16 -filename ./test.ml < ./test.ml`
`58`	`62`	`{`
`59`	`63`	`"class": "return",`
`60`	`64`	`"value": {`
`61`	`65`	`"file": "$TESTCASE_ROOT/test.ml",`
`62`	`66`	`"pos": {`
`63`	`67`	`"line": 1,`
`64`		`- "col": 0`
	`68`	`+ "col": 5`
`65`	`69`	`}`
`66`	`70`	`},`
`67`	`71`	`"notifications": []`
`@@ -89,14 +93,16 @@ FIXME we failed to parse/reconstruct the ident, that's interesting`
`89`	`93`	`"notifications": []`
`90`	`94`	`}`
`91`	`95`
	`96`	`+We expect 1:5`
	`97`	`+`
`92`	`98`	`$ $MERLIN single locate -look-for ml -position 16:20 -filename ./test.ml < ./test.ml`
`93`	`99`	`{`
`94`	`100`	`"class": "return",`
`95`	`101`	`"value": {`
`96`	`102`	`"file": "$TESTCASE_ROOT/test.ml",`
`97`	`103`	`"pos": {`
`98`	`104`	`"line": 1,`
`99`		`- "col": 0`
	`105`	`+ "col": 5`
`100`	`106`	`}`
`101`	`107`	`},`
`102`	`108`	`"notifications": []`
`@@ -115,6 +121,8 @@ FIXME we failed to parse/reconstruct the ident, that's interesting`
`115`	`121`	`"notifications": []`
`116`	`122`	`}`
`117`	`123`
	`124`	`+FIXME unprecise, we expect 11:11`
	`125`	`+`
`118`	`126`	`$ $MERLIN single locate -look-for ml -position 18:15 -filename ./test.ml < ./test.ml`
`119`	`127`	`{`
`120`	`128`	`"class": "return",`
`@@ -144,14 +152,16 @@ FIXME this should jump to line 11:`
`144`	`152`	`"notifications": []`
`145`	`153`	`}`
`146`	`154`
	`155`	`+FIXME unprecise, we want 13:12`
	`156`	`+`
`147`	`157`	`$ $MERLIN single locate -look-for ml -position 23:13 -filename ./test.ml < ./test.ml`
`148`	`158`	`{`
`149`	`159`	`"class": "return",`
`150`	`160`	`"value": {`
`151`	`161`	`"file": "$TESTCASE_ROOT/test.ml",`
`152`	`162`	`"pos": {`
`153`	`163`	`"line": 13,`
`154`		`- "col": 0`
	`164`	`+ "col": 5`
`155`	`165`	`}`
`156`	`166`	`},`
`157`	`167`	`"notifications": []`
`@@ -177,7 +187,7 @@ FIXME this should jump to line 11:`
`177`	`187`	`"file": "$TESTCASE_ROOT/test.ml",`
`178`	`188`	`"pos": {`
`179`	`189`	`"line": 13,`
`180`		`- "col": 0`
	`190`	`+ "col": 5`
`181`	`191`	`}`
`182`	`192`	`},`
`183`	`193`	`"notifications": []`
Original file line number	Diff line number	Diff line change
`@@ -18,15 +18,14 @@ We expect 1:27`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`
`21`		`-FIXME: this is not a very satisfying answer.`
`22`		`-We expect 1:18`
	`21`	`+We expect 1:23`
`23`	`22`	`$ $MERLIN single locate -look-for ml -position 2:12 \`
`24`	`23`	`> -filename ./constr.ml < ./constr.ml \| jq '.value'`
`25`	`24`	`{`
`26`	`25`	`"file": "$TESTCASE_ROOT/constr.ml",`
`27`	`26`	`"pos": {`
`28`	`27`	`"line": 1,`
`29`		`- "col": 18`
	`28`	`+ "col": 23`
`30`	`29`	`}`
`31`	`30`	`}`
`32`	`31`