feat: better ast for encapsedpart (#420)

Author: evilebottnawi

src/ast/encapsedpart.js

@@ -12,15 +12,19 @@ const KIND = "encapsedpart";
  * Part of `Encapsed` node
  * @constructor EncapsedPart
  * @extends {Expression}
- * @property {Expression} what
+ * @property {Expression} expression
+ * @property {String} syntax
+ * @property {Boolean} curly
  */
 module.exports = Expression.extends(KIND, function EncapsedPart(
   expression,
+  syntax,
   curly,
   docs,
   location
 ) {
   Expression.apply(this, [KIND, docs, location]);
   this.expression = expression;
+  this.syntax = syntax;
   this.curly = curly;
 });

src/parser/scalar.js

@@ -201,6 +201,7 @@ module.exports = {
    */
   read_encapsed_string_item: function(isDoubleQuote) {
     const encapsedPart = this.node("encapsedpart");
+    let syntax = null;
     let curly = false;
     let result = this.node(),
       offset,
@@ -220,6 +221,8 @@ module.exports = {
         text
       );
     } else if (this.token === this.tok.T_DOLLAR_OPEN_CURLY_BRACES) {
+      syntax = 'simple';
+      curly = true;
       // dynamic variable name
       // https://github.com/php/php-src/blob/master/Zend/zend_language_parser.y#L1239
       name = null;
@@ -242,15 +245,16 @@ module.exports = {
         name = this.read_expr();
       }
       this.expect("}") && this.next();
-      result = result("variable", name, true);
+      result = result("variable", name);
     } else if (this.token === this.tok.T_CURLY_OPEN) {
       // expression
       // https://github.com/php/php-src/blob/master/Zend/zend_language_parser.y#L1246
-      curly = true;
+      syntax = 'complex';
       result.destroy();
       result = this.next().read_variable(false, false);
       this.expect("}") && this.next();
     } else if (this.token === this.tok.T_VARIABLE) {
+      syntax = 'simple';
       // plain variable
       // https://github.com/php/php-src/blob/master/Zend/zend_language_parser.y#L1231
       result.destroy();
@@ -284,7 +288,7 @@ module.exports = {
       result = result("string", false, value, false, value);
     }
 
-    return encapsedPart(result, curly);
+    return encapsedPart(result, syntax, curly);
   },
   /**
    * Reads an encapsed string

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

@@ -1081,6 +1081,7 @@ Program {
                                       "offset": 829,
                                     },
                                   },
+                                  "syntax": null,
                                 },
                                 EncapsedPart {
                                   "curly": false,
@@ -1116,6 +1117,7 @@ Program {
                                       "offset": 836,
                                     },
                                   },
+                                  "syntax": "simple",
                                 },
                                 EncapsedPart {
                                   "curly": false,
@@ -1153,6 +1155,7 @@ Program {
                                       "offset": 841,
                                     },
                                   },
+                                  "syntax": null,
                                 },
                                 EncapsedPart {
                                   "curly": false,
@@ -1188,6 +1191,7 @@ Program {
                                       "offset": 843,
                                     },
                                   },
+                                  "syntax": "simple",
                                 },
                                 EncapsedPart {
                                   "curly": false,
@@ -1225,6 +1229,7 @@ Program {
                                       "offset": 852,
                                     },
                                   },
+                                  "syntax": null,
                                 },
                               ],
                             },
@@ -6768,6 +6773,7 @@ next:
                               "offset": 2937,
                             },
                           },
+                          "syntax": null,
                         },
                       ],
                     },
@@ -6897,6 +6903,7 @@ next:
                             "offset": 2903,
                           },
                         },
+                        "syntax": null,
                       },
                     ],
                   },
@@ -7467,6 +7474,7 @@ BAZ
                       "offset": 3057,
                     },
                   },
+                  "syntax": null,
                 },
               ],
             },
@@ -7691,6 +7699,7 @@ FOO
                       "offset": 3134,
                     },
                   },
+                  "syntax": null,
                 },
               ],
             },

test/snapshot/__snapshots__/ast.test.js.snap

@@ -582,6 +582,7 @@ Program {
                 "value": "ls -larth",
               },
               "kind": "encapsedpart",
+              "syntax": null,
             },
           ],
         },