Use separate directory for ast mapping tests

Author: nojaf

scripts/test_syntax.sh

@@ -43,7 +43,7 @@ while read file; do
 done <temp/files.txt
 
 # printing with ast conversion
-find syntax_tests/data/{printer,conversion} -name "*.res" -o -name "*.resi" -o -name "*.ml" -o -name "*.mli" >temp/files.txt
+find syntax_tests/data/ast-mapping -name "*.res" -o -name "*.resi" -o -name "*.ml" -o -name "*.mli" >temp/files.txt
 while read file; do
   $DUNE_BIN_DIR/res_parser -test-ast-conversion $file &> $(exp $file) & maybeWait
 done <temp/files.txt

tests/syntax_tests/data/conversion/reason/expected/namedArgs.res.txt

@@ -2,35 +2,47 @@ let wizard = Wizard.make(
   ~spriteSheet=wizard,
   ~hp=999999999999999,
   ~mp=50,
-  ~coordinates=//~coordinates={x: 0., y:0. z: 0.},
-  {x: 40, y: 100., z: 0.},
+  //~coordinates={x: 0., y:0. z: 0.},
+  ~coordinates={x: 40, y: 100., z: 0.},
   //  /* c0 */ ~gpuCoordinates= /* c1 */ gpuBuffer[10] /* c2 */, // trailing
 )
 
 apply(
+  // above
   ~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
+  // below
   ~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
+  // here
   ~cccccccccccccccccccccccccccccccc,
 )
 
 applyOptional(
+  // above
   ~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa?,
+  // below
   ~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb?,
+  // here
   ~cccccccccccccccccccccccccccccccc?,
 )
 
 foo(
+  // c0
   ~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: int,
+  // c1
   ~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int,
+  // c2
   ~cccccccccccccccccccccccccccccc: int,
 )
 
 let f = (
   ~isItemActive=?,
+  // array((name, href))
   ~headers: array<(string, string)>,
   ~moduleName: string,
+  // foo
   ~x,
-  ~d: /* c1 */ e,
+  // above
+  /* c0 */ ~d: /* c1 */ e, // end
   ~from as // does it work
   hometown,
 ) => {
@@ -44,6 +56,7 @@ let make = (
   ~theme: ColorTheme.t,
   ~components: Mdx.Components.t,
   ~sidebarState: (bool, (bool => bool) => unit),
+  // (Sidebar, toggleSidebar) ... for toggling sidebar in mobile view
   ~sidebar: React.element,
   ~breadcrumbs: option<list<UrlPath.breadcrumb>>=?,
   ~children,

tests/syntax_tests/data/printer/comments/expected/expr.res.txt

@@ -218,9 +218,13 @@ let multiply = (/* c0 */ m1 /* c1 */, /* c2 */ m2 /* c3 */) => {
   // test
 }
 
-let multiply = (~x=/* c0 */ m1, ~y=/* c2 */ m2) => ()
+let multiply = (~x=/* c0 */ m1 /* c1 */, ~y=/* c2 */ m2 /* c3 */) => ()
 
-let f = (~greeting, ~from as /* c2 */ /* c3 */ /* c4 */ hometown /* c5 */, ~x=?) => /* c7 */ ()
+let f = (
+  /* c0 */ ~greeting /* c1 */,
+  /* c2 */ ~from as /* c3 */ /* c4 */ hometown /* c5 */,
+  /* c6 */ ~x=?,
+) => /* c7 */ ()
 
 let multiply = (type /* c-2 */ t /* c-1 */, /* c0 */ m1 /* c1 */, /* c2 */ m2 /* c3 */) => ()
 let multiply = (

tests/syntax_tests/data/printer/comments/expected/jsx.res.txt

@@ -24,8 +24,8 @@ module Cite = {
 />
 
 <A
-  value=// comment1
-  ""
+  // comment1
+  value=""
   // comment2
 >
   <B /* comment3 */ />

tests/syntax_tests/data/printer/comments/expected/namedArgs.res.txt

@@ -2,37 +2,49 @@ let wizard = Wizard.make(
   ~spriteSheet=wizard,
   ~hp=999999999999999,
   ~mp=50,
-  ~coordinates=//~coordinates={x: 0., y:0. z: 0.},
-  {x: 40, y: 100., z: 0.},
-  ~gpuCoordinates=/* c0 */ /* c1 */ gpuBuffer[10] /* c2 */, // trailing
+  //~coordinates={x: 0., y:0. z: 0.},
+  ~coordinates={x: 40, y: 100., z: 0.},
+  /* c0 */ ~gpuCoordinates=/* c1 */ gpuBuffer[10] /* c2 */, // trailing
 )
 
 apply(
+  // above
   ~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
+  // below
   ~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
+  // here
   ~cccccccccccccccccccccccccccccccc,
 )
 
 applyOptional(
+  // above
   ~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa?,
+  // below
   ~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb?,
+  // here
   ~cccccccccccccccccccccccccccccccc?,
 )
 
 foo(
+  // c0
   ~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: int,
+  // c1
   ~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int,
+  // c2
   ~cccccccccccccccccccccccccccccc: int,
 )
 
 let f = (
   ~isItemActive=?,
+  // array((name, href))
   ~headers: array<(string, string)>,
   ~moduleName: string,
+  // foo
   ~x,
-  ~d: /* c1 */ e,
-  ~from as // does it work
-  hometown,
+  // above
+  /* c0 */ ~d: /* c1 */ e, // end
+  // does it work
+  ~from as hometown,
 ) => {
   let a = 1
   let b = 2
@@ -44,6 +56,7 @@ let make = (
   ~theme: ColorTheme.t,
   ~components: Mdx.Components.t,
   ~sidebarState: (bool, (bool => bool) => unit),
+  // (Sidebar, toggleSidebar) ... for toggling sidebar in mobile view
   ~sidebar: React.element,
   ~breadcrumbs: option<list<UrlPath.breadcrumb>>=?,
   ~children,

tests/syntax_tests/data/printer/comments/expected/typexpr.res.txt

@@ -41,15 +41,15 @@ type add = /* before */ (
   /* c2 */ int /* c3 */,
 ) => /* before return */ int /* after */
 type add = /* before */ (
-  ~a: /* c0 */ int /* c1 */,
-  ~b: /* c2 */ int /* c3 */,
+  /* c0 */ ~a: int /* c1 */,
+  /* c2 */ ~b: int /* c3 */,
 ) => /* before return */ int /* after */
 type multiply = /* before */ (
-  ~fn: /* c0 */ (
+  /* c0 */ ~fn: (
     /* cinner0 */ int /* cinner1 */,
     /* cinner2 */ int /* cinner3 */,
   ) => /* cx */ int /* c1 */,
-  ~b: /* c2 */ int /* c3 */,
+  /* c2 */ ~b: int /* c3 */,
 ) => int /* after */
 type make = (
   ~activity: ActivityFlow_Activity.t,
@@ -58,15 +58,15 @@ type make = (
   ~next: (string, string, array<string>) => unit,
   ~hapticFeedback: unit => unit,
   ~participants: Belt.Set.String.t,
-  ~openPhotoFeed: // here
+  // here
 
   // above
-  /* c0 */ /* c1 */ (
-    ~feedId: /* c2 */ /* c3 */ option<string> /* c4 */,
+  /* c0 */ ~openPhotoFeed: /* c1 */ (
+    /* c2 */ ~feedId: /* c3 */ option<string> /* c4 */,
     /* c5 */ unit /* c6 */,
   ) => /* c7 */ unit /* c8 */,
-  ~getAnother: // only provide this when it shows a random activity
-  unit => unit=?,
+  // only provide this when it shows a random activity
+  ~getAnother: unit => unit=?,
 ) => React.element
 
 //type f = /* c0 */ ~a: /* c1 */ int /* c2 */ => /* c3 */  int /* c4 */
@@ -81,10 +81,10 @@ type jsUser = /* before */ {
 } /* after */
 
 external test: (
-  ~int: // comment 1
-  int,
-  ~int: // comment 2
-  int,
+  // comment 1
+  ~int: int,
+  // comment 2
+  ~int: int,
 ) => unit = "test"
 
 external another_test: (

tests/syntax_tests/data/printer/expr/expected/Uncurried.res.txt

@@ -8,4 +8,7 @@ let () = ignore(3)
 
 let foo = /* ddd */ x => x
 
-let f = (~a) => a
+let f = (
+  // comment
+  ~a,
+) => a

tests/syntax_tests/data/printer/expr/expected/UncurriedByDefault.res.txt

@@ -45,9 +45,9 @@ let _ = setTimeout(() => {
 }, 100)
 
 let _ = @att x => 34
-let _ = @res.async @att async x => 34
+let _ = @att async x => 34
 let _ = preserveAttr(@att x => 34)
-let _ = preserveAttr(@res.async @att async x => 34)
+let _ = preserveAttr(@att async x => 34)
 
 let t0 = (type a b, l: list<a>, x: a) => list{x, ...l}
 let t1 = (type a b, l: list<a>, x: a) => list{x, ...l}
@@ -127,9 +127,9 @@ let _ = setTimeout(() => {
 }, 100)
 
 let _ = @att x => 34
-let _ = @res.async @att async x => 34
+let _ = @att async x => 34
 let _ = preserveAttr(@att x => 34)
-let _ = preserveAttr(@res.async @att async x => 34)
+let _ = preserveAttr(@att async x => 34)
 
 let t0 = (type a b, l: list<a>, x: a) => list{x, ...l}
 let t1 = (type a b, l: list<a>, x: a) => list{x, ...l}

tests/syntax_tests/data/printer/expr/expected/asyncAwait.res.txt

@@ -1,18 +1,16 @@
-let sequentialAwait =
-  @res.async
-  async () => {
-    let result1 = await paused("first")
-    nodeJsAssert.equal(result1, "first")
-
-    let result2 = await paused("second")
-    nodeJsAssert.equal(result2, "second")
-  }
+let sequentialAwait = async () => {
+  let result1 = await paused("first")
+  nodeJsAssert.equal(result1, "first")
+
+  let result2 = await paused("second")
+  nodeJsAssert.equal(result2, "second")
+}
 
-let f = @res.async async () => ()
-let f = @res.async async () => ()
-let f = @res.async async f => f()
-let f = @res.async async (a, b) => a + b
-let f = @res.async async (a, b) => a + b
+let f = async () => ()
+let f = async () => ()
+let f = async f => f()
+let f = async (a, b) => a + b
+let f = async (a, b) => a + b
 
 let maybeSomeValue = switch await fetchData(url) {
 | data => Some(data)
@@ -34,7 +32,9 @@ user.data = await fetch()
 let inBinaryExpression = await x->Js.Promise.resolve + 1
 let inBinaryExpression = await x->Js.Promise.resolve + await y->Js.Promise.resolve
 
-let withCallback = @res.async async () => @res.async async x => await x->Js.promise.resolve + 1
+let withCallback = async () => {
+  async x => await x->Js.promise.resolve + 1
+}
 
 let () = await (await fetch(url))->(await resolve)
 
@@ -47,7 +47,7 @@ let _ = await f
 let _ = await %extension
 let _ = await "test"
 let _ = await ((a, b) => a + b)
-let _ = await (@res.async async (a, b) => a + b)
+let _ = await (async (a, b) => a + b)
 let _ = await (
   switch x {
   | A => ()
@@ -102,16 +102,16 @@ let _ = await {
   Js.Promise.resolve(x)
 }
 
-let f1 = @res.async async (~x, ~y) => x + y
-let f2 = @res.async async (@foo ~x, @bar ~y) => x + y
-let f3 = @res.async @foo async (~x as @bar @zz z, ~y) => x + y
-let f4 = @res.async async x => x
-let f5 = @res.async async x => @res.async async y => 3
-let f6 = @res.async async (~x1, ~x2) => @res.async async y => 3
-let f7 = @res.async async x => @res.async async (~y) => 3
-let f8 = @res.async async (~x1, ~x2) => @res.async async (~y) => 3
-let f9 = x => @res.async async (~y) => 3
-let f10 = x => @res.async async y => 3
+let f1 = async (~x, ~y) => x + y
+let f2 = async (@foo ~x, @bar ~y) => x + y
+let f3 = @foo async (~x as @bar @zz z, ~y) => x + y
+let f4 = async x => x
+let f5 = async x => async y => 3
+let f6 = async (~x1, ~x2) => async y => 3
+let f7 = async x => async (~y) => 3
+let f8 = async (~x1, ~x2) => async (~y) => 3
+let f9 = x => async (~y) => 3
+let f10 = x => async y => 3
 let f11 = (~x) => (~y) => 3
 
 let f12 = @a (@b x) => 3
@@ -122,7 +122,7 @@ let aw = @foo (server->start)->foo
 let aw = (await (3 ** 4))->foo
 
 let foo = async(~a=34)
-let bar = @res.async async (~a) => a + 1
+let bar = async (~a) => a + 1
 
 let a1 = (await 3) + (await 4)
 let a2 = (await 3) ** (await 4)
@@ -141,12 +141,12 @@ let c3 = x => @foo y => x + y
 type t1 = int => string => bool
 type t2 = (int, string) => bool
 
-let f = async (type a, @res.async ()) => {
+let f = async (type a, ()) => {
   await Js.Promise.resolve()
 }
 
-let attr1 = @res.async @a async x => x + 1
-let attr2 = @a async (type a, @res.async ()) => (type b c, x) => 3
-let attr3 = @a (type a, ()) => async (type b c, @res.async x) => 3
-let attr4 = @a (type a, ()) => @b async (type b c, @res.async x) => 3
-let attr5: int => promise<int> = @a @b async (type a b c, @res.async ()) => (x: a) => x
+let attr1 = @a async x => x + 1
+let attr2 = @a async (type a, ()) => (type b c, x) => 3
+let attr3 = @a (type a, ()) => async (type b c, x) => 3
+let attr4 = @a (type a, ()) => @b async (type b c, x) => 3
+let attr5: int => promise<int> = @a @b async (type a b c, ()) => (x: a) => x