#381 - fix location on bin nodes

Author: ichiriac

src/ast.js

@@ -235,6 +235,7 @@ AST.prototype.resolvePrecedence = function(result, parser) {
           result.right = result.right.left;
           this.swapLocations(result, result.left, result.right, parser);
           buffer.left = this.resolvePrecedence(result, parser);
+          this.swapLocations(buffer, buffer.left, buffer.right, parser);
           result = buffer;
         }
       } else if (result.right.kind === "retif") {

test/ast.test.js

@@ -11,8 +11,8 @@ describe("Test AST class (edge cases)", function() {
         const ast = test.parseEval('echo $foo;');
         const echo = ast.children[0];
         expect(echo.loc.source).toBe("echo $foo;");
-        expect(echo.loc.start).toBeNull();
-        expect(echo.loc.end).toBeNull();
+        expect(echo.loc.start).not.toBeNull();
+        expect(echo.loc.end).not.toBeNull();
 
         const variable = echo.expressions[0];
         expect(variable.loc.source).toBe("$foo");

test/debug.js

@@ -17,12 +17,15 @@
 const util = require('util');
 const parser = require("../src/index");
 const ast = parser.parseEval(`
-$bar = &$foo;
+$a = 1
+  * // A
+  2
+  * // B
+  3;
 `, { 
     parser: {
       debug: true,
-      php73: true,
-      extractDoc: true
+      php73: true
     },
     ast: {
       withPositions: true,

test/snapshot/__snapshots__/acid.test.js.snap

@@ -3647,11 +3647,11 @@ Program {
                       "line": 85,
                       "offset": 1727,
                     },
-                    "source": "5 || false",
+                    "source": "rand(0, 10)>5 || false",
                     "start": Position {
-                      "column": 19,
+                      "column": 7,
                       "line": 85,
-                      "offset": 1717,
+                      "offset": 1705,
                     },
                   },
                   "right": Boolean {

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

@@ -473,21 +473,21 @@ Program {
             "line": 1,
             "offset": 22,
           },
-          "source": "$var2 + $var3;",
+          "source": "$var1 + $var2 + $var3;",
           "start": Position {
-            "column": 8,
+            "column": 0,
             "line": 1,
-            "offset": 8,
+            "offset": 0,
           },
         },
         "right": Variable {
           "curly": false,
           "kind": "variable",
           "loc": Location {
             "end": Position {
-              "column": 21,
+              "column": 22,
               "line": 1,
-              "offset": 21,
+              "offset": 22,
             },
             "source": "$var3",
             "start": Position {
@@ -2090,20 +2090,20 @@ Program {
             "line": 1,
             "offset": 19,
           },
-          "source": "$var + 2112;",
+          "source": "$var + $var + 2112;",
           "start": Position {
-            "column": 7,
+            "column": 0,
             "line": 1,
-            "offset": 7,
+            "offset": 0,
           },
         },
         "right": Number {
           "kind": "number",
           "loc": Location {
             "end": Position {
-              "column": 18,
+              "column": 19,
               "line": 1,
-              "offset": 18,
+              "offset": 19,
             },
             "source": "2112",
             "start": Position {
@@ -2214,21 +2214,21 @@ Program {
             "line": 1,
             "offset": 19,
           },
-          "source": "2112 + $var;",
+          "source": "$var + 2112 + $var;",
           "start": Position {
-            "column": 7,
+            "column": 0,
             "line": 1,
-            "offset": 7,
+            "offset": 0,
           },
         },
         "right": Variable {
           "curly": false,
           "kind": "variable",
           "loc": Location {
             "end": Position {
-              "column": 18,
+              "column": 19,
               "line": 1,
-              "offset": 18,
+              "offset": 19,
             },
             "source": "$var",
             "start": Position {