babel · nicolo-ribaudo · Feb 1, 2021 · Dec 2, 2020 · Dec 2, 2020 · Dec 2, 2020
diff --git a/packages/babel-cli/test/fixtures/babel/stdin --filename windows/stderr.txt b/packages/babel-cli/test/fixtures/babel/stdin --filename windows/stderr.txt
@@ -1 +1 @@
-SyntaxError: <CWD>\test.js: Unexpected token, expected ";" (2:10)
+SyntaxError: <CWD>\test.js: Missing semicolon (2:10)
diff --git a/packages/babel-cli/test/fixtures/babel/stdin --filename/stderr.txt b/packages/babel-cli/test/fixtures/babel/stdin --filename/stderr.txt
@@ -1 +1 @@
-SyntaxError: <CWD>/test.js: Unexpected token, expected ";" (2:10)
+SyntaxError: <CWD>/test.js: Missing semicolon (2:10)
diff --git a/packages/babel-core/test/fixtures/transformation/errors/syntax/options.json b/packages/babel-core/test/fixtures/transformation/errors/syntax/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \";\" (2:10)"
+  "throws": "Missing semicolon (2:10)"
 }
diff --git a/packages/babel-parser/src/parser/error-message.js b/packages/babel-parser/src/parser/error-message.js
@@ -99,6 +99,7 @@ export const ErrorMessages = Object.freeze({
   MissingClassName: "A class name is required",
   MissingEqInAssignment:
     "Only '=' operator can be used for specifying default value.",
+  MissingSemicolon: "Missing semicolon",
   MissingUnicodeEscape: "Expecting Unicode escape sequence \\uXXXX",
   MixingCoalesceWithLogical:
     "Nullish coalescing operator(??) requires parens when mixing with logical operators",

diff --git a/packages/babel-parser/src/parser/statement.js b/packages/babel-parser/src/parser/statement.js
@@ -915,9 +915,9 @@ export default class StatementParser extends ExpressionParser {
     init: ?(N.VariableDeclaration | N.Expression),
   ): N.ForStatement {
     node.init = init;
-    this.expect(tt.semi);
+    this.semicolon(/* allowAsi */ false);
     node.test = this.match(tt.semi) ? null : this.parseExpression();
-    this.expect(tt.semi);
+    this.semicolon(/* allowAsi */ false);
     node.update = this.match(tt.parenR) ? null : this.parseExpression();
     this.expect(tt.parenR);
 

diff --git a/packages/babel-parser/src/parser/util.js b/packages/babel-parser/src/parser/util.js
@@ -105,8 +105,9 @@ export default class UtilParser extends Tokenizer {
   // Consume a semicolon, or, failing that, see if we are allowed to
   // pretend that there is a semicolon at this position.
 
-  semicolon(): void {
-    if (!this.isLineTerminator()) this.unexpected(null, tt.semi);
+  semicolon(allowAsi: boolean = true): void {
+    if (allowAsi ? this.isLineTerminator() : this.eat(tt.semi)) return;
+    this.raise(this.state.lastTokEnd, Errors.MissingSemicolon);
   }
 
   // Expect a token of a given type. If found, consume it, otherwise,

diff --git a/packages/babel-parser/test/fixtures/core/categorized/for-missing-semicolons/input.js b/packages/babel-parser/test/fixtures/core/categorized/for-missing-semicolons/input.js
@@ -0,0 +1,7 @@
+for (
+  var a = 1
+  a < 3
+  a++
+) {
+
+}
diff --git a/packages/babel-parser/test/fixtures/core/categorized/for-missing-semicolons/output.json b/packages/babel-parser/test/fixtures/core/categorized/for-missing-semicolons/output.json
@@ -0,0 +1,82 @@
+{
+  "type": "File",
+  "start":0,"end":38,"loc":{"start":{"line":1,"column":0},"end":{"line":7,"column":1}},
+  "errors": [
+    "SyntaxError: Missing semicolon (2:11)",
+    "SyntaxError: Missing semicolon (3:7)"
+  ],
+  "program": {
+    "type": "Program",
+    "start":0,"end":38,"loc":{"start":{"line":1,"column":0},"end":{"line":7,"column":1}},
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ForStatement",
+        "start":0,"end":38,"loc":{"start":{"line":1,"column":0},"end":{"line":7,"column":1}},
+        "init": {
+          "type": "VariableDeclaration",
+          "start":8,"end":17,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":11}},
+          "declarations": [
+            {
+              "type": "VariableDeclarator",
+              "start":12,"end":17,"loc":{"start":{"line":2,"column":6},"end":{"line":2,"column":11}},
+              "id": {
+                "type": "Identifier",
+                "start":12,"end":13,"loc":{"start":{"line":2,"column":6},"end":{"line":2,"column":7},"identifierName":"a"},
+                "name": "a"
+              },
+              "init": {
+                "type": "NumericLiteral",
+                "start":16,"end":17,"loc":{"start":{"line":2,"column":10},"end":{"line":2,"column":11}},
+                "extra": {
+                  "rawValue": 1,
+                  "raw": "1"
+                },
+                "value": 1
+              }
+            }
+          ],
+          "kind": "var"
+        },
+        "test": {
+          "type": "BinaryExpression",
+          "start":20,"end":25,"loc":{"start":{"line":3,"column":2},"end":{"line":3,"column":7}},
+          "left": {
+            "type": "Identifier",
+            "start":20,"end":21,"loc":{"start":{"line":3,"column":2},"end":{"line":3,"column":3},"identifierName":"a"},
+            "name": "a"
+          },
+          "operator": "<",
+          "right": {
+            "type": "NumericLiteral",
+            "start":24,"end":25,"loc":{"start":{"line":3,"column":6},"end":{"line":3,"column":7}},
+            "extra": {
+              "rawValue": 3,
+              "raw": "3"
+            },
+            "value": 3
+          }
+        },
+        "update": {
+          "type": "UpdateExpression",
+          "start":28,"end":31,"loc":{"start":{"line":4,"column":2},"end":{"line":4,"column":5}},
+          "operator": "++",
+          "prefix": false,
+          "argument": {
+            "type": "Identifier",
+            "start":28,"end":29,"loc":{"start":{"line":4,"column":2},"end":{"line":4,"column":3},"identifierName":"a"},
+            "name": "a"
+          }
+        },
+        "body": {
+          "type": "BlockStatement",
+          "start":34,"end":38,"loc":{"start":{"line":5,"column":2},"end":{"line":7,"column":1}},
+          "body": [],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/core/regression/octal-float-fail/options.json b/packages/babel-parser/test/fixtures/core/regression/octal-float-fail/options.json
diff --git a/packages/babel-parser/test/fixtures/core/regression/octal-float-fail/output.json b/packages/babel-parser/test/fixtures/core/regression/octal-float-fail/output.json
@@ -0,0 +1,42 @@
+{
+  "type": "File",
+  "start":0,"end":4,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":4}},
+  "errors": [
+    "SyntaxError: Missing semicolon (1:2)"
+  ],
+  "program": {
+    "type": "Program",
+    "start":0,"end":4,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":4}},
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start":0,"end":2,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":2}},
+        "expression": {
+          "type": "NumericLiteral",
+          "start":0,"end":2,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":2}},
+          "extra": {
+            "rawValue": 7,
+            "raw": "07"
+          },
+          "value": 7
+        }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start":2,"end":4,"loc":{"start":{"line":1,"column":2},"end":{"line":1,"column":4}},
+        "expression": {
+          "type": "NumericLiteral",
+          "start":2,"end":4,"loc":{"start":{"line":1,"column":2},"end":{"line":1,"column":4}},
+          "extra": {
+            "rawValue": 0.5,
+            "raw": ".5"
+          },
+          "value": 0.5
+        }
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/388/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/388/options.json
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/388/output.json b/packages/babel-parser/test/fixtures/core/uncategorised/388/output.json
@@ -0,0 +1,45 @@
+{
+  "type": "File",
+  "start":0,"end":9,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":9}},
+  "errors": [
+    "SyntaxError: Missing semicolon (1:5)"
+  ],
+  "program": {
+    "type": "Program",
+    "start":0,"end":9,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":9}},
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "BlockStatement",
+        "start":0,"end":9,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":9}},
+        "body": [
+          {
+            "type": "ExpressionStatement",
+            "start":2,"end":5,"loc":{"start":{"line":1,"column":2},"end":{"line":1,"column":5}},
+            "expression": {
+              "type": "Identifier",
+              "start":2,"end":5,"loc":{"start":{"line":1,"column":2},"end":{"line":1,"column":5},"identifierName":"set"},
+              "name": "set"
+            }
+          },
+          {
+            "type": "ExpressionStatement",
+            "start":6,"end":7,"loc":{"start":{"line":1,"column":6},"end":{"line":1,"column":7}},
+            "expression": {
+              "type": "NumericLiteral",
+              "start":6,"end":7,"loc":{"start":{"line":1,"column":6},"end":{"line":1,"column":7}},
+              "extra": {
+                "rawValue": 1,
+                "raw": "1"
+              },
+              "value": 1
+            }
+          }
+        ],
+        "directives": []
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/389/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/389/options.json
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/389/output.json b/packages/babel-parser/test/fixtures/core/uncategorised/389/output.json
@@ -0,0 +1,45 @@
+{
+  "type": "File",
+  "start":0,"end":9,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":9}},
+  "errors": [
+    "SyntaxError: Missing semicolon (1:5)"
+  ],
+  "program": {
+    "type": "Program",
+    "start":0,"end":9,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":9}},
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "BlockStatement",
+        "start":0,"end":9,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":9}},
+        "body": [
+          {
+            "type": "ExpressionStatement",
+            "start":2,"end":5,"loc":{"start":{"line":1,"column":2},"end":{"line":1,"column":5}},
+            "expression": {
+              "type": "Identifier",
+              "start":2,"end":5,"loc":{"start":{"line":1,"column":2},"end":{"line":1,"column":5},"identifierName":"get"},
+              "name": "get"
+            }
+          },
+          {
+            "type": "ExpressionStatement",
+            "start":6,"end":7,"loc":{"start":{"line":1,"column":6},"end":{"line":1,"column":7}},
+            "expression": {
+              "type": "NumericLiteral",
+              "start":6,"end":7,"loc":{"start":{"line":1,"column":6},"end":{"line":1,"column":7}},
+              "extra": {
+                "rawValue": 2,
+                "raw": "2"
+              },
+              "value": 2
+            }
+          }
+        ],
+        "directives": []
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/405/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/405/options.json
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/405/output.json b/packages/babel-parser/test/fixtures/core/uncategorised/405/output.json
@@ -0,0 +1,34 @@
+{
+  "type": "File",
+  "start":0,"end":4,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":4}},
+  "errors": [
+    "SyntaxError: Missing semicolon (1:1)"
+  ],
+  "program": {
+    "type": "Program",
+    "start":0,"end":4,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":4}},
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start":0,"end":1,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":1}},
+        "expression": {
+          "type": "Identifier",
+          "start":0,"end":1,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":1},"identifierName":"a"},
+          "name": "a"
+        }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start":2,"end":4,"loc":{"start":{"line":1,"column":2},"end":{"line":1,"column":4}},
+        "expression": {
+          "type": "Identifier",
+          "start":2,"end":3,"loc":{"start":{"line":1,"column":2},"end":{"line":1,"column":3},"identifierName":"b"},
+          "name": "b"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/407/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/407/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \";\" (1:2)"
-}
+  "throws": "Unexpected token, expected \"(\" (1:4)"
+}
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/408/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/408/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \";\" (1:2)"
-}
+  "throws": "A class name is required (1:7)"
+}
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/415/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/415/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \";\" (1:15)"
-}
+  "throws": "Unexpected token (1:15)"
+}
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/416/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/416/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \";\" (1:14)"
-}
+  "throws": "Unexpected token (1:14)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2015/arrow-functions/no-binary-left/options.json b/packages/babel-parser/test/fixtures/es2015/arrow-functions/no-binary-left/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \";\" (1:9)"
-}
+  "throws": "Unexpected token (1:9)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2015/arrow-functions/no-callee/options.json b/packages/babel-parser/test/fixtures/es2015/arrow-functions/no-callee/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \";\" (1:8)"
-}
+  "throws": "Unexpected token (1:9)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2015/arrow-functions/no-ternary-test/options.json b/packages/babel-parser/test/fixtures/es2015/arrow-functions/no-ternary-test/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \";\" (1:9)"
-}
+  "throws": "Unexpected token (1:9)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2015/for-of/invalid-escape-of/options.json b/packages/babel-parser/test/fixtures/es2015/for-of/invalid-escape-of/options.json