glayzzle#511 - "const" into classconstant node

Author: ichiriac

src/parser/class.js

@@ -178,10 +178,10 @@ module.exports = {
    * ```
    */
   read_constant_list: function(flags) {
+    const result = this.node("classconstant");
     if (this.expect(this.tok.T_CONST)) {
       this.next();
     }
-    const result = this.node("classconstant");
     const items = this.read_list(
       /**
        * Reads a constant declaration

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

@@ -816,11 +816,11 @@ Program {
                   "line": 31,
                   "offset": 561,
                 },
-                "source": "FOOBAR = 'BARFOO'",
+                "source": "const FOOBAR = 'BARFOO'",
                 "start": Position {
-                  "column": 10,
+                  "column": 4,
                   "line": 31,
-                  "offset": 544,
+                  "offset": 538,
                 },
               },
               "visibility": "",

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

@@ -10972,6 +10972,137 @@ Program {
 }
 `;
 
+exports[`Test locations test start location for class constants 1`] = `
+Program {
+  "children": Array [
+    Class {
+      "body": Array [
+        ClassConstant {
+          "constants": Array [
+            Constant {
+              "kind": "constant",
+              "loc": Location {
+                "end": Position {
+                  "column": 25,
+                  "line": 1,
+                  "offset": 25,
+                },
+                "source": "bar = 1",
+                "start": Position {
+                  "column": 18,
+                  "line": 1,
+                  "offset": 18,
+                },
+              },
+              "name": Identifier {
+                "kind": "identifier",
+                "loc": Location {
+                  "end": Position {
+                    "column": 21,
+                    "line": 1,
+                    "offset": 21,
+                  },
+                  "source": "bar",
+                  "start": Position {
+                    "column": 18,
+                    "line": 1,
+                    "offset": 18,
+                  },
+                },
+                "name": "bar",
+              },
+              "value": Number {
+                "kind": "number",
+                "loc": Location {
+                  "end": Position {
+                    "column": 25,
+                    "line": 1,
+                    "offset": 25,
+                  },
+                  "source": "1",
+                  "start": Position {
+                    "column": 24,
+                    "line": 1,
+                    "offset": 24,
+                  },
+                },
+                "value": "1",
+              },
+            },
+          ],
+          "kind": "classconstant",
+          "loc": Location {
+            "end": Position {
+              "column": 25,
+              "line": 1,
+              "offset": 25,
+            },
+            "source": "const bar = 1",
+            "start": Position {
+              "column": 12,
+              "line": 1,
+              "offset": 12,
+            },
+          },
+          "visibility": "",
+        },
+      ],
+      "extends": null,
+      "implements": null,
+      "isAbstract": false,
+      "isAnonymous": false,
+      "isFinal": false,
+      "kind": "class",
+      "loc": Location {
+        "end": Position {
+          "column": 28,
+          "line": 1,
+          "offset": 28,
+        },
+        "source": "class foo { const bar = 1; }",
+        "start": Position {
+          "column": 0,
+          "line": 1,
+          "offset": 0,
+        },
+      },
+      "name": Identifier {
+        "kind": "identifier",
+        "loc": Location {
+          "end": Position {
+            "column": 9,
+            "line": 1,
+            "offset": 9,
+          },
+          "source": "foo",
+          "start": Position {
+            "column": 6,
+            "line": 1,
+            "offset": 6,
+          },
+        },
+        "name": "foo",
+      },
+    },
+  ],
+  "errors": Array [],
+  "kind": "program",
+  "loc": Location {
+    "end": Position {
+      "column": 28,
+      "line": 1,
+      "offset": 28,
+    },
+    "source": "class foo { const bar = 1; }",
+    "start": Position {
+      "column": 0,
+      "line": 1,
+      "offset": 0,
+    },
+  },
+}
+`;
+
 exports[`Test locations test static 1`] = `
 Program {
   "children": Array [

test/snapshot/location.test.js

@@ -207,7 +207,8 @@ string";`
         `
     ],
     ["assign []", `$var[] = $var`],
-    ["single call", `call();`]
+    ["single call", `call();`],
+    ["start location for class constants", "class foo { const bar = 1; }"]
   ])("test %s", (_, code) => {
     expect(
       parser.parseEval(code, {