fix: broken code

Author: alexander-akait

.eslintrc.js

@@ -5,7 +5,7 @@ module.exports = {
     sourceType: "module"
   },
   plugins: ["prettier"],
-  extends: ["eslint:recommended", "prettier"],
+  extends: ["eslint:recommended"],
   env: {
     browser: true,
     node: true,

package.json

@@ -9,7 +9,7 @@
     "dist"
   ],
   "scripts": {
-    "lint": "prettier --write src/*.js src/**/*.js",
+    "lint": "eslint 'src/**/*.js'",
     "pretest": "npm run lint",
     "test": "jest",
     "prebuild": "npm run test",
@@ -58,7 +58,8 @@
     "babel-loader": "^7",
     "babel-preset-es2015": "^6",
     "coveralls": "^3",
-    "eslint-plugin-prettier": "^2.6.2",
+    "eslint": "^5.8.0",
+    "eslint-plugin-prettier": "^3.0.0",
     "jest": "^22.4",
     "jsdoc": "^3.5.5",
     "jsdoc-template": "github:braintree/jsdoc-template",

src/parser.js

@@ -355,7 +355,9 @@ parser.prototype.node = function(name) {
       docs = this._docs.slice(this._docIndex);
       this._docIndex = this._docs.length;
       if (this.debug) {
+        // eslint-disable-next-line no-console
         console.log(new Error("Append docs on " + name));
+        // eslint-disable-next-line no-console
         console.log(docs);
       }
     }

src/parser/expr.js

@@ -417,9 +417,9 @@ module.exports = {
       expr = this.read_scalar();
       if (expr.kind === "array" && expr.shortForm && this.token === "=") {
         // list assign
-        let list = this.node("list")(expr.items, true);
+        const list = this.node("list")(expr.items, true);
         if (expr.loc) list.loc = expr.loc;
-        let right = this.next().read_expr();
+        const right = this.next().read_expr();
         return result("assign", list, right, "=");
       } else {
         // see #189 - swap docs on nodes

src/parser/function.js

@@ -80,7 +80,7 @@ module.exports = {
       returnType = null,
       nullable = false;
     if (type !== 1) {
-      let nameNode = this.node("identifier");
+      const nameNode = this.node("identifier");
       if (type === 2) {
         if (
           this.token === this.tok.T_STRING ||
@@ -241,13 +241,12 @@ module.exports = {
    */
   read_type: function() {
     const result = this.node("typereference");
-    let type = null;
     if (this.token === this.tok.T_ARRAY || this.token === this.tok.T_CALLABLE) {
-      let type = this.text();
+      const type = this.text();
       this.next();
       return result(type);
     } else if (this.token === this.tok.T_STRING) {
-      let type = this.text();
+      const type = this.text();
       const backup = [this.token, this.lexer.getState()];
       this.next();
       if (

src/parser/statement.js

@@ -173,7 +173,6 @@ module.exports = {
    * Reads statements
    */
   read_statement: function() {
-    let result, expr, items, current, label;
     switch (this.token) {
       case "{":
         return this.read_code_block(false);
@@ -202,19 +201,20 @@ module.exports = {
       case this.tok.T_DOC_COMMENT:
         return this.read_doc_comment();
 
-      case this.tok.T_RETURN:
-        result = this.node("return");
-        expr = null;
+      case this.tok.T_RETURN: {
+        const result = this.node("return");
+        let expr = null;
         if (!this.next().is("EOS")) {
           expr = this.read_expr();
         }
         this.expectEndOfStatement();
         return result(expr);
+      }
 
       // https://github.com/php/php-src/blob/master/Zend/zend_language_parser.y#L429
       case this.tok.T_BREAK:
       case this.tok.T_CONTINUE: {
-        result = this.node(
+        const result = this.node(
           this.token === this.tok.T_CONTINUE ? "continue" : "break"
         );
         let level = null;
@@ -226,31 +226,33 @@ module.exports = {
         return result(level);
       }
 
-      case this.tok.T_GLOBAL:
-        result = this.node("global");
-        items = this.next().read_list(this.read_simple_variable, ",");
+      case this.tok.T_GLOBAL: {
+        const result = this.node("global");
+        const items = this.next().read_list(this.read_simple_variable, ",");
         this.expectEndOfStatement();
         return result(items);
+      }
 
-      case this.tok.T_STATIC:
-        current = [this.token, this.lexer.getState()];
-        result = this.node();
+      case this.tok.T_STATIC: {
+        const current = [this.token, this.lexer.getState()];
+        const result = this.node();
         if (this.next().token === this.tok.T_DOUBLE_COLON) {
           // static keyword for a class
           this.lexer.tokens.push(current);
-          expr = this.next().read_expr();
+          const expr = this.next().read_expr();
           this.expectEndOfStatement(expr);
           return result("expressionstatement", expr);
         }
         if (this.token === this.tok.T_FUNCTION) {
           return this.read_function(true, [0, 1, 0]);
         }
-        items = this.read_variable_declarations();
+        const items = this.read_variable_declarations();
         this.expectEndOfStatement();
         return result("static", items);
+      }
 
       case this.tok.T_ECHO: {
-        result = this.node("echo");
+        const result = this.node("echo");
         const text = this.text();
         const shortForm = text === "<?=" || text === "<%=";
         const expressions = this.next().read_list(this.read_expr, ",");
@@ -275,21 +277,22 @@ module.exports = {
             prevChar = "\r\n";
           }
         }
-        result = this.node("inline");
+        const result = this.node("inline");
         this.next();
         return result(value, fixFirstLine ? prevChar + value : value);
       }
 
-      case this.tok.T_UNSET:
-        result = this.node("unset");
+      case this.tok.T_UNSET: {
+        const result = this.node("unset");
         this.next().expect("(") && this.next();
         const variables = this.read_list(this.read_variable, ",");
         this.expect(")") && this.next();
         this.expect(";") && this.next();
         return result(variables);
+      }
 
       case this.tok.T_DECLARE: {
-        result = this.node("declare");
+        const result = this.node("declare");
         const body = [];
         let mode;
         this.next().expect("(") && this.next();
@@ -325,20 +328,23 @@ module.exports = {
       case this.tok.T_TRY:
         return this.read_try();
 
-      case this.tok.T_THROW:
-        result = this.node("throw");
-        expr = this.next().read_expr();
+      case this.tok.T_THROW: {
+        const result = this.node("throw");
+        const expr = this.next().read_expr();
         this.expectEndOfStatement();
         return result(expr);
+      }
 
-      case ";": // ignore this (extra ponctuation)
+      // ignore this (extra ponctuation)
+      case ";": {
         this.next();
         return null;
+      }
 
-      case this.tok.T_STRING:
-        let result = this.node();
-        current = [this.token, this.lexer.getState()];
-        label = this.text();
+      case this.tok.T_STRING: {
+        const result = this.node();
+        const current = [this.token, this.lexer.getState()];
+        const label = this.text();
         // AST : https://github.com/php/php-src/blob/master/Zend/zend_language_parser.y#L457
         if (this.next().token === ":") {
           this.next();
@@ -347,25 +353,28 @@ module.exports = {
 
         // default fallback expr / T_STRING '::' (etc...)
         this.lexer.tokens.push(current);
-        expr = this.next().read_expr();
+        const expr = this.next().read_expr();
         this.expectEndOfStatement();
         return expr;
+      }
 
-      case this.tok.T_GOTO:
-        result = this.node("goto");
-        label = null;
+      case this.tok.T_GOTO: {
+        const result = this.node("goto");
+        let label = null;
         if (this.next().expect(this.tok.T_STRING)) {
           label = this.text();
           this.next().expectEndOfStatement();
         }
         return result(label);
+      }
 
-      default:
+      default: {
         // default fallback expr
-        let statement = this.node("expressionstatement");
-        expr = this.read_expr();
+        const statement = this.node("expressionstatement");
+        const expr = this.read_expr();
         this.expectEndOfStatement(expr);
         return statement(expr);
+      }
     }
   },
   /**

src/parser/variable.js

@@ -175,7 +175,7 @@ module.exports = {
     encapsed,
     dereferencable
   ) {
-    let name, node, offset;
+    let node, offset;
     recursive_scan_loop: while (this.token != this.EOF) {
       switch (this.token) {
         case "(":

test/snapshot/__snapshots__/encapsed.test.js.snap

@@ -296,7 +296,7 @@ exports[`encapsed variable curly (simple syntax) 1`] = `
 Program {
   "children": Array [
     Echo {
-      "arguments": Array [
+      "expressions": Array [
         Encapsed {
           "kind": "encapsed",
           "raw": "\\"string \${var} string\\"",