syntax support

zth · zth · commit b12d83bc8680 · 2024-09-30T21:32:11.000+02:00
diff --git a/jscomp/build_tests/super_errors/expected/dict_pattern_inference.res.expected b/jscomp/build_tests/super_errors/expected/dict_pattern_inference.res.expected
@@ -1,10 +1,10 @@
 
   [1;31mWe've found a bug for you![0m
-  [36m/.../fixtures/dict_pattern_inference.res[0m:[2m3:36-42[0m
+  [36m/.../fixtures/dict_pattern_inference.res[0m:[2m3:27-33[0m
 
   1 [2m│[0m let foo = dict =>
   2 [2m│[0m   switch dict {
-  [1;31m3[0m [2m│[0m   | @res.dictPattern {one: 1, two: [1;31m"hello"[0m} => Js.log("one")
+  [1;31m3[0m [2m│[0m   | dict{"one": 1, "two": [1;31m"hello"[0m} => Js.log("one")
   4 [2m│[0m   | _ => Js.log("not one")
   5 [2m│[0m   }
 
diff --git a/jscomp/build_tests/super_errors/expected/dict_pattern_inference_constrained.res.expected b/jscomp/build_tests/super_errors/expected/dict_pattern_inference_constrained.res.expected
@@ -1,22 +1,9 @@
 
-  [1;33mWarning number 9[0m
-  [36m/.../fixtures/dict_pattern_inference_constrained.res[0m:[2m3:22-29[0m
-
-  1 [2m│[0m let foo = dict =>
-  2 [2m│[0m   switch dict {
-  [1;33m3[0m [2m│[0m   | @res.dictPattern [1;33m{one: 1}[0m =>
-  4 [2m│[0m     let _: dict<string> = dict
-  5 [2m│[0m     Js.log("one")
-
-  the following labels are not bound in this record pattern: dictValuesType
-Either bind these labels explicitly or add ', _' to the pattern.
-
-
   [1;31mWe've found a bug for you![0m
   [36m/.../fixtures/dict_pattern_inference_constrained.res[0m:[2m4:27-30[0m
 
   2 [2m┆[0m switch dict {
-  3 [2m┆[0m | @res.dictPattern {one: 1} =>
+  3 [2m┆[0m | dict{"one": 1} =>
   [1;31m4[0m [2m┆[0m   let _: dict<string> = [1;31mdict[0m
   5 [2m┆[0m   Js.log("one")
   6 [2m┆[0m | _ => Js.log("not one")
diff --git a/jscomp/build_tests/super_errors/expected/dict_pattern_regular_record.res.expected b/jscomp/build_tests/super_errors/expected/dict_pattern_regular_record.res.expected
@@ -1,23 +1,10 @@
 
-  [1;33mWarning number 9[0m
-  [36m/.../fixtures/dict_pattern_regular_record.res[0m:[2m5:22-33[0m
-
-  3 [2m│[0m let constrainedAsDict = (dict: x) =>
-  4 [2m│[0m   switch dict {
-  [1;33m5[0m [2m│[0m   | @res.dictPattern [1;33m{one: "one"}[0m => Js.log("one")
-  6 [2m│[0m   | _ => Js.log("not one")
-  7 [2m│[0m   }
-
-  the following labels are not bound in this record pattern: dictValuesType
-Either bind these labels explicitly or add ', _' to the pattern.
-
-
   [1;31mWe've found a bug for you![0m
-  [36m/.../fixtures/dict_pattern_regular_record.res[0m:[2m5:22-33[0m
+  [36m/.../fixtures/dict_pattern_regular_record.res[0m:[2m5:5-22[0m
 
   3 [2m│[0m let constrainedAsDict = (dict: x) =>
   4 [2m│[0m   switch dict {
-  [1;31m5[0m [2m│[0m   | @res.dictPattern [1;31m{one: "one"}[0m => Js.log("one")
+  [1;31m5[0m [2m│[0m   | [1;31mdict{"one": "one"}[0m => Js.log("one")
   6 [2m│[0m   | _ => Js.log("not one")
   7 [2m│[0m   }
 
diff --git a/jscomp/build_tests/super_errors/fixtures/dict_pattern_inference.res b/jscomp/build_tests/super_errors/fixtures/dict_pattern_inference.res
@@ -1,5 +1,5 @@
 let foo = dict =>
   switch dict {
-  | @res.dictPattern {one: 1, two: "hello"} => Js.log("one")
+  | dict{"one": 1, "two": "hello"} => Js.log("one")
   | _ => Js.log("not one")
   }
diff --git a/jscomp/build_tests/super_errors/fixtures/dict_pattern_inference_constrained.res b/jscomp/build_tests/super_errors/fixtures/dict_pattern_inference_constrained.res
@@ -1,6 +1,6 @@
 let foo = dict =>
   switch dict {
-  | @res.dictPattern {one: 1} =>
+  | dict{"one": 1} =>
     let _: dict<string> = dict
     Js.log("one")
   | _ => Js.log("not one")
diff --git a/jscomp/build_tests/super_errors/fixtures/dict_pattern_regular_record.res b/jscomp/build_tests/super_errors/fixtures/dict_pattern_regular_record.res
@@ -2,6 +2,6 @@ type x = {one: int}
 
 let constrainedAsDict = (dict: x) =>
   switch dict {
-  | @res.dictPattern {one: "one"} => Js.log("one")
+  | dict{"one": "one"} => Js.log("one")
   | _ => Js.log("not one")
   }
diff --git a/jscomp/syntax/src/res_core.ml b/jscomp/syntax/src/res_core.ml
@@ -1127,6 +1127,9 @@ let rec parse_pattern ?(alias = true) ?(or_ = true) p =
     | List ->
       Parser.next p;
       parse_list_pattern ~start_pos ~attrs p
+    | Dict ->
+      Parser.next p;
+      parse_dict_pattern ~start_pos ~attrs p
     | Module -> parse_module_pattern ~attrs p
     | Percent ->
       let extension = parse_extension p in
@@ -1397,6 +1400,29 @@ and parse_list_pattern ~start_pos ~attrs p =
     let pat = make_list_pattern loc patterns None in
     {pat with ppat_loc = loc; ppat_attributes = attrs}
 
+and parse_dict_pattern_row p =
+  match p.Parser.token with
+  | String s ->
+    let loc = mk_loc p.start_pos p.end_pos in
+    Parser.next p;
+    let fieldName = Location.mkloc (Longident.Lident s) loc in
+    Parser.expect Colon p;
+    let optional = parse_optional_label p in
+    let pat = parse_pattern p in
+    Some (fieldName, make_pattern_optional ~optional pat)
+  | _ -> None
+
+and parse_dict_pattern ~start_pos ~attrs (p : Parser.t) =
+  let fields =
+    parse_comma_delimited_region p ~grammar:DictRows ~closing:Rbrace
+      ~f:parse_dict_pattern_row
+  in
+  Parser.expect Rbrace p;
+  let loc = mk_loc start_pos p.prev_end_pos in
+  Ast_helper.Pat.record ~loc
+    ~attrs:((Location.mknoloc "res.dictPattern", PStr []) :: attrs)
+    fields Open
+
 and parse_array_pattern ~attrs p =
   let start_pos = p.start_pos in
   Parser.expect Lbracket p;
diff --git a/jscomp/syntax/src/res_parsetree_viewer.ml b/jscomp/syntax/src/res_parsetree_viewer.ml
@@ -105,6 +105,12 @@ let has_res_pat_variant_spread_attribute attrs =
       | _ -> false)
     attrs
 
+let has_dict_pattern_attribute attrs =
+  attrs
+  |> List.find_opt (fun (({txt}, _) : Parsetree.attribute) ->
+         txt = "res.dictPattern")
+  |> Option.is_some
+
 let collect_array_expressions expr =
   match expr.pexp_desc with
   | Pexp_array exprs -> (exprs, None)
@@ -228,7 +234,7 @@ let filter_parsing_attrs attrs =
               ( "res.arity" | "res.braces" | "ns.braces" | "res.iflet"
               | "res.namedArgLoc" | "res.optional" | "res.ternary" | "res.async"
               | "res.await" | "res.template" | "res.taggedTemplate"
-              | "res.patVariantSpread" );
+              | "res.patVariantSpread" | "res.dictPattern" );
           },
           _ ) ->
         false
diff --git a/jscomp/syntax/src/res_parsetree_viewer.mli b/jscomp/syntax/src/res_parsetree_viewer.mli
@@ -28,6 +28,7 @@ val process_function_attributes :
 
 val has_await_attribute : Parsetree.attributes -> bool
 val has_res_pat_variant_spread_attribute : Parsetree.attributes -> bool
+val has_dict_pattern_attribute : Parsetree.attributes -> bool
 
 type if_condition_kind =
   | If of Parsetree.expression
diff --git a/jscomp/syntax/src/res_printer.ml b/jscomp/syntax/src/res_printer.ml
@@ -2416,6 +2416,25 @@ and print_pattern ~state (p : Parsetree.pattern) cmt_tbl =
       Doc.concat [Doc.text "..."; print_ident_path ident cmt_tbl]
     | Ppat_type ident ->
       Doc.concat [Doc.text "#..."; print_ident_path ident cmt_tbl]
+    | Ppat_record (rows, _)
+      when ParsetreeViewer.has_dict_pattern_attribute p.ppat_attributes ->
+      Doc.concat
+        [
+          Doc.text "dict{";
+          Doc.indent
+            (Doc.concat
+               [
+                 Doc.soft_line;
+                 Doc.join
+                   ~sep:(Doc.concat [Doc.text ","; Doc.line])
+                   (List.map
+                      (fun row -> print_pattern_dict_row ~state row cmt_tbl)
+                      rows);
+               ]);
+          Doc.if_breaks (Doc.text ",") Doc.nil;
+          Doc.soft_line;
+          Doc.rbrace;
+        ]
     | Ppat_record (rows, open_flag) ->
       Doc.group
         (Doc.concat
@@ -2582,6 +2601,36 @@ and print_pattern_record_row ~state row cmt_tbl =
     in
     print_comments doc cmt_tbl loc_for_comments
 
+and print_pattern_dict_row ~state
+    (row : Longident.t Location.loc * Parsetree.pattern) cmt_tbl =
+  match row with
+  | longident, pattern ->
+    let loc_for_comments =
+      {longident.loc with loc_end = pattern.ppat_loc.loc_end}
+    in
+    let rhs_doc =
+      let doc = print_pattern ~state pattern cmt_tbl in
+      let doc =
+        if Parens.pattern_record_row_rhs pattern then add_parens doc else doc
+      in
+      Doc.concat [print_optional_label pattern.ppat_attributes; doc]
+    in
+    let lbl_doc =
+      Doc.concat [Doc.text "\""; print_longident longident.txt; Doc.text "\""]
+    in
+    let doc =
+      Doc.group
+        (Doc.concat
+           [
+             lbl_doc;
+             Doc.text ":";
+             (if ParsetreeViewer.is_huggable_pattern pattern then
+                Doc.concat [Doc.space; rhs_doc]
+              else Doc.indent (Doc.concat [Doc.line; rhs_doc]));
+           ])
+    in
+    print_comments doc cmt_tbl loc_for_comments
+
 and print_expression_with_comments ~state expr cmt_tbl : Doc.t =
   let doc = print_expression ~state expr cmt_tbl in
   print_comments doc cmt_tbl expr.Parsetree.pexp_loc
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/dict.res b/jscomp/syntax/tests/parsing/grammar/pattern/dict.res
@@ -0,0 +1,10 @@
+let someDict = dict{
+    "one": "one",
+}
+
+let dict{"one": ?one} = someDict
+
+let foo = () => switch someDict {
+| dict{"one": "one"} => Js.log("one")
+| _ => Js.log("not one")
+}
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/expected/dict.res.txt b/jscomp/syntax/tests/parsing/grammar/pattern/expected/dict.res.txt
@@ -0,0 +1,10 @@
+let someDict = Primitive_dict.make [|("one", {js|one|js})|]
+let (({ one = ((one)[@res.optional ]);_})[@res.dictPattern ]) = someDict
+let foo =
+  ((Function$
+      (fun () ->
+         match someDict with
+         | (({ one = {js|one|js};_})[@res.dictPattern ]) ->
+             Js.log {js|one|js}
+         | _ -> Js.log {js|not one|js}))
+  [@res.arity 1])
diff --git a/jscomp/syntax/tests/printer/pattern/dict.res b/jscomp/syntax/tests/printer/pattern/dict.res
@@ -0,0 +1,10 @@
+let someDict = dict{
+    "one": "one",
+}
+
+let dict{"one": ?one} = someDict
+
+let foo = () => switch someDict {
+| dict{"one": "one"} => Js.log("one")
+| _ => Js.log("not one")
+}
diff --git a/jscomp/syntax/tests/printer/pattern/expected/dict.res.txt b/jscomp/syntax/tests/printer/pattern/expected/dict.res.txt
@@ -0,0 +1,11 @@
+let someDict = dict{
+  "one": "one",
+}
+
+let dict{"one": ?one} = someDict
+
+let foo = () =>
+  switch someDict {
+  | dict{"one": "one"} => Js.log("one")
+  | _ => Js.log("not one")
+  }
diff --git a/jscomp/test/DictInternalRepresentation.res b/jscomp/test/DictInternalRepresentation.res
@@ -9,17 +9,17 @@ let intDict = dict{
 
 let foo = () => {
   let first = switch stringDict {
-  | @res.dictPattern {first} => first ++ "2"
+  | dict{"first": first} => first ++ "2"
   | _ => "hello"
   }
   Js.log(first)
   let second = switch intDict {
-  | @res.dictPattern {first} => first + 2
+  | dict{"first": first} => first + 2
   | _ => 1
   }
   Js.log(second)
   let third = switch stringDict {
-  | @res.dictPattern {first} => first ++ "2"
+  | dict{"first": first} => first ++ "2"
   | _ => "hello"
   }
   Js.log(third)
diff --git a/jscomp/test/DictTests.res b/jscomp/test/DictTests.res
@@ -18,16 +18,16 @@ let intDict = dict{
 module PatternMatching = {
   let inferDictByPattern = dict =>
     switch dict {
-    | @res.dictPattern {one: 1, three: 3, four: 4} =>
+    | dict{"one": 1, "three": 3, "four": 4} =>
       // Make sure that the dict is of correct type
       dict->Js.Dict.set("five", 5)
-    | @res.dictPattern {two: 1} => Js.log("two")
+    | dict{"two": 1} => Js.log("two")
     | _ => Js.log("not one")
     }
 
   let constrainedAsDict = (dict: dict<int>) =>
     switch dict {
-    | @res.dictPattern {one: 1} =>
+    | dict{"one": 1} =>
       let _d: dict<int> = dict
       Js.log("one")
     | _ => Js.log("not one")

-Original file line number
+Diff line change
@@ @@ -1,10 +1,10 @@ @@
   [1;31mWe've found a bug for you![0m
 -  [36m/.../fixtures/dict_pattern_inference.res[0m:[2m3:36-42[0m
 +  [36m/.../fixtures/dict_pattern_inference.res[0m:[2m3:27-33[0m
 [2m│[0m let foo = dict =>
 [2m│[0m   switch dict {
 -  [1;31m3[0m [2m│[0m   | @res.dictPattern {one: 1, two: [1;31m"hello"[0m} => Js.log("one")
 +  [1;31m3[0m [2m│[0m   | dict{"one": 1, "two": [1;31m"hello"[0m} => Js.log("one")
 [2m│[0m   | _ => Js.log("not one")
 [2m│[0m   }
-Original file line number
+Diff line change
@@ @@ -1,22 +1,9 @@ @@
 -  [1;33mWarning number 9[0m
 -  [36m/.../fixtures/dict_pattern_inference_constrained.res[0m:[2m3:22-29[0m
+-
 -  1 [2m│[0m let foo = dict =>
 -  2 [2m│[0m   switch dict {
 -  [1;33m3[0m [2m│[0m   | @res.dictPattern [1;33m{one: 1}[0m =>
 -  4 [2m│[0m     let _: dict<string> = dict
 -  5 [2m│[0m     Js.log("one")
+-
 -  the following labels are not bound in this record pattern: dictValuesType
 -Either bind these labels explicitly or add ', _' to the pattern.
+-
+-
   [1;31mWe've found a bug for you![0m
   [36m/.../fixtures/dict_pattern_inference_constrained.res[0m:[2m4:27-30[0m
 [2m┆[0m switch dict {
 -  3 [2m┆[0m | @res.dictPattern {one: 1} =>
 +  3 [2m┆[0m | dict{"one": 1} =>
   [1;31m4[0m [2m┆[0m   let _: dict<string> = [1;31mdict[0m
 [2m┆[0m   Js.log("one")
 [2m┆[0m | _ => Js.log("not one")
-Original file line number
+Diff line change
@@ @@ -1,23 +1,10 @@ @@
 -  [1;33mWarning number 9[0m
 -  [36m/.../fixtures/dict_pattern_regular_record.res[0m:[2m5:22-33[0m
+-
 -  3 [2m│[0m let constrainedAsDict = (dict: x) =>
 -  4 [2m│[0m   switch dict {
 -  [1;33m5[0m [2m│[0m   | @res.dictPattern [1;33m{one: "one"}[0m => Js.log("one")
 -  6 [2m│[0m   | _ => Js.log("not one")
 -  7 [2m│[0m   }
+-
 -  the following labels are not bound in this record pattern: dictValuesType
 -Either bind these labels explicitly or add ', _' to the pattern.
+-
+-
   [1;31mWe've found a bug for you![0m
 -  [36m/.../fixtures/dict_pattern_regular_record.res[0m:[2m5:22-33[0m
 +  [36m/.../fixtures/dict_pattern_regular_record.res[0m:[2m5:5-22[0m
 [2m│[0m let constrainedAsDict = (dict: x) =>
 [2m│[0m   switch dict {
 -  [1;31m5[0m [2m│[0m   | @res.dictPattern [1;31m{one: "one"}[0m => Js.log("one")
 +  [1;31m5[0m [2m│[0m   | [1;31mdict{"one": "one"}[0m => Js.log("one")
 [2m│[0m   | _ => Js.log("not one")
 [2m│[0m   }
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`let foo = dict =>`
`2`	`2`	`switch dict {`
`3`		`- \| @res.dictPattern {one: 1, two: "hello"} => Js.log("one")`
	`3`	`+ \| dict{"one": 1, "two": "hello"} => Js.log("one")`
`4`	`4`	`\| _ => Js.log("not one")`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@ type x = {one: int}`
`2`	`2`
`3`	`3`	`let constrainedAsDict = (dict: x) =>`
`4`	`4`	`switch dict {`
`5`		`- \| @res.dictPattern {one: "one"} => Js.log("one")`
	`5`	`+ \| dict{"one": "one"} => Js.log("one")`
`6`	`6`	`\| _ => Js.log("not one")`
`7`	`7`	`}`