fix: location for expressionstatement (#404)

Author: evilebottnawi

src/ast.js

@@ -336,6 +336,8 @@ AST.prototype.resolvePrecedence = function(result, parser) {
       this.swapLocations(buffer, buffer.left, buffer.right, parser);
       result = buffer;
     }
+  } else if (result.kind === "expressionstatement") {
+    this.swapLocations(result, result.expression, result, parser);
   }
   return result;
 };

test/snapshot/__snapshots__/comment.test.js.snap

@@ -435,11 +435,11 @@ Program {
           "line": 3,
           "offset": 18,
         },
-        "source": "();",
+        "source": "foo();",
         "start": Position {
-          "column": 3,
+          "column": 0,
           "line": 3,
-          "offset": 15,
+          "offset": 12,
         },
       },
     },
@@ -528,11 +528,11 @@ Program {
           "line": 5,
           "offset": 45,
         },
-        "source": "() /* inner */ ;",
+        "source": "bar() /* inner */ ;",
         "start": Position {
-          "column": 3,
+          "column": 0,
           "line": 5,
-          "offset": 29,
+          "offset": 26,
         },
       },
       "trailingComments": Array [

test/snapshot/__snapshots__/location.test.js.snap

@@ -10026,6 +10026,79 @@ Program {
 }
 `;
 
+exports[`Test locations single call 1`] = `
+Program {
+  "children": Array [
+    ExpressionStatement {
+      "expression": Call {
+        "arguments": Array [],
+        "kind": "call",
+        "loc": Location {
+          "end": Position {
+            "column": 7,
+            "line": 1,
+            "offset": 7,
+          },
+          "source": "call();",
+          "start": Position {
+            "column": 0,
+            "line": 1,
+            "offset": 0,
+          },
+        },
+        "what": ClassReference {
+          "kind": "classreference",
+          "loc": Location {
+            "end": Position {
+              "column": 4,
+              "line": 1,
+              "offset": 4,
+            },
+            "source": "call",
+            "start": Position {
+              "column": 0,
+              "line": 1,
+              "offset": 0,
+            },
+          },
+          "name": "call",
+          "resolution": "uqn",
+        },
+      },
+      "kind": "expressionstatement",
+      "loc": Location {
+        "end": Position {
+          "column": 7,
+          "line": 1,
+          "offset": 7,
+        },
+        "source": "call();",
+        "start": Position {
+          "column": 0,
+          "line": 1,
+          "offset": 0,
+        },
+      },
+    },
+  ],
+  "errors": Array [],
+  "kind": "program",
+  "loc": Location {
+    "end": Position {
+      "column": 7,
+      "line": 1,
+      "offset": 7,
+    },
+    "source": "call();",
+    "start": Position {
+      "column": 0,
+      "line": 1,
+      "offset": 0,
+    },
+  },
+}
+`;
+
 exports[`Test locations static 1`] = `
 Program {
   "children": Array [
@@ -12483,11 +12556,11 @@ Program {
           "line": 1,
           "offset": 14,
         },
-        "source": "(...$var);",
+        "source": "call(...$var);",
         "start": Position {
-          "column": 4,
+          "column": 0,
           "line": 1,
-          "offset": 4,
+          "offset": 0,
         },
       },
     },

test/snapshot/location.test.js

@@ -1168,4 +1168,14 @@ string";`,
       })
     ).toMatchSnapshot();
   });
+  it("single call", function() {
+    expect(
+      parser.parseEval(`call();`, {
+        ast: {
+          withPositions: true,
+          withSource: true
+        }
+      })
+    ).toMatchSnapshot();
+  });
 });