Promote failing tests

liam923 · liam923 · commit 4ed2f0b0dc58 · 2025-06-24T17:55:41.000-04:00
diff --git a/tests/test-dirs/function-recovery.t b/tests/test-dirs/function-recovery.t
@@ -10,7 +10,7 @@
     "value": "[
     structure_item (test.ml[1,0+0]..test.ml[3,104+28])
       Tstr_module
-      ERROR_locate_from_inside_function_literal_used_as_non_function/282
+      ERROR_locate_from_inside_function_literal_used_as_non_function/283
         module_expr (test.ml[1,0+72]..test.ml[3,104+28])
           Tmod_structure
           [
@@ -19,7 +19,7 @@
               [
                 <def>
                   pattern (test.ml[2,79+6]..test.ml[2,79+13])
-                    Tpat_var \"problem/280\"
+                    Tpat_var \"problem/281\"
                     value_mode meet(local,once,nonportable,yielding,stateful)(modevar#0[global,many,portable,unyielding,stateless .. global,many,nonportable,unyielding,stateful]);imply(unique,uncontended,read_write)(modevar#1[aliased,contended,immutable .. unique,uncontended,read_write])
                   expression (test.ml[2,79+16]..test.ml[2,79+24])
                     Texp_variant \"Problem\"
@@ -48,7 +48,7 @@
                               expression (_none_[0,0+-1]..[0,0+-1]) ghost
                                 Pexp_constant PConst_int (1,None)
                           ]
-                        Texp_ident \"*type-error*/281\"
+                        Texp_ident \"*type-error*/282\"
               ]
           ]
   ]
@@ -68,7 +68,7 @@
       [
         <def>
           pattern (type.ml[1,0+4]..type.ml[1,0+5])
-            Tpat_var \"f/280\"
+            Tpat_var \"f/281\"
             value_mode meet(local,once,nonportable,yielding,stateful)(modevar#0[global,many,portable,unyielding,stateless .. global,many,nonportable,unyielding,stateful]);imply(unique,uncontended,read_write)(modevar#1[aliased,contended,immutable .. unique,uncontended,read_write])
           expression (type.ml[1,0+8]..type.ml[1,0+61])
             extra
@@ -85,10 +85,10 @@
                       Ttyp_constr \"list/11!\"
                       [
                         core_type (type.ml[1,0+28]..type.ml[1,0+29])
-                          Ttyp_constr \"t/282\"
+                          Ttyp_constr \"t/283\"
                           []
                       ]
-                  Tpat_var \"foo/283\"
+                  Tpat_var \"foo/284\"
                   value_mode map_comonadic(local_to_regional)(modevar#4[global,many,portable,unyielding,stateless .. local,once,nonportable,yielding,stateful]);imply(unique,uncontended,read_write)(modevar#5[aliased,contended,immutable .. unique,uncontended,read_write])
             ]
             Tfunction_body
@@ -100,7 +100,7 @@
                       extra
                         Tpat_extra_constraint
                         core_type (type.ml[1,0+48]..type.ml[1,0+49])
-                          Ttyp_constr \"t/282\"
+                          Ttyp_constr \"t/283\"
                           []
                       Tpat_any
                     expression (type.ml[1,0+53]..type.ml[1,0+55])
@@ -113,7 +113,7 @@
                             expression (_none_[0,0+-1]..[0,0+-1]) ghost
                               Pexp_constant PConst_int (1,None)
                         ]
-                      Texp_ident \"*type-error*/284\"
+                      Texp_ident \"*type-error*/285\"
                 ]
                 expression (type.ml[1,0+59]..type.ml[1,0+61])
                   attribute \"merlin.loc\"
@@ -192,7 +192,7 @@
                     "ghost": false,
                     "attrs": [],
                     "kind": "pattern (test.ml[1,0+4]..test.ml[1,0+5])
-    Tpat_var \"f/280\"
+    Tpat_var \"f/281\"
     value_mode meet(local,once,nonportable,yielding,stateful)(modevar#0[global,many,portable,unyielding,stateless .. global,many,nonportable,unyielding,stateful]);imply(unique,uncontended,read_write)(modevar#1[aliased,contended,immutable .. unique,uncontended,read_write])
   ",
                     "children": []
@@ -224,7 +224,7 @@
                         "ghost": false,
                         "attrs": [],
                         "kind": "pattern (test.ml[1,0+6]..test.ml[1,0+9])
-    Tpat_var \"x/282\"
+    Tpat_var \"x/283\"
     value_mode map_comonadic(local_to_regional)(modevar#4[global,many,portable,unyielding,stateless .. local,once,nonportable,yielding,stateful]);imply(unique,uncontended,read_write)(modevar#5[aliased,contended,immutable .. unique,uncontended,read_write])
   ",
                         "children": []
@@ -455,7 +455,7 @@
     Tpat_construct \"Some\"
     [
       pattern (test.ml[4,57+9]..test.ml[4,57+12])
-        Tpat_var \"_aa/283\"
+        Tpat_var \"_aa/284\"
         value_mode global,many,portable,unyielding,stateless;unique,uncontended,read_write
     ]
     None
@@ -474,7 +474,7 @@
                                         "ghost": false,
                                         "attrs": [],
                                         "kind": "pattern (test.ml[4,57+9]..test.ml[4,57+12])
-    Tpat_var \"_aa/283\"
+    Tpat_var \"_aa/284\"
     value_mode global,many,portable,unyielding,stateless;unique,uncontended,read_write
   ",
                                         "children": []
diff --git a/tests/test-dirs/parameters.t/run.t b/tests/test-dirs/parameters.t/run.t
@@ -398,10 +398,10 @@ Check that we understand everything about [Basic[P:P_int].create]:
     }
   }
   {
-    "file": "$TESTCASE_ROOT/basic.ml",
+    "file": "$TESTCASE_ROOT/basic.mli",
     "pos": {
-      "line": 3,
-      "col": 4
+      "line": 7,
+      "col": 0
     }
   }
 
@@ -426,10 +426,10 @@ syntax, so this output isn't ideal:
     }
   }
   {
-    "file": "$TESTCASE_ROOT/fancy.ml",
+    "file": "$TESTCASE_ROOT/fancy.mli",
     "pos": {
-      "line": 3,
-      "col": 4
+      "line": 4,
+      "col": 0
     }
   }
 
@@ -455,10 +455,10 @@ implementing .mli.)
     }
   }
   {
-    "file": "$TESTCASE_ROOT/p_int.ml",
+    "file": "$TESTCASE_ROOT/p_int.mli",
     "pos": {
       "line": 3,
-      "col": 4
+      "col": 0
     }
   }
 
diff --git a/tests/test-dirs/server-tests/typer-cache/stamps.t/run.t b/tests/test-dirs/server-tests/typer-cache/stamps.t/run.t
@@ -8,31 +8,31 @@ buffers, and different runs for the same buffer:
   $ echo "let f x = x" | \
   > $MERLIN server dump -what browse -filename test.ml | \
   > sed 's:\\n:\n:g' | grep Tpat_var
-    Tpat_var \"f/280\"
-    Tpat_var \"x/282\"
+    Tpat_var \"f/281\"
+    Tpat_var \"x/283\"
 
   $ echo "let f x = let () = () in x" | \
   > $MERLIN server dump -what browse -filename test.ml | \
   > sed 's:\\n:\n:g' | grep Tpat_var
-    Tpat_var \"f/283\"
-    Tpat_var \"x/285\"
+    Tpat_var \"f/284\"
+    Tpat_var \"x/286\"
 
   $ echo "let f x = x" | \
   > $MERLIN server dump -what browse -filename other_test.ml | \
   > sed 's:\\n:\n:g' | grep Tpat_var
-    Tpat_var \"f/280\"
-    Tpat_var \"x/282\"
+    Tpat_var \"f/281\"
+    Tpat_var \"x/283\"
 
   $ echo "let f x = let () = () in x" | \
   > $MERLIN server dump -what browse -filename test.ml | \
   > sed 's:\\n:\n:g' | grep Tpat_var
-    Tpat_var \"f/283\"
-    Tpat_var \"x/285\"
+    Tpat_var \"f/284\"
+    Tpat_var \"x/286\"
 
   $ echo "let f x = x" | \
   > $MERLIN server dump -what browse -filename test.ml | \
   > sed 's:\\n:\n:g' | grep Tpat_var
-    Tpat_var \"f/286\"
-    Tpat_var \"x/288\"
+    Tpat_var \"f/287\"
+    Tpat_var \"x/289\"
 
   $ $MERLIN server stop-server
diff --git a/tests/test-dirs/type-enclosing/underscore-ids.t b/tests/test-dirs/type-enclosing/underscore-ids.t
@@ -371,7 +371,7 @@ We try several places in the identifier to check the result stability
       [
         <def>
           pattern (under.ml[1,0+4]..under.ml[1,0+6])
-            Tpat_var \"aa/280\"
+            Tpat_var \"aa/281\"
             value_mode meet(local,once,nonportable,yielding,stateful)(modevar#0[global,many,portable,unyielding,stateless .. global,many,nonportable,unyielding,stateful]);imply(unique,uncontended,read_write)(modevar#1[aliased,contended,immutable .. unique,uncontended,read_write])
           expression (under.ml[1,0+9]..under.ml[1,0+12])
             Texp_constant Const_float 4.2
@@ -381,7 +381,7 @@ We try several places in the identifier to check the result stability
       [
         <def>
           pattern (under.ml[2,13+4]..under.ml[2,13+5])
-            Tpat_var \"f/281\"
+            Tpat_var \"f/282\"
             value_mode meet(local,once,nonportable,yielding,stateful)(modevar#5[global,many,portable,unyielding,stateless .. global,many,nonportable,unyielding,stateful]);imply(unique,uncontended,read_write)(modevar#6[aliased,contended,immutable .. unique,uncontended,read_write])
           expression (under.ml[2,13+6]..under.ml[5,70+17]) ghost
             Texp_function
@@ -390,7 +390,7 @@ We try several places in the identifier to check the result stability
               Nolabel
               Param_pat
                 pattern (under.ml[2,13+6]..under.ml[2,13+9])
-                  Tpat_var \"x/283\"
+                  Tpat_var \"x/284\"
                   value_mode map_comonadic(local_to_regional)(modevar#9[global,many,portable,unyielding,stateless .. local,once,nonportable,yielding,stateful]);imply(unique,uncontended,read_write)(modevar#a[aliased,contended,immutable .. unique,uncontended,read_write])
             ]
             Tfunction_body
@@ -404,7 +404,7 @@ We try several places in the identifier to check the result stability
                       expression (_none_[0,0+-1]..[0,0+-1]) ghost
                         Pexp_constant PConst_int (1,None)
                   ]
-                Texp_ident \"*type-error*/286\"
+                Texp_ident \"*type-error*/287\"
       ]
   ]
   
diff --git a/tests/test-dirs/typing-recovery.t b/tests/test-dirs/typing-recovery.t

Original file line number	Diff line number	Diff line change
`@@ -398,10 +398,10 @@ Check that we understand everything about [Basic[P:P_int].create]:`
`398`	`398`	`}`
`399`	`399`	`}`
`400`	`400`	`{`
`401`		`- "file": "$TESTCASE_ROOT/basic.ml",`
	`401`	`+ "file": "$TESTCASE_ROOT/basic.mli",`
`402`	`402`	`"pos": {`
`403`		`- "line": 3,`
`404`		`- "col": 4`
	`403`	`+ "line": 7,`
	`404`	`+ "col": 0`
`405`	`405`	`}`
`406`	`406`	`}`
`407`	`407`
`@@ -426,10 +426,10 @@ syntax, so this output isn't ideal:`
`426`	`426`	`}`
`427`	`427`	`}`
`428`	`428`	`{`
`429`		`- "file": "$TESTCASE_ROOT/fancy.ml",`
	`429`	`+ "file": "$TESTCASE_ROOT/fancy.mli",`
`430`	`430`	`"pos": {`
`431`		`- "line": 3,`
`432`		`- "col": 4`
	`431`	`+ "line": 4,`
	`432`	`+ "col": 0`
`433`	`433`	`}`
`434`	`434`	`}`
`435`	`435`
`@@ -455,10 +455,10 @@ implementing .mli.)`
`455`	`455`	`}`
`456`	`456`	`}`
`457`	`457`	`{`
`458`		`- "file": "$TESTCASE_ROOT/p_int.ml",`
	`458`	`+ "file": "$TESTCASE_ROOT/p_int.mli",`
`459`	`459`	`"pos": {`
`460`	`460`	`"line": 3,`
`461`		`- "col": 4`
	`461`	`+ "col": 0`
`462`	`462`	`}`
`463`	`463`	`}`
`464`	`464`
Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,7 @@ We try several places in the identifier to check the result stability`
`371`	`371`	`[`
`372`	`372`	`<def>`
`373`	`373`	`pattern (under.ml[1,0+4]..under.ml[1,0+6])`
`374`		`- Tpat_var \"aa/280\"`
	`374`	`+ Tpat_var \"aa/281\"`
`375`	`375`	`value_mode meet(local,once,nonportable,yielding,stateful)(modevar#0[global,many,portable,unyielding,stateless .. global,many,nonportable,unyielding,stateful]);imply(unique,uncontended,read_write)(modevar#1[aliased,contended,immutable .. unique,uncontended,read_write])`
`376`	`376`	`expression (under.ml[1,0+9]..under.ml[1,0+12])`
`377`	`377`	`Texp_constant Const_float 4.2`
`@@ -381,7 +381,7 @@ We try several places in the identifier to check the result stability`
`381`	`381`	`[`
`382`	`382`	`<def>`
`383`	`383`	`pattern (under.ml[2,13+4]..under.ml[2,13+5])`
`384`		`- Tpat_var \"f/281\"`
	`384`	`+ Tpat_var \"f/282\"`
`385`	`385`	`value_mode meet(local,once,nonportable,yielding,stateful)(modevar#5[global,many,portable,unyielding,stateless .. global,many,nonportable,unyielding,stateful]);imply(unique,uncontended,read_write)(modevar#6[aliased,contended,immutable .. unique,uncontended,read_write])`
`386`	`386`	`expression (under.ml[2,13+6]..under.ml[5,70+17]) ghost`
`387`	`387`	`Texp_function`
`@@ -390,7 +390,7 @@ We try several places in the identifier to check the result stability`
`390`	`390`	`Nolabel`
`391`	`391`	`Param_pat`
`392`	`392`	`pattern (under.ml[2,13+6]..under.ml[2,13+9])`
`393`		`- Tpat_var \"x/283\"`
	`393`	`+ Tpat_var \"x/284\"`
`394`	`394`	`value_mode map_comonadic(local_to_regional)(modevar#9[global,many,portable,unyielding,stateless .. local,once,nonportable,yielding,stateful]);imply(unique,uncontended,read_write)(modevar#a[aliased,contended,immutable .. unique,uncontended,read_write])`
`395`	`395`	`]`
`396`	`396`	`Tfunction_body`
`@@ -404,7 +404,7 @@ We try several places in the identifier to check the result stability`
`404`	`404`	`expression (_none_[0,0+-1]..[0,0+-1]) ghost`
`405`	`405`	`Pexp_constant PConst_int (1,None)`
`406`	`406`	`]`
`407`		`- Texp_ident \"type-error/286\"`
	`407`	`+ Texp_ident \"type-error/287\"`
`408`	`408`	`]`
`409`	`409`	`]`
`410`	`410`