chore: add object-shorthand eslint rule (#1159)

Author: czosel

eslint.config.mjs

@@ -31,6 +31,7 @@ export default [
     rules: {
       "prefer-const": "error",
       "no-var": "error",
+      "object-shorthand": "error",
       curly: ["error", "multi-line"],
     },
   },

src/lexer.js

@@ -180,7 +180,7 @@ Lexer.prototype.setInput = function (input) {
     first_encaps_node: false,
     // for backward compatible
     /* istanbul ignore next */
-    toString: function () {
+    toString() {
       this.label;
     },
   };

src/lexer/attribute.js

@@ -8,7 +8,7 @@
 module.exports = {
   attributeIndex: 0,
   attributeListDepth: {},
-  matchST_ATTRIBUTE: function () {
+  matchST_ATTRIBUTE() {
     let ch = this.input();
     if (this.is_WHITESPACE()) {
       do {

src/lexer/comments.js

@@ -9,7 +9,7 @@ module.exports = {
   /*
    * Reads a single line comment
    */
-  T_COMMENT: function () {
+  T_COMMENT() {
     while (this.offset < this.size) {
       const ch = this.input();
       if (ch === "\n" || ch === "\r") {
@@ -35,7 +35,7 @@ module.exports = {
   /*
    * Behaviour : https://github.com/php/php-src/blob/master/Zend/zend_language_scanner.l#L1927
    */
-  T_DOC_COMMENT: function () {
+  T_DOC_COMMENT() {
     let ch = this.input();
     let token = this.tok.T_COMMENT;
     if (ch === "*") {

src/lexer/initial.js

@@ -6,7 +6,7 @@
 "use strict";
 
 module.exports = {
-  nextINITIAL: function () {
+  nextINITIAL() {
     if (
       this.conditionStack.length > 1 &&
       this.conditionStack[this.conditionStack.length - 1] === "INITIAL"
@@ -18,7 +18,7 @@ module.exports = {
     }
     return this;
   },
-  matchINITIAL: function () {
+  matchINITIAL() {
     while (this.offset < this.size) {
       let ch = this.input();
       if (ch == "<") {

src/lexer/numbers.js

@@ -14,7 +14,7 @@ if (process.arch == "x64") {
 }
 
 module.exports = {
-  consume_NUM: function () {
+  consume_NUM() {
     let ch = this.yytext[0];
     let hasPoint = ch === ".";
     if (ch === "0") {
@@ -124,7 +124,7 @@ module.exports = {
     }
   },
   // read hexa
-  consume_HNUM: function () {
+  consume_HNUM() {
     while (this.offset < this.size) {
       const ch = this.input();
       if (!this.is_HEX()) {
@@ -135,7 +135,7 @@ module.exports = {
     return this.tok.T_LNUMBER;
   },
   // read a generic number
-  consume_LNUM: function () {
+  consume_LNUM() {
     while (this.offset < this.size) {
       const ch = this.input();
       if (!this.is_NUM()) {
@@ -146,7 +146,7 @@ module.exports = {
     return this.tok.T_LNUMBER;
   },
   // read binary
-  consume_BNUM: function () {
+  consume_BNUM() {
     let ch;
     while (this.offset < this.size) {
       ch = this.input();
@@ -158,7 +158,7 @@ module.exports = {
     return this.tok.T_LNUMBER;
   },
   // read an octal number
-  consume_ONUM: function () {
+  consume_ONUM() {
     while (this.offset < this.size) {
       const ch = this.input();
       if (!this.is_OCTAL()) {

src/lexer/property.js

@@ -6,7 +6,7 @@
 "use strict";
 
 module.exports = {
-  matchST_LOOKING_FOR_PROPERTY: function () {
+  matchST_LOOKING_FOR_PROPERTY() {
     let ch = this.input();
     if (ch === "-") {
       ch = this.input();
@@ -28,7 +28,7 @@ module.exports = {
     if (ch) this.unput(1);
     return false;
   },
-  matchST_LOOKING_FOR_VARNAME: function () {
+  matchST_LOOKING_FOR_VARNAME() {
     let ch = this.input();
 
     // SHIFT STATE
@@ -52,7 +52,7 @@ module.exports = {
     // stops looking for a varname and starts the scripting mode
     return false;
   },
-  matchST_VAR_OFFSET: function () {
+  matchST_VAR_OFFSET() {
     const ch = this.input();
     if (this.is_NUM_START()) {
       this.consume_NUM();

src/lexer/scripting.js

@@ -6,7 +6,7 @@
 "use strict";
 
 module.exports = {
-  matchST_IN_SCRIPTING: function () {
+  matchST_IN_SCRIPTING() {
     let ch = this.input();
     switch (ch) {
       case " ":
@@ -100,7 +100,7 @@ module.exports = {
     );
   },
 
-  T_WHITESPACE: function () {
+  T_WHITESPACE() {
     while (this.offset < this.size) {
       const ch = this.input();
       if (ch === " " || ch === "\t" || ch === "\n" || ch === "\r") {

src/lexer/strings.js

@@ -20,7 +20,7 @@ const valid_after_heredoc_73 = valid_after_heredoc.concat([
 ]);
 
 module.exports = {
-  T_CONSTANT_ENCAPSED_STRING: function () {
+  T_CONSTANT_ENCAPSED_STRING() {
     let ch;
     while (this.offset < this.size) {
       ch = this.input();
@@ -33,7 +33,7 @@ module.exports = {
     return this.tok.T_CONSTANT_ENCAPSED_STRING;
   },
   // check if matching a HEREDOC state
-  is_HEREDOC: function () {
+  is_HEREDOC() {
     const revert = this.offset;
     if (
       this._input[this.offset - 1] === "<" &&
@@ -97,7 +97,7 @@ module.exports = {
     this.offset = revert;
     return false;
   },
-  ST_DOUBLE_QUOTES: function () {
+  ST_DOUBLE_QUOTES() {
     let ch;
     while (this.offset < this.size) {
       ch = this.input();
@@ -141,7 +141,7 @@ module.exports = {
   },
 
   // check if its a DOC end sequence
-  isDOC_MATCH: function (offset, consumeLeadingSpaces) {
+  isDOC_MATCH(offset, consumeLeadingSpaces) {
     // @fixme : check if out of text limits
 
     // consumeLeadingSpaces is false happen DOC prematch END HEREDOC stage.
@@ -222,7 +222,7 @@ module.exports = {
    * Prematch the end of HEREDOC/NOWDOC end tag to preset the
    * context of this.heredoc_label
    */
-  prematch_ENDOFDOC: function () {
+  prematch_ENDOFDOC() {
     // reset heredoc
     this.heredoc_label.indentation_uses_spaces = false;
     this.heredoc_label.indentation = 0;
@@ -249,7 +249,7 @@ module.exports = {
     }
   },
 
-  matchST_NOWDOC: function () {
+  matchST_NOWDOC() {
     // edge case : empty now doc
     if (this.isDOC_MATCH(this.offset, true)) {
       // @fixme : never reached (may be caused by quotes)
@@ -275,7 +275,7 @@ module.exports = {
     return this.tok.T_ENCAPSED_AND_WHITESPACE;
   },
 
-  matchST_HEREDOC: function () {
+  matchST_HEREDOC() {
     // edge case : empty here doc
     let ch = this.input();
     if (this.isDOC_MATCH(this.offset, true)) {
@@ -347,7 +347,7 @@ module.exports = {
     return this.tok.T_ENCAPSED_AND_WHITESPACE;
   },
 
-  consume_VARIABLE: function () {
+  consume_VARIABLE() {
     this.consume_LABEL();
     const ch = this.input();
     if (ch == "[") {
@@ -371,7 +371,7 @@ module.exports = {
     return this.tok.T_VARIABLE;
   },
   // HANDLES BACKQUOTES
-  matchST_BACKQUOTE: function () {
+  matchST_BACKQUOTE() {
     let ch = this.input();
     if (ch === "$") {
       ch = this.input();
@@ -446,7 +446,7 @@ module.exports = {
     return this.tok.T_ENCAPSED_AND_WHITESPACE;
   },
 
-  matchST_DOUBLE_QUOTES: function () {
+  matchST_DOUBLE_QUOTES() {
     let ch = this.input();
     if (ch === "$") {
       ch = this.input();