diff --git a/Cargo.lock b/Cargo.lock
index 344d12d8abe..ce100aa009a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2661,7 +2661,7 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_parser"
-version = "0.70.3"
+version = "0.70.4"
 dependencies = [
  "either",
  "enum_kind",
diff --git a/ecmascript/parser/Cargo.toml b/ecmascript/parser/Cargo.toml
index 61ad1dc86a9..d9e284ca755 100644
--- a/ecmascript/parser/Cargo.toml
+++ b/ecmascript/parser/Cargo.toml
@@ -7,7 +7,7 @@ include = ["Cargo.toml", "src/**/*.rs", "examples/**/*.rs"]
 license = "Apache-2.0/MIT"
 name = "swc_ecma_parser"
 repository = "https://github.com/swc-project/swc.git"
-version = "0.70.3"
+version = "0.70.4"
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/ecmascript/parser/src/error.rs b/ecmascript/parser/src/error.rs
index f3db83dbe37..a845c4a437a 100644
--- a/ecmascript/parser/src/error.rs
+++ b/ecmascript/parser/src/error.rs
@@ -308,7 +308,7 @@ impl SyntaxError {
             SyntaxError::ReservedWordInImport => "cannot import as reserved word".into(),
             SyntaxError::AssignProperty => "assignment property is invalid syntax".into(),
             SyntaxError::Expected(token, ref got) => {
-                format!("Expected {:?}, got {}", token, got).into()
+                format!("Expected '{:?}', got '{}'", token, got).into()
             }
             SyntaxError::ExpectedSemiForExprStmt { .. } => "Expected ';', '}' or <eof>".into(),
 
diff --git a/ecmascript/parser/tests/test262-error-references/fail/08fa65d2ecddcfbe.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/08fa65d2ecddcfbe.js.stderr
index a296c3892e3..d3b0cdf4b23 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/08fa65d2ecddcfbe.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/08fa65d2ecddcfbe.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ,, got {
+error: Expected ',', got '{'
  --> $DIR/tests/test262-parser/fail/08fa65d2ecddcfbe.js:1:13
   |
 1 | ({ set: s() { } })
diff --git a/ecmascript/parser/tests/test262-error-references/fail/0a225effb5493c00.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/0a225effb5493c00.js.stderr
index 97da4274d8b..9d2f7ffef8d 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/0a225effb5493c00.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/0a225effb5493c00.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ;, got numeric literal
+error: Expected ';', got 'numeric literal'
  --> $DIR/tests/test262-parser/fail/0a225effb5493c00.js:1:15
   |
 1 | for (const of 42);
diff --git a/ecmascript/parser/tests/test262-error-references/fail/0ddab4a1a651034c.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/0ddab4a1a651034c.js.stderr
index 1aefd916456..8321a483f64 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/0ddab4a1a651034c.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/0ddab4a1a651034c.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ;, got )
+error: Expected ';', got ')'
  --> $DIR/tests/test262-parser/fail/0ddab4a1a651034c.js:1:24
   |
 1 | for (let x = 42 in list) process(x);
diff --git a/ecmascript/parser/tests/test262-error-references/fail/143481afd6573e9b.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/143481afd6573e9b.js.stderr
index fe388a34ae6..811fceb0910 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/143481afd6573e9b.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/143481afd6573e9b.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ,, got .
+error: Expected ',', got '.'
  --> $DIR/tests/test262-parser/fail/143481afd6573e9b.js:1:18
   |
 1 | function* a({e: a.b}) {}
diff --git a/ecmascript/parser/tests/test262-error-references/fail/154f02d86fce5e81.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/154f02d86fce5e81.js.stderr
index 5a9a96d57c1..c6b4e0adc66 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/154f02d86fce5e81.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/154f02d86fce5e81.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ;, got )
+error: Expected ';', got ')'
  --> $DIR/tests/test262-parser/fail/154f02d86fce5e81.js:1:22
   |
 1 | for (const x = 0 in y){}
diff --git a/ecmascript/parser/tests/test262-error-references/fail/16947dc1d11e5e70.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/16947dc1d11e5e70.js.stderr
index 5cf82e10410..f0b6e3b8bfa 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/16947dc1d11e5e70.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/16947dc1d11e5e70.js.stderr
@@ -1,4 +1,4 @@
-error: Expected (, got yield
+error: Expected '(', got 'yield'
  --> $DIR/tests/test262-parser/fail/16947dc1d11e5e70.js:1:11
   |
 1 | (function*yield(){})
diff --git a/ecmascript/parser/tests/test262-error-references/fail/1976350e287d5156.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/1976350e287d5156.js.stderr
index e0353c5e6c1..c9bcd853237 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/1976350e287d5156.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/1976350e287d5156.js.stderr
@@ -1,4 +1,4 @@
-error: Expected {, got +
+error: Expected '{', got '+'
  --> $DIR/tests/test262-parser/fail/1976350e287d5156.js:1:19
   |
 1 | class A extends a + b {}
diff --git a/ecmascript/parser/tests/test262-error-references/fail/1acada3c651821cf.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/1acada3c651821cf.js.stderr
index 5e2ac4d5d95..0733ef270d7 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/1acada3c651821cf.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/1acada3c651821cf.js.stderr
@@ -1,4 +1,4 @@
-error: Expected }, got ;
+error: Expected '}', got ';'
  --> $DIR/tests/test262-parser/fail/1acada3c651821cf.js:1:12
   |
 1 | `hello ${10;test`
diff --git a/ecmascript/parser/tests/test262-error-references/fail/1b0b9bca042d4440.module.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/1b0b9bca042d4440.module.js.stderr
index 63f912000ed..731ead49948 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/1b0b9bca042d4440.module.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/1b0b9bca042d4440.module.js.stderr
@@ -1,4 +1,4 @@
-error: Expected {, got numeric literal
+error: Expected '{', got 'numeric literal'
  --> $DIR/tests/test262-parser/fail/1b0b9bca042d4440.module.js:1:8
   |
 1 | export 3
diff --git a/ecmascript/parser/tests/test262-error-references/fail/1b2e164ac5015a12.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/1b2e164ac5015a12.js.stderr
index 1d54ca8abec..40a0388a044 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/1b2e164ac5015a12.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/1b2e164ac5015a12.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ,, got .
+error: Expected ',', got '.'
  --> $DIR/tests/test262-parser/fail/1b2e164ac5015a12.js:1:10
   |
 1 | ({a({e: a.b}){}})
diff --git a/ecmascript/parser/tests/test262-error-references/fail/1bc43dd97a16b9bb.module.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/1bc43dd97a16b9bb.module.js.stderr
index bf068eb77c5..3164cbaf02c 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/1bc43dd97a16b9bb.module.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/1bc43dd97a16b9bb.module.js.stderr
@@ -1,4 +1,4 @@
-error: Expected from, got ;
+error: Expected 'from', got ';'
  --> $DIR/tests/test262-parser/fail/1bc43dd97a16b9bb.module.js:1:10
   |
 1 | import {};
diff --git a/ecmascript/parser/tests/test262-error-references/fail/1bde73ba53c309c8.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/1bde73ba53c309c8.js.stderr
index ab556b3386d..679fe3a9ef9 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/1bde73ba53c309c8.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/1bde73ba53c309c8.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ], got iter
+error: Expected ']', got 'iter'
  --> $DIR/tests/test262-parser/fail/1bde73ba53c309c8.js:1:12
   |
 1 | ({ *[yield iter]() {} })
diff --git a/ecmascript/parser/tests/test262-error-references/fail/25b1013a4046bd70.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/25b1013a4046bd70.js.stderr
index 18d6b825a4a..b98195f2cbc 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/25b1013a4046bd70.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/25b1013a4046bd70.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ), got (
+error: Expected ')', got '('
  --> $DIR/tests/test262-parser/fail/25b1013a4046bd70.js:1:21
   |
 1 | try {} catch (answer()) {} 
diff --git a/ecmascript/parser/tests/test262-error-references/fail/26c0710a6449872a.module.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/26c0710a6449872a.module.js.stderr
index 10dd3266cd0..099d98e2a24 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/26c0710a6449872a.module.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/26c0710a6449872a.module.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ,, got b
+error: Expected ',', got 'b'
  --> $DIR/tests/test262-parser/fail/26c0710a6449872a.module.js:1:12
   |
 1 | export {as b} from a
diff --git a/ecmascript/parser/tests/test262-error-references/fail/2d1410e37ecc3647.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/2d1410e37ecc3647.js.stderr
index 5d1cf04a524..a427e02c87b 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/2d1410e37ecc3647.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/2d1410e37ecc3647.js.stderr
@@ -1,4 +1,4 @@
-error: Expected {, got <eof>
+error: Expected '{', got '<eof>'
  --> $DIR/tests/test262-parser/fail/2d1410e37ecc3647.js:1:23
   |
 1 | function f(a, ...b = 0)
diff --git a/ecmascript/parser/tests/test262-error-references/fail/3162394f5bc07198.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/3162394f5bc07198.js.stderr
index ccd5de7afa0..c4495594dda 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/3162394f5bc07198.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/3162394f5bc07198.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ;, got )
+error: Expected ';', got ')'
  --> $DIR/tests/test262-parser/fail/3162394f5bc07198.js:1:21
   |
 1 | for(const a = 0 in b);
diff --git a/ecmascript/parser/tests/test262-error-references/fail/33d43e9f01bda5ce.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/33d43e9f01bda5ce.js.stderr
index c98953760ad..47566381357 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/33d43e9f01bda5ce.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/33d43e9f01bda5ce.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ;, got )
+error: Expected ';', got ')'
  --> $DIR/tests/test262-parser/fail/33d43e9f01bda5ce.js:1:20
   |
 1 | for (let x = 0 in y){}
diff --git a/ecmascript/parser/tests/test262-error-references/fail/3425ca087ec1adb1.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/3425ca087ec1adb1.js.stderr
index 7f235c32146..f2e2e0378f5 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/3425ca087ec1adb1.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/3425ca087ec1adb1.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ,, got numeric literal
+error: Expected ',', got 'numeric literal'
  --> $DIR/tests/test262-parser/fail/3425ca087ec1adb1.js:1:19
   |
 1 | var {x: y = yield 3} = z;
diff --git a/ecmascript/parser/tests/test262-error-references/fail/369676814db0cbbf.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/369676814db0cbbf.js.stderr
index aaad2b81aa7..85239baa41e 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/369676814db0cbbf.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/369676814db0cbbf.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ,, got .
+error: Expected ',', got '.'
  --> $DIR/tests/test262-parser/fail/369676814db0cbbf.js:1:14
   |
 1 | ({set a({e: a.b}){}})
diff --git a/ecmascript/parser/tests/test262-error-references/fail/3a9fa392421db6dd.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/3a9fa392421db6dd.js.stderr
index 6828b29dbfe..048ad217640 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/3a9fa392421db6dd.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/3a9fa392421db6dd.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ], got ,
+error: Expected ']', got ','
  --> $DIR/tests/test262-parser/fail/3a9fa392421db6dd.js:1:5
   |
 1 | ({[a,b]:0})
diff --git a/ecmascript/parser/tests/test262-error-references/fail/45db351b2b07663a.module.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/45db351b2b07663a.module.js.stderr
index b9876a0a9af..1a41433b364 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/45db351b2b07663a.module.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/45db351b2b07663a.module.js.stderr
@@ -1,4 +1,4 @@
-error: Expected {, got /
+error: Expected '{', got '/'
  --> $DIR/tests/test262-parser/fail/45db351b2b07663a.module.js:1:8
   |
 1 | export / from a
diff --git a/ecmascript/parser/tests/test262-error-references/fail/49861fa3ca0ffc30.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/49861fa3ca0ffc30.js.stderr
index 2bfa4744e08..761cbde3923 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/49861fa3ca0ffc30.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/49861fa3ca0ffc30.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ;, got )
+error: Expected ';', got ')'
  --> $DIR/tests/test262-parser/fail/49861fa3ca0ffc30.js:1:15
   |
 1 | for ((i in {}));
diff --git a/ecmascript/parser/tests/test262-error-references/fail/4c7ea6a86bafaf0f.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/4c7ea6a86bafaf0f.js.stderr
index edaeb8f4dd5..70bb99964cd 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/4c7ea6a86bafaf0f.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/4c7ea6a86bafaf0f.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ,, got .
+error: Expected ',', got '.'
  --> $DIR/tests/test262-parser/fail/4c7ea6a86bafaf0f.js:1:17
   |
 1 | (function ({e: a.b}) {})
diff --git a/ecmascript/parser/tests/test262-error-references/fail/4daec155c0322d5e.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/4daec155c0322d5e.js.stderr
index a7ec413ac13..cded17180e9 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/4daec155c0322d5e.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/4daec155c0322d5e.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ,, got .
+error: Expected ',', got '.'
  --> $DIR/tests/test262-parser/fail/4daec155c0322d5e.js:1:17
   |
 1 | function a({e: a.b}) {}
diff --git a/ecmascript/parser/tests/test262-error-references/fail/537c4a516d7c8d7f.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/537c4a516d7c8d7f.js.stderr
index d9901bba57f..7f201be4c60 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/537c4a516d7c8d7f.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/537c4a516d7c8d7f.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ,, got .
+error: Expected ',', got '.'
  --> $DIR/tests/test262-parser/fail/537c4a516d7c8d7f.js:1:20
   |
 1 | try {} catch ({e: x.a}) {}
diff --git a/ecmascript/parser/tests/test262-error-references/fail/58707e130fe451a8.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/58707e130fe451a8.js.stderr
index de2c717508f..e2230b9d1d2 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/58707e130fe451a8.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/58707e130fe451a8.js.stderr
@@ -10,7 +10,7 @@ note: This is the expression part of an expression statement
 1 | void { [1, 2]: 3 };
   | ^^^^^^^^^^^^
 
-error: Expected ], got ,
+error: Expected ']', got ','
  --> $DIR/tests/test262-parser/fail/58707e130fe451a8.js:1:10
   |
 1 | void { [1, 2]: 3 };
diff --git a/ecmascript/parser/tests/test262-error-references/fail/5bbf7371c3c77f3c.module.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/5bbf7371c3c77f3c.module.js.stderr
index ef4c2582c18..7840bd2b713 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/5bbf7371c3c77f3c.module.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/5bbf7371c3c77f3c.module.js.stderr
@@ -1,4 +1,4 @@
-error: Expected from, got ;
+error: Expected 'from', got ';'
  --> $DIR/tests/test262-parser/fail/5bbf7371c3c77f3c.module.js:1:7
   |
 1 | import;
diff --git a/ecmascript/parser/tests/test262-error-references/fail/5fe7ff5c5cb5f438.module.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/5fe7ff5c5cb5f438.module.js.stderr
index cfe0324ace2..f10ed4925ef 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/5fe7ff5c5cb5f438.module.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/5fe7ff5c5cb5f438.module.js.stderr
@@ -1,4 +1,4 @@
-error: Expected from, got b
+error: Expected 'from', got 'b'
  --> $DIR/tests/test262-parser/fail/5fe7ff5c5cb5f438.module.js:1:11
   |
 1 | import a, b from 'a'
diff --git a/ecmascript/parser/tests/test262-error-references/fail/65a73ccacb2dc502.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/65a73ccacb2dc502.js.stderr
index e9796d949b7..0da0b8e2e5c 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/65a73ccacb2dc502.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/65a73ccacb2dc502.js.stderr
@@ -1,4 +1,4 @@
-error: Expected {, got [
+error: Expected '{', got '['
  --> $DIR/tests/test262-parser/fail/65a73ccacb2dc502.js:1:8
   |
 1 | (class [a] {})
diff --git a/ecmascript/parser/tests/test262-error-references/fail/6775a7f39c6b90fa.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/6775a7f39c6b90fa.js.stderr
index 7dd5f07a2ce..2b3ebefc521 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/6775a7f39c6b90fa.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/6775a7f39c6b90fa.js.stderr
@@ -1,4 +1,4 @@
-error: Expected {, got ;
+error: Expected '{', got ';'
  --> $DIR/tests/test262-parser/fail/6775a7f39c6b90fa.js:1:8
   |
 1 | class A;
diff --git a/ecmascript/parser/tests/test262-error-references/fail/6f7a5e4988b7d758.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/6f7a5e4988b7d758.js.stderr
index 207714a9636..6c0eebfb1ff 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/6f7a5e4988b7d758.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/6f7a5e4988b7d758.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ;, got numeric literal
+error: Expected ';', got 'numeric literal'
  --> $DIR/tests/test262-parser/fail/6f7a5e4988b7d758.js:1:12
   |
 1 | for(let of 0);
diff --git a/ecmascript/parser/tests/test262-error-references/fail/7464b0dfc4974a48.module.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/7464b0dfc4974a48.module.js.stderr
index 9a21a0b6039..7f28722df64 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/7464b0dfc4974a48.module.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/7464b0dfc4974a48.module.js.stderr
@@ -1,4 +1,4 @@
-error: Expected from, got ,
+error: Expected 'from', got ','
  --> $DIR/tests/test262-parser/fail/7464b0dfc4974a48.module.js:1:14
   |
 1 | import * as b, a from 'a'
diff --git a/ecmascript/parser/tests/test262-error-references/fail/78e777115c4cfcc2.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/78e777115c4cfcc2.js.stderr
index 247dadfa3d5..1cef799f29b 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/78e777115c4cfcc2.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/78e777115c4cfcc2.js.stderr
@@ -1,4 +1,4 @@
-error: Expected while, got *
+error: Expected 'while', got '*'
  --> $DIR/tests/test262-parser/fail/78e777115c4cfcc2.js:1:10
   |
 1 | do { x } *
diff --git a/ecmascript/parser/tests/test262-error-references/fail/7b70beed5a327548.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/7b70beed5a327548.js.stderr
index 9471f0fed6d..05c780559a4 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/7b70beed5a327548.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/7b70beed5a327548.js.stderr
@@ -1,4 +1,4 @@
-error: Expected (, got }
+error: Expected '(', got '}'
  --> $DIR/tests/test262-parser/fail/7b70beed5a327548.js:1:7
   |
 1 | ({ *a })
diff --git a/ecmascript/parser/tests/test262-error-references/fail/7f9bbf314145e16f.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/7f9bbf314145e16f.js.stderr
index baf3100ddb5..4d9602a7fc2 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/7f9bbf314145e16f.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/7f9bbf314145e16f.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ,, got numeric literal
+error: Expected ',', got 'numeric literal'
  --> $DIR/tests/test262-parser/fail/7f9bbf314145e16f.js:1:6
   |
 1 | ({}=>0)
diff --git a/ecmascript/parser/tests/test262-error-references/fail/831b4a1caf3c5a06.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/831b4a1caf3c5a06.js.stderr
index 46b7f02463b..2cb9abfd3e4 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/831b4a1caf3c5a06.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/831b4a1caf3c5a06.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ), got =
+error: Expected ')', got '='
  --> $DIR/tests/test262-parser/fail/831b4a1caf3c5a06.js:1:20
   |
 1 | try { } catch ([a] = []) { }
diff --git a/ecmascript/parser/tests/test262-error-references/fail/84633c379e4010bf.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/84633c379e4010bf.js.stderr
index 6b076adf353..2463596a68b 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/84633c379e4010bf.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/84633c379e4010bf.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ;, got .
+error: Expected ';', got '.'
  --> $DIR/tests/test262-parser/fail/84633c379e4010bf.js:1:29
   |
 1 | function *g() { return yield.x; }
diff --git a/ecmascript/parser/tests/test262-error-references/fail/888d17b2ef3b2afc.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/888d17b2ef3b2afc.js.stderr
index 3b703830b97..0f8cd59c563 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/888d17b2ef3b2afc.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/888d17b2ef3b2afc.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ,, got <eof>
+error: Expected ',', got '<eof>'
  --> $DIR/tests/test262-parser/fail/888d17b2ef3b2afc.js:1:9
   |
 1 | 1 + { t:t 
diff --git a/ecmascript/parser/tests/test262-error-references/fail/8ba15f5246ca756c.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/8ba15f5246ca756c.js.stderr
index db1a897df2f..cc87fae181e 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/8ba15f5246ca756c.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/8ba15f5246ca756c.js.stderr
@@ -1,4 +1,4 @@
-error: Expected }, got <eof>
+error: Expected '}', got '<eof>'
  --> $DIR/tests/test262-parser/fail/8ba15f5246ca756c.js:1:9
   |
 1 | class A {
diff --git a/ecmascript/parser/tests/test262-error-references/fail/8e93bcbd389c6bf6.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/8e93bcbd389c6bf6.js.stderr
index b4c8a509b5b..ba618fd5d6f 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/8e93bcbd389c6bf6.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/8e93bcbd389c6bf6.js.stderr
@@ -1,4 +1,4 @@
-error: Expected (, got :
+error: Expected '(', got ':'
  --> $DIR/tests/test262-parser/fail/8e93bcbd389c6bf6.js:1:8
   |
 1 | ({ *[0]: 0 })
diff --git a/ecmascript/parser/tests/test262-error-references/fail/943297e7b6314bd8.module.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/943297e7b6314bd8.module.js.stderr
index ff02d8b96ef..839d8f72c35 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/943297e7b6314bd8.module.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/943297e7b6314bd8.module.js.stderr
@@ -1,4 +1,4 @@
-error: Expected as, got As
+error: Expected 'as', got 'As'
  --> $DIR/tests/test262-parser/fail/943297e7b6314bd8.module.js:1:10
   |
 1 | import * As a from 'a'
diff --git a/ecmascript/parser/tests/test262-error-references/fail/96d7443d69f12eea.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/96d7443d69f12eea.js.stderr
index a18886913c2..1d48eb291e3 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/96d7443d69f12eea.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/96d7443d69f12eea.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ], got ,
+error: Expected ']', got ','
  --> $DIR/tests/test262-parser/fail/96d7443d69f12eea.js:1:8
   |
 1 | ({get[a,b]:0})
diff --git a/ecmascript/parser/tests/test262-error-references/fail/9767d9a6c9ea543c.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/9767d9a6c9ea543c.js.stderr
index cc710d38679..be290e4dddb 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/9767d9a6c9ea543c.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/9767d9a6c9ea543c.js.stderr
@@ -1,4 +1,4 @@
-error: Expected {, got ,
+error: Expected '{', got ','
  --> $DIR/tests/test262-parser/fail/9767d9a6c9ea543c.js:1:17
   |
 1 | (class extends a,b {})
diff --git a/ecmascript/parser/tests/test262-error-references/fail/98e0b4521b7ec370.module.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/98e0b4521b7ec370.module.js.stderr
index d9c6767569e..2237f4cb030 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/98e0b4521b7ec370.module.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/98e0b4521b7ec370.module.js.stderr
@@ -1,4 +1,4 @@
-error: Expected {, got ;
+error: Expected '{', got ';'
  --> $DIR/tests/test262-parser/fail/98e0b4521b7ec370.module.js:1:7
   |
 1 | export;
diff --git a/ecmascript/parser/tests/test262-error-references/fail/9c9196e04a0615c0.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/9c9196e04a0615c0.js.stderr
index 28a9c62bceb..e4925dfaabd 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/9c9196e04a0615c0.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/9c9196e04a0615c0.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ,, got {
+error: Expected ',', got '{'
  --> $DIR/tests/test262-parser/fail/9c9196e04a0615c0.js:1:14
   |
 1 | ({ get: g(d) { } })
diff --git a/ecmascript/parser/tests/test262-error-references/fail/9c961739e5d9e2ff.module.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/9c961739e5d9e2ff.module.js.stderr
index b0cdaae2c4c..c4c4debaa3d 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/9c961739e5d9e2ff.module.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/9c961739e5d9e2ff.module.js.stderr
@@ -1,4 +1,4 @@
-error: Expected from, got From
+error: Expected 'from', got 'From'
  --> $DIR/tests/test262-parser/fail/9c961739e5d9e2ff.module.js:1:10
   |
 1 | export * From "a"
diff --git a/ecmascript/parser/tests/test262-error-references/fail/a02fdefc85b71fee.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/a02fdefc85b71fee.js.stderr
index fdce9b5c51e..80f8f41713a 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/a02fdefc85b71fee.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/a02fdefc85b71fee.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ,, got .
+error: Expected ',', got '.'
  --> $DIR/tests/test262-parser/fail/a02fdefc85b71fee.js:1:18
   |
 1 | (function* ({e: a.b}) {})
diff --git a/ecmascript/parser/tests/test262-error-references/fail/a069c2ecbeb0f43a.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/a069c2ecbeb0f43a.js.stderr
index 1fd34bafc9f..c058f3f9b21 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/a069c2ecbeb0f43a.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/a069c2ecbeb0f43a.js.stderr
@@ -1,4 +1,4 @@
-error: Expected }, got <eof>
+error: Expected '}', got '<eof>'
  --> $DIR/tests/test262-parser/fail/a069c2ecbeb0f43a.js:1:36
   |
 1 | switch (cond) { case 10: let a = 20; 
diff --git a/ecmascript/parser/tests/test262-error-references/fail/a31d1202f94df972.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/a31d1202f94df972.js.stderr
index 1e648ffd5f2..78a18ce2ea0 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/a31d1202f94df972.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/a31d1202f94df972.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ,, got .
+error: Expected ',', got '.'
  --> $DIR/tests/test262-parser/fail/a31d1202f94df972.js:1:10
   |
 1 | var {a: b.c} = 0;
diff --git a/ecmascript/parser/tests/test262-error-references/fail/aae75623a18fa153.module.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/aae75623a18fa153.module.js.stderr
index f920d34299b..67c384905de 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/aae75623a18fa153.module.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/aae75623a18fa153.module.js.stderr
@@ -1,4 +1,4 @@
-error: Expected from, got <eof>
+error: Expected 'from', got '<eof>'
  --> $DIR/tests/test262-parser/fail/aae75623a18fa153.module.js:1:9
   |
 1 | import {}
diff --git a/ecmascript/parser/tests/test262-error-references/fail/b1f1e599a3dcf9c5.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/b1f1e599a3dcf9c5.js.stderr
index 0d85ff665ac..21b608c3789 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/b1f1e599a3dcf9c5.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/b1f1e599a3dcf9c5.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ], got ,
+error: Expected ']', got ','
  --> $DIR/tests/test262-parser/fail/b1f1e599a3dcf9c5.js:1:10
   |
 1 | let [...a,] = 0
diff --git a/ecmascript/parser/tests/test262-error-references/fail/b996783239113de2.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/b996783239113de2.js.stderr
index c83dcf3eb0a..6aa42bb7f19 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/b996783239113de2.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/b996783239113de2.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ,, got ...
+error: Expected ',', got '...'
  --> $DIR/tests/test262-parser/fail/b996783239113de2.js:1:4
   |
 1 | (a ...b) => 0
diff --git a/ecmascript/parser/tests/test262-error-references/fail/c0d2e6ca2ab7f753.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/c0d2e6ca2ab7f753.js.stderr
index e65c7eece4a..a2afa214711 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/c0d2e6ca2ab7f753.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/c0d2e6ca2ab7f753.js.stderr
@@ -1,4 +1,4 @@
-error: Expected {, got numeric literal
+error: Expected '{', got 'numeric literal'
  --> $DIR/tests/test262-parser/fail/c0d2e6ca2ab7f753.js:1:20
   |
 1 | x = { get method() 42 }
diff --git a/ecmascript/parser/tests/test262-error-references/fail/c1a24e62e6724892.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/c1a24e62e6724892.js.stderr
index 36ce3a3dee9..6e3393cf08e 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/c1a24e62e6724892.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/c1a24e62e6724892.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ,, got .
+error: Expected ',', got '.'
  --> $DIR/tests/test262-parser/fail/c1a24e62e6724892.js:1:11
   |
 1 | ({*a({e: a.b}){}})
diff --git a/ecmascript/parser/tests/test262-error-references/fail/c75e9f5ea55611f3.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/c75e9f5ea55611f3.js.stderr
index f14a3523947..192a32cf415 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/c75e9f5ea55611f3.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/c75e9f5ea55611f3.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ;, got )
+error: Expected ';', got ')'
  --> $DIR/tests/test262-parser/fail/c75e9f5ea55611f3.js:1:23
   |
 1 | for(let x=1 in [1,2,3]) 0
diff --git a/ecmascript/parser/tests/test262-error-references/fail/ca3dd7ea0b4626dd.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/ca3dd7ea0b4626dd.js.stderr
index b79fdc4505d..b7c6cf9f981 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/ca3dd7ea0b4626dd.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/ca3dd7ea0b4626dd.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ,, got =>
+error: Expected ',', got '=>'
  --> $DIR/tests/test262-parser/fail/ca3dd7ea0b4626dd.js:1:23
   |
 1 | console.log(typeof () => {});
diff --git a/ecmascript/parser/tests/test262-error-references/fail/cee6d8878d1e6589.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/cee6d8878d1e6589.js.stderr
index 5348e226a9c..197e819672f 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/cee6d8878d1e6589.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/cee6d8878d1e6589.js.stderr
@@ -1,4 +1,4 @@
-error: Expected (, got :
+error: Expected '(', got ':'
  --> $DIR/tests/test262-parser/fail/cee6d8878d1e6589.js:1:6
   |
 1 | ({ *a: 0 })
diff --git a/ecmascript/parser/tests/test262-error-references/fail/ceeb9c1fda84ac72.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/ceeb9c1fda84ac72.js.stderr
index a9bee484947..9c41b28e2ea 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/ceeb9c1fda84ac72.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/ceeb9c1fda84ac72.js.stderr
@@ -1,4 +1,4 @@
-error: Expected (, got }
+error: Expected '(', got '}'
  --> $DIR/tests/test262-parser/fail/ceeb9c1fda84ac72.js:1:13
   |
 1 | ({a:function} = 0)
diff --git a/ecmascript/parser/tests/test262-error-references/fail/d4e259842c4520e1.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/d4e259842c4520e1.js.stderr
index 2ec1e8c8466..85e89e17e44 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/d4e259842c4520e1.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/d4e259842c4520e1.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ), got <eof>
+error: Expected ')', got '<eof>'
  --> $DIR/tests/test262-parser/fail/d4e259842c4520e1.js:1:5
   |
 1 | 1 + (
diff --git a/ecmascript/parser/tests/test262-error-references/fail/d5f84d71afd585da.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/d5f84d71afd585da.js.stderr
index 4907c0901b6..3b8150a4ede 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/d5f84d71afd585da.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/d5f84d71afd585da.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ,, got {
+error: Expected ',', got '{'
  --> $DIR/tests/test262-parser/fail/d5f84d71afd585da.js:1:17
   |
 1 | ({ set: s(a, b) { } })
diff --git a/ecmascript/parser/tests/test262-error-references/fail/d942f64886578d87.module.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/d942f64886578d87.module.js.stderr
index 27927248384..9ae03afe0ea 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/d942f64886578d87.module.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/d942f64886578d87.module.js.stderr
@@ -1,4 +1,4 @@
-error: Expected from, got <eof>
+error: Expected 'from', got '<eof>'
  --> $DIR/tests/test262-parser/fail/d942f64886578d87.module.js:1:1
   |
 1 | import
diff --git a/ecmascript/parser/tests/test262-error-references/fail/da4d9520d81ec621.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/da4d9520d81ec621.js.stderr
index e1e7b8d94b7..191588d38c5 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/da4d9520d81ec621.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/da4d9520d81ec621.js.stderr
@@ -1,4 +1,4 @@
-error: Expected {, got <eof>
+error: Expected '{', got '<eof>'
  --> $DIR/tests/test262-parser/fail/da4d9520d81ec621.js:1:7
   |
 1 | class A
diff --git a/ecmascript/parser/tests/test262-error-references/fail/dcdc6f42d4d981d6.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/dcdc6f42d4d981d6.js.stderr
index 1a70bb42a72..4772a0c2c6d 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/dcdc6f42d4d981d6.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/dcdc6f42d4d981d6.js.stderr
@@ -1,4 +1,4 @@
-error: Expected (, got .
+error: Expected '(', got '.'
  --> $DIR/tests/test262-parser/fail/dcdc6f42d4d981d6.js:1:3
   |
 1 | if.a;
diff --git a/ecmascript/parser/tests/test262-error-references/fail/e01265e2211e48b3.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/e01265e2211e48b3.js.stderr
index 3a3d79a933b..97e231c1b41 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/e01265e2211e48b3.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/e01265e2211e48b3.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ;, got )
+error: Expected ';', got ')'
  --> $DIR/tests/test262-parser/fail/e01265e2211e48b3.js:1:19
   |
 1 | for(let a = 0 in b);
diff --git a/ecmascript/parser/tests/test262-error-references/fail/e82474d52b99f1b7.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/e82474d52b99f1b7.js.stderr
index 8b3384ba85e..ed1f784687b 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/e82474d52b99f1b7.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/e82474d52b99f1b7.js.stderr
@@ -1,4 +1,4 @@
-error: Expected {, got numeric literal
+error: Expected '{', got 'numeric literal'
  --> $DIR/tests/test262-parser/fail/e82474d52b99f1b7.js:1:14
   |
 1 | function a() 1 // expression closure is not supported
diff --git a/ecmascript/parser/tests/test262-error-references/fail/e922f1c6f6e5fdef.module.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/e922f1c6f6e5fdef.module.js.stderr
index 103c73980b9..a98c441e4cc 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/e922f1c6f6e5fdef.module.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/e922f1c6f6e5fdef.module.js.stderr
@@ -1,4 +1,4 @@
-error: Expected (, got <eof>
+error: Expected '(', got '<eof>'
  --> $DIR/tests/test262-parser/fail/e922f1c6f6e5fdef.module.js:1:16
   |
 1 | export default function
diff --git a/ecmascript/parser/tests/test262-error-references/fail/e98777d7b4c239a8.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/e98777d7b4c239a8.js.stderr
index 2b9d9b775ea..2bc6d3b951b 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/e98777d7b4c239a8.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/e98777d7b4c239a8.js.stderr
@@ -1,4 +1,4 @@
-error: Expected (, got `
+error: Expected '(', got '`'
  --> $DIR/tests/test262-parser/fail/e98777d7b4c239a8.js:1:8
   |
 1 | switch `test`
diff --git a/ecmascript/parser/tests/test262-error-references/fail/ea9e5f218423bd4f.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/ea9e5f218423bd4f.js.stderr
index 71bdd36d078..8ea3b222a9a 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/ea9e5f218423bd4f.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/ea9e5f218423bd4f.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ], got ,
+error: Expected ']', got ','
  --> $DIR/tests/test262-parser/fail/ea9e5f218423bd4f.js:1:5
   |
 1 | ({[1,2]:3})
diff --git a/ecmascript/parser/tests/test262-error-references/fail/ec34d41ac5849c84.module.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/ec34d41ac5849c84.module.js.stderr
index 2a004187f78..f2259a82560 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/ec34d41ac5849c84.module.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/ec34d41ac5849c84.module.js.stderr
@@ -1,4 +1,4 @@
-error: Expected from, got /
+error: Expected 'from', got '/'
  --> $DIR/tests/test262-parser/fail/ec34d41ac5849c84.module.js:1:8
   |
 1 | import / as a from 'a'
diff --git a/ecmascript/parser/tests/test262-error-references/fail/ed0332c84e50834c.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/ed0332c84e50834c.js.stderr
index 228382cbf90..bfd802651be 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/ed0332c84e50834c.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/ed0332c84e50834c.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ], got ,
+error: Expected ']', got ','
  --> $DIR/tests/test262-parser/fail/ed0332c84e50834c.js:1:11
   |
 1 | (class {[a,b](){}})
diff --git a/ecmascript/parser/tests/test262-error-references/fail/ee9b2096b4e379a6.module.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/ee9b2096b4e379a6.module.js.stderr
index f49ae65e4b3..c5e48301a24 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/ee9b2096b4e379a6.module.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/ee9b2096b4e379a6.module.js.stderr
@@ -1,4 +1,4 @@
-error: Expected ,, got as
+error: Expected ',', got 'as'
  --> $DIR/tests/test262-parser/fail/ee9b2096b4e379a6.module.js:1:10
   |
 1 | import a as b from 'a'
diff --git a/ecmascript/parser/tests/test262-error-references/fail/f0ff9ff5dab859aa.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/f0ff9ff5dab859aa.js.stderr
index 75e6c88b71d..bc70348b108 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/f0ff9ff5dab859aa.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/f0ff9ff5dab859aa.js.stderr
@@ -1,4 +1,4 @@
-error: Expected {, got <eof>
+error: Expected '{', got '<eof>'
  --> $DIR/tests/test262-parser/fail/f0ff9ff5dab859aa.js:1:22
   |
 1 | function f(a, ...b, c)
diff --git a/ecmascript/parser/tests/test262-error-references/fail/fa6a6d04f835e4c2.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/fa6a6d04f835e4c2.js.stderr
index 43907a85947..ad73d845a13 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/fa6a6d04f835e4c2.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/fa6a6d04f835e4c2.js.stderr
@@ -1,4 +1,4 @@
-error: Expected {, got }
+error: Expected '{', got '}'
  --> $DIR/tests/test262-parser/fail/fa6a6d04f835e4c2.js:1:44
   |
 1 | class A { constructor() {} 'constructor'() }
diff --git a/ecmascript/parser/tests/test262-error-references/fail/fc75a023944da475.js.stderr b/ecmascript/parser/tests/test262-error-references/fail/fc75a023944da475.js.stderr
index fa98c067c04..fe2cb32217a 100644
--- a/ecmascript/parser/tests/test262-error-references/fail/fc75a023944da475.js.stderr
+++ b/ecmascript/parser/tests/test262-error-references/fail/fc75a023944da475.js.stderr
@@ -1,4 +1,4 @@
-error: Expected {, got v
+error: Expected '{', got 'v'
  --> $DIR/tests/test262-parser/fail/fc75a023944da475.js:1:23
   |
 1 | x = { set method(val) v = val }
diff --git a/ecmascript/parser/tests/typescript-errors/class/override-parameter-property/input.ts.stderr b/ecmascript/parser/tests/typescript-errors/class/override-parameter-property/input.ts.stderr
index 816ef1bdc31..3d1e5ff58dc 100644
--- a/ecmascript/parser/tests/typescript-errors/class/override-parameter-property/input.ts.stderr
+++ b/ecmascript/parser/tests/typescript-errors/class/override-parameter-property/input.ts.stderr
@@ -1,4 +1,4 @@
-error: Expected ,, got v
+error: Expected ',', got 'v'
  --> $DIR/tests/typescript-errors/class/override-parameter-property/input.ts:3:33
   |
 3 |   constructor(readonly override v: boolean)
diff --git a/ecmascript/parser/tests/typescript-errors/custom/const-enum-2/input.ts.stderr b/ecmascript/parser/tests/typescript-errors/custom/const-enum-2/input.ts.stderr
index ce64745cf9a..885e57c227b 100644
--- a/ecmascript/parser/tests/typescript-errors/custom/const-enum-2/input.ts.stderr
+++ b/ecmascript/parser/tests/typescript-errors/custom/const-enum-2/input.ts.stderr
@@ -1,4 +1,4 @@
-error: Expected ,, got Some(c)
+error: Expected ',', got 'Some(c)'
  --> $DIR/tests/typescript-errors/custom/const-enum-2/input.ts:4:5
   |
 4 |     c
diff --git a/ecmascript/parser/tests/typescript-errors/custom/const-enum/input.ts.stderr b/ecmascript/parser/tests/typescript-errors/custom/const-enum/input.ts.stderr
index d4f971855c5..b5f9a10b442 100644
--- a/ecmascript/parser/tests/typescript-errors/custom/const-enum/input.ts.stderr
+++ b/ecmascript/parser/tests/typescript-errors/custom/const-enum/input.ts.stderr
@@ -1,4 +1,4 @@
-error: Expected ,, got Some(g)
+error: Expected ',', got 'Some(g)'
  --> $DIR/tests/typescript-errors/custom/const-enum/input.ts:4:5
   |
 4 |     g = CONST
diff --git a/ecmascript/parser/tests/typescript-errors/decorators/type-arguments-invalid/input.ts.stderr b/ecmascript/parser/tests/typescript-errors/decorators/type-arguments-invalid/input.ts.stderr
index bbba515d7a8..bc5d9985564 100644
--- a/ecmascript/parser/tests/typescript-errors/decorators/type-arguments-invalid/input.ts.stderr
+++ b/ecmascript/parser/tests/typescript-errors/decorators/type-arguments-invalid/input.ts.stderr
@@ -1,4 +1,4 @@
-error: Expected (, got class
+error: Expected '(', got 'class'
  --> $DIR/tests/typescript-errors/decorators/type-arguments-invalid/input.ts:2:1
   |
 2 | class Test {}
diff --git a/ecmascript/parser/tests/typescript-errors/multiple-specifiers/export/input.ts.stderr b/ecmascript/parser/tests/typescript-errors/multiple-specifiers/export/input.ts.stderr
index 0d02af58e81..deff0235c97 100644
--- a/ecmascript/parser/tests/typescript-errors/multiple-specifiers/export/input.ts.stderr
+++ b/ecmascript/parser/tests/typescript-errors/multiple-specifiers/export/input.ts.stderr
@@ -1,4 +1,4 @@
-error: Expected ,, got b
+error: Expected ',', got 'b'
  --> $DIR/tests/typescript-errors/multiple-specifiers/export/input.ts:1:12
   |
 1 | export { a b c }
diff --git a/ecmascript/parser/tests/typescript-errors/multiple-specifiers/import/input.ts.stderr b/ecmascript/parser/tests/typescript-errors/multiple-specifiers/import/input.ts.stderr
index acf6fb6699e..40ee65673e5 100644
--- a/ecmascript/parser/tests/typescript-errors/multiple-specifiers/import/input.ts.stderr
+++ b/ecmascript/parser/tests/typescript-errors/multiple-specifiers/import/input.ts.stderr
@@ -1,4 +1,4 @@
-error: Expected ,, got b
+error: Expected ',', got 'b'
  --> $DIR/tests/typescript-errors/multiple-specifiers/import/input.ts:1:12
   |
 1 | import { a b c } from 'mod'
diff --git a/ecmascript/parser/tests/typescript-errors/type-only-import-equals-decl/named/input.ts.stderr b/ecmascript/parser/tests/typescript-errors/type-only-import-equals-decl/named/input.ts.stderr
index ca79d6bbfd1..d61b9f6ce6d 100644
--- a/ecmascript/parser/tests/typescript-errors/type-only-import-equals-decl/named/input.ts.stderr
+++ b/ecmascript/parser/tests/typescript-errors/type-only-import-equals-decl/named/input.ts.stderr
@@ -1,4 +1,4 @@
-error: Expected from, got =
+error: Expected 'from', got '='
  --> $DIR/tests/typescript-errors/type-only-import-equals-decl/named/input.ts:1:24
   |
 1 | import type { MyType } = require('commonjs-package')
diff --git a/ecmascript/parser/tests/typescript-errors/type-only-import-equals-decl/namespace/input.ts.stderr b/ecmascript/parser/tests/typescript-errors/type-only-import-equals-decl/namespace/input.ts.stderr
index efc9e224585..d98ed8e7706 100644
--- a/ecmascript/parser/tests/typescript-errors/type-only-import-equals-decl/namespace/input.ts.stderr
+++ b/ecmascript/parser/tests/typescript-errors/type-only-import-equals-decl/namespace/input.ts.stderr
@@ -1,4 +1,4 @@
-error: Expected from, got =
+error: Expected 'from', got '='
  --> $DIR/tests/typescript-errors/type-only-import-equals-decl/namespace/input.ts:1:25
   |
 1 | import type * as MyType = require('commonjs-package')