fix

Author: jorgsowa

src/parser/class.js

@@ -103,18 +103,18 @@ module.exports = {
         continue;
       }
 
+      const locStart = this.position();
+
       if (this.token === this.tok.T_ATTRIBUTE) {
         attrs = this.read_attr_list();
       }
 
-      const locStart = this.position();
-
       // read member flags
       const flags = this.read_member_flags(false);
 
       // check constant
       if (this.token === this.tok.T_CONST) {
-        const constants = this.read_constant_list(flags, attrs);
+        const constants = this.read_constant_list(flags, attrs, locStart);
         if (this.expect(";")) {
           this.next();
         }
@@ -150,7 +150,7 @@ module.exports = {
               this.token === this.tok.T_STRING)))
       ) {
         // reads a variable
-        const variables = this.read_variable_list(flags, attrs);
+        const variables = this.read_variable_list(flags, attrs, locStart);
         attrs = [];
         result = result.concat(variables);
       } else {
@@ -175,7 +175,7 @@ module.exports = {
    *  variable_list ::= (variable_declaration ',')* variable_declaration
    * ```
    */
-  read_variable_list(flags, attrs) {
+  read_variable_list(flags, attrs, locStart) {
     let property_statement = this.node("propertystatement");
 
     const properties = this.read_list(
@@ -232,6 +232,16 @@ module.exports = {
     );
 
     property_statement = property_statement(null, properties, flags);
+    if (locStart && property_statement.loc) {
+      property_statement.loc.start = locStart;
+      if (property_statement.loc.source) {
+        property_statement.loc.source = this.lexer._input.substr(
+          property_statement.loc.start.offset,
+          property_statement.loc.end.offset -
+            property_statement.loc.start.offset,
+        );
+      }
+    }
 
     // semicolons are found only for regular properties definitions.
     // Property hooks are terminated by a closing curly brace, }.
@@ -334,7 +344,7 @@ module.exports = {
    *  constant_list ::= T_CONST [type] (constant_declaration ',')* constant_declaration
    * ```
    */
-  read_constant_list(flags, attrs) {
+  read_constant_list(flags, attrs, locStart) {
     const result = this.node("classconstant");
     if (this.expect(this.tok.T_CONST)) {
       this.next();
@@ -378,7 +388,17 @@ module.exports = {
       ",",
     );
 
-    return result(null, items, flags, nullable, type, attrs || []);
+    const node = result(null, items, flags, nullable, type, attrs || []);
+    if (locStart && node.loc) {
+      node.loc.start = locStart;
+      if (node.loc.source) {
+        node.loc.source = this.lexer._input.substr(
+          node.loc.start.offset,
+          node.loc.end.offset - node.loc.start.offset,
+        );
+      }
+    }
+    return node;
   },
   /*
    * Read member flags
@@ -573,7 +593,7 @@ module.exports = {
 
       // check constant
       if (this.token === this.tok.T_CONST) {
-        const constants = this.read_constant_list(flags, attrs);
+        const constants = this.read_constant_list(flags, attrs, locStart);
         if (this.expect(";")) {
           this.next();
         }
@@ -592,7 +612,7 @@ module.exports = {
           this.next();
         }
       } else if (this.token === this.tok.T_STRING) {
-        result.push(this.read_variable_list(flags, attrs));
+        result.push(this.read_variable_list(flags, attrs, locStart));
       } else {
         // raise an error
         this.error([this.tok.T_CONST, this.tok.T_FUNCTION, this.tok.T_STRING]);

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

@@ -841,14 +841,14 @@ Program {
                   "line": 35,
                   "offset": 648,
                 },
-                "source": "$dwarf = [
+                "source": "protected $dwarf = [
       'sneezy' => 'achoum',
       'bashful' => 'tadah'
     ]",
                 "start": Position {
-                  "column": 14,
+                  "column": 4,
                   "line": 32,
-                  "offset": 577,
+                  "offset": 567,
                 },
               },
               "properties": [

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

@@ -3838,11 +3838,11 @@ Program {
               "line": 1,
               "offset": 32,
             },
-            "source": "const BAR = 1",
+            "source": "public const BAR = 1",
             "start": Position {
-              "column": 19,
+              "column": 12,
               "line": 1,
-              "offset": 19,
+              "offset": 12,
             },
           },
           "nullable": false,
@@ -4149,11 +4149,11 @@ Program {
               "line": 1,
               "offset": 44,
             },
-            "source": "const FOO = 1",
+            "source": "#[Deprecated] public const FOO = 1",
             "start": Position {
-              "column": 31,
+              "column": 10,
               "line": 1,
-              "offset": 31,
+              "offset": 10,
             },
           },
           "nullable": false,
@@ -4171,11 +4171,11 @@ Program {
               "line": 1,
               "offset": 61,
             },
-            "source": "$bar = 2",
+            "source": "public $bar = 2",
             "start": Position {
-              "column": 53,
+              "column": 46,
               "line": 1,
-              "offset": 53,
+              "offset": 46,
             },
           },
           "properties": [
@@ -12017,11 +12017,11 @@ Program {
               "line": 1,
               "offset": 36,
             },
-            "source": "$foo = 1",
+            "source": "#[Pure] protected $foo = 1",
             "start": Position {
-              "column": 28,
+              "column": 10,
               "line": 1,
-              "offset": 28,
+              "offset": 10,
             },
           },
           "properties": [
@@ -12131,11 +12131,11 @@ Program {
               "line": 1,
               "offset": 53,
             },
-            "source": "$bar = 2",
+            "source": "public $bar = 2",
             "start": Position {
-              "column": 45,
+              "column": 38,
               "line": 1,
-              "offset": 45,
+              "offset": 38,
             },
           },
           "properties": [

test/snapshot/__snapshots__/namespace.test.js.snap

@@ -271,9 +271,9 @@ Program {
                 },
                 "source": null,
                 "start": Position {
-                  "column": 15,
+                  "column": 8,
                   "line": 10,
-                  "offset": 184,
+                  "offset": 177,
                 },
               },
               "properties": [
@@ -811,9 +811,9 @@ Program {
                 },
                 "source": null,
                 "start": Position {
-                  "column": 15,
+                  "column": 8,
                   "line": 10,
-                  "offset": 184,
+                  "offset": 177,
                 },
               },
               "properties": [