Fix location in parsing comments printing

rescript-lang · May 25, 2024 · ff91945 · ff91945
1 parent 9b35205
commit ff91945
Show file tree

Hide file tree

Showing 7 changed files with 217 additions and 8 deletions.
diff --git a/jscomp/syntax/src/res_comments_table.ml b/jscomp/syntax/src/res_comments_table.ml
@@ -1314,6 +1314,21 @@ and walkExpression expr t comments =
     walkList
       [Expression parentExpr; Expression memberExpr; Expression targetExpr]
       t comments
+  | Pexp_apply
+      ( {
+          pexp_desc =
+            Pexp_ident
+              {
+                txt =
+                  Longident.Ldot
+                    (Longident.Ldot (Lident "Js", "Dict"), "fromArray");
+              };
+        },
+        [(Nolabel, keyValues)] )
+    when Res_parsetree_viewer.isTupleArray keyValues ->
+    walkList
+      [Expression keyValues]
+      t comments
   | Pexp_apply (callExpr, arguments) ->
     let before, inside, after = partitionByLoc comments callExpr.pexp_loc in
     let after =

diff --git a/jscomp/syntax/src/res_core.ml b/jscomp/syntax/src/res_core.ml
@@ -3942,20 +3942,20 @@ and parseListExpr ~startPos p =
       [(Asttypes.Nolabel, Ast_helper.Exp.array ~loc listExprs)]
 
 and parseDictExpr ~startPos p =
-  let exprs =
+  let rows =
     parseCommaDelimitedRegion ~grammar:Grammar.DictRows ~closing:Rbrace
       ~f:parseDictExprRow p
   in
-  let loc = mkLoc startPos p.prevEndPos in
+  let loc = mkLoc startPos p.endPos in
   let toKeyValuePair (recordItem: (Longident.t Location.loc * Parsetree.expression)) =
     match recordItem with
-    | {Location.txt = Longident.Lident key; loc}, valueExpr ->
+    | {Location.txt = Longident.Lident key; loc = keyLoc}, ({pexp_loc = valueLoc} as valueExpr) ->
       Some
-        (Ast_helper.Exp.tuple ~loc:(mkLoc loc.loc_start valueExpr.pexp_loc.loc_end)
-           [Ast_helper.Exp.constant ~loc (Pconst_string (key, None)); valueExpr])
+        (Ast_helper.Exp.tuple ~loc:(mkLoc keyLoc.loc_start valueLoc.loc_end)
+           [Ast_helper.Exp.constant ~loc:keyLoc (Pconst_string (key, None)); valueExpr])
     | _ -> None
   in
-  let keyValuePairs = List.filter_map toKeyValuePair exprs in
+  let keyValuePairs = List.filter_map toKeyValuePair rows in
   Parser.expect Rbrace p;
   Ast_helper.Exp.apply ~loc
     (Ast_helper.Exp.ident ~loc

diff --git a/jscomp/syntax/src/res_printer.ml b/jscomp/syntax/src/res_printer.ml
@@ -1390,7 +1390,7 @@ and printLiteralDictExpr ~state (e : Parsetree.expression) cmtTbl =
            {pexp_desc = Pexp_constant (Pconst_string (name, _)); pexp_loc}; value;
          ];
     } ->
-      Some (Location.mkloc (Longident.Lident name) pexp_loc, value)
+      Some ((Location.mkloc (Longident.Lident name) pexp_loc, value), e)
     | _ -> None
   in
   let rows =
@@ -1409,7 +1409,9 @@ and printLiteralDictExpr ~state (e : Parsetree.expression) cmtTbl =
                 Doc.join
                   ~sep:(Doc.concat [Doc.text ","; Doc.line])
                   (List.map
-                     (fun row -> printBsObjectRow ~state row cmtTbl)
+                     (fun ((row, e): (Longident.t Location.loc * Parsetree.expression) * Parsetree.expression) ->
+                        let doc = printBsObjectRow ~state row cmtTbl in
+                        printComments doc cmtTbl e.pexp_loc)
                      rows);
               ]);
          Doc.trailingComma;

diff --git a/jscomp/syntax/tests/printer/expr/bsObj.res b/jscomp/syntax/tests/printer/expr/bsObj.res
@@ -56,3 +56,41 @@ React.jsx(
     {"data-foo": (\"data-foo": string)}
   }
 )
+
+// comments
+let x = {/* foo */ "foo": "bar"}
+let x = {"foo": /* foo */ "bar"}
+let x = {"foo": "bar" /* foo */ }
+
+let x = {
+	// foo
+	"foo": "bar",
+	// bar
+	"bar": "baz",
+	// baz
+	"baz": baz
+}
+
+let x = {
+	"foo": "bar", // foo
+	"bar": "baz", // bar
+	"baz": baz // baz
+}
+
+let x = {
+	"foo": /* foo */ "bar",
+	"bar": /* bar */ "baz",
+	"baz": /* bar */ baz
+}
+
+let x = {
+	/* foo */ "foo": "bar",
+	/* bar */ "bar": "baz",
+	/* bar */ "baz": baz
+}
+
+let x = {
+	"foo": "bar" /* foo */,
+	"bar": "baz" /* bar */,
+	"baz": baz /* bar */
+}
diff --git a/jscomp/syntax/tests/printer/expr/dict.res b/jscomp/syntax/tests/printer/expr/dict.res
@@ -24,4 +24,62 @@ let x = Js.Dict.fromArray([
 	("foo", "bar"),
 	("bar", "baz"),
 	("baz", baz)
+])
+
+// comments
+let x = dict{/* foo */ "foo": "bar"}
+let x = dict{"foo": /* foo */ "bar"}
+let x = dict{"foo": "bar" /* foo */ }
+
+let x = dict{
+	// foo
+	"foo": "bar",
+	// bar
+	"bar": "baz",
+	// baz
+	"baz": baz
+}
+
+let x = dict{
+	"foo": "bar", // foo
+	"bar": "baz", // bar
+	"baz": baz // baz
+}
+
+let x = dict{
+	"foo": /* foo */ "bar",
+	"bar": /* bar */ "baz",
+	"baz": /* bar */ baz
+}
+
+let x = dict{
+	/* foo */ "foo": "bar",
+	/* bar */ "bar": "baz",
+	/* bar */ "baz": baz
+}
+
+let x = dict{
+	"foo": "bar" /* foo */,
+	"bar": "baz" /* bar */,
+	"baz": baz /* bar */
+}
+
+let x = Js.Dict.fromArray([/* foo */ ("foo", "bar"), /* bar */ ("bar", "baz")])
+let x = Js.Dict.fromArray([(/* foo */ "foo", "bar"), (/* bar */"bar", "baz"), (/* baz */ "baz", baz)])
+let x = Js.Dict.fromArray([("foo", /* foo */"bar"), ("bar", /* bar */"baz"), ("baz", /* baz */baz)])
+let x = Js.Dict.fromArray([("foo", "bar" /* foo */), ("bar", "baz" /* bar */), ("baz", baz /* baz */)])
+
+let x = Js.Dict.fromArray([
+	// foo
+	("foo", "bar"),
+	// bar
+	("bar", "baz"),
+	// baz
+	("baz", baz)
+])
+
+let x = Js.Dict.fromArray([
+	("foo", "bar"), // foo
+	("bar", "baz"), // bar
+	("baz", baz) // baz
 ])
diff --git a/jscomp/syntax/tests/printer/expr/expected/bsObj.res.txt b/jscomp/syntax/tests/printer/expr/expected/bsObj.res.txt
@@ -60,3 +60,41 @@ React.jsx(
     {"data-foo": (\"data-foo": string)}
   },
 )
+
+// comments
+let x = {/* foo */ "foo": "bar"}
+let x = {"foo": /* foo */ "bar"}
+let x = {"foo": "bar" /* foo */}
+
+let x = {
+  // foo
+  "foo": "bar",
+  // bar
+  "bar": "baz",
+  // baz
+  "baz": baz,
+}
+
+let x = {
+  "foo": "bar", // foo
+  "bar": "baz", // bar
+  "baz": baz, // baz
+}
+
+let x = {
+  "foo": /* foo */ "bar",
+  "bar": /* bar */ "baz",
+  "baz": /* bar */ baz,
+}
+
+let x = {
+  /* foo */ "foo": "bar",
+  /* bar */ "bar": "baz",
+  /* bar */ "baz": baz,
+}
+
+let x = {
+  "foo": "bar" /* foo */,
+  "bar": "baz" /* bar */,
+  "baz": baz /* bar */,
+}
diff --git a/jscomp/syntax/tests/printer/expr/expected/dict.res.txt b/jscomp/syntax/tests/printer/expr/expected/dict.res.txt
@@ -25,3 +25,61 @@ let x = dict{
   "bar": "baz",
   "baz": baz,
 }
+
+// comments
+let x = dict{/* foo */ "foo": "bar"}
+let x = dict{"foo": /* foo */ "bar"}
+let x = dict{"foo": "bar" /* foo */}
+
+let x = dict{
+  // foo
+  "foo": "bar",
+  // bar
+  "bar": "baz",
+  // baz
+  "baz": baz,
+}
+
+let x = dict{
+  "foo": "bar", // foo
+  "bar": "baz", // bar
+  "baz": baz, // baz
+}
+
+let x = dict{
+  "foo": /* foo */ "bar",
+  "bar": /* bar */ "baz",
+  "baz": /* bar */ baz,
+}
+
+let x = dict{
+  /* foo */ "foo": "bar",
+  /* bar */ "bar": "baz",
+  /* bar */ "baz": baz,
+}
+
+let x = dict{
+  "foo": "bar" /* foo */,
+  "bar": "baz" /* bar */,
+  "baz": baz /* bar */,
+}
+
+let x = dict{/* foo */ "foo": "bar", /* bar */ "bar": "baz"}
+let x = dict{/* foo */ "foo": "bar", /* bar */ "bar": "baz", /* baz */ "baz": baz}
+let x = dict{"foo": /* foo */ "bar", "bar": /* bar */ "baz", "baz": /* baz */ baz}
+let x = dict{"foo": "bar" /* foo */, "bar": "baz" /* bar */, "baz": baz /* baz */}
+
+let x = dict{
+  // foo
+  "foo": "bar",
+  // bar
+  "bar": "baz",
+  // baz
+  "baz": baz,
+}
+
+let x = dict{
+  "foo": "bar", // foo
+  "bar": "baz", // bar
+  "baz": baz, // baz
+}