Fix broken tests + add some more test cases

test/Esprima.Tests/Fixtures.cs

@@ -186,9 +186,27 @@ public void ExecuteTestCase(string fixture)
             expected = File.ReadAllText(failureFilePath);
             if (WriteBackExpectedTree && conversionOptions.TestCompatibilityMode == AstToJsonTestCompatibilityMode.None)
             {
-                var actual = ParseAndFormat(sourceType, script, parserOptions, parserFactory, conversionOptions);
-                if (!CompareTrees(actual, expected, metadata))
-                    File.WriteAllText(failureFilePath, actual);
+                try
+                {
+                    ParseAndFormat(sourceType, script, parserOptions, parserFactory, conversionOptions);
+                }
+                catch (ParserException ex)
+                {
+                    var expectedJsonObject = JObject.Parse(expected);
+
+                    var parseError = ex.Error!;
+                    var actualJsonObject = new JObject
+                    {
+                        ["index"] = parseError.Index,
+                        ["lineNumber"] = parseError.LineNumber,
+                        ["column"] = parseError.Column,
+                        ["message"] = ex.Message,
+                        ["description"] = parseError.Description,
+                    };
+
+                    if (!JToken.DeepEquals(expectedJsonObject, actualJsonObject))
+                        File.WriteAllText(failureFilePath, actualJsonObject.ToString(Formatting.None));
+                }
             }
         }
         else
@@ -292,6 +310,7 @@ private static FixtureMetadata CreateFrom(HashSet<string> flags)
                 IncludesLocation = flags.Contains("IncludesLocation"),
                 IncludesRange = flags.Contains("IncludesRange"),
                 IncludesLocationSource = flags.Contains("IncludesLocationSource"),
+                IncludesTokens = flags.Contains("IncludesTokens"),
                 IgnoresRegex = flags.Contains("IgnoresRegex"),
                 Skip = flags.Contains("Skip"),
             };
@@ -303,6 +322,7 @@ private FixtureMetadata() { }
         public bool IncludesLocation { get; init; }
         public bool IncludesRange { get; init; }
         public bool IncludesLocationSource { get; init; }
+        public bool IncludesTokens { get; init; }
         public bool IgnoresRegex { get; init; }
         public bool Skip { get; init; }
 
@@ -311,6 +331,7 @@ public AstToJsonOptions CreateConversionOptions(AstToJsonOptions defaultOptions)
             TestCompatibilityMode = TestCompatibilityMode,
             IncludeLineColumn = IncludesLocation,
             IncludeRange = IncludesRange,
+            IncludeTokens = IncludesTokens,
         };
     }
 }

test/Esprima.Tests/Fixtures/es2020/optional-chaining/invalid-optional-chaining-new-callee-with-args.failure.json

@@ -0,0 +1 @@
+{"index":8,"lineNumber":1,"column":9,"message":"Line 1: Invalid optional chain from new expression","description":"Invalid optional chain from new expression"}

test/Esprima.Tests/Fixtures/es2020/optional-chaining/invalid-optional-chaining-new-callee-with-args.js

@@ -0,0 +1 @@
+new a?.b()

test/Esprima.Tests/Fixtures/es2020/optional-chaining/invalid-optional-chaining-new-callee-without-args.failure.json

@@ -0,0 +1 @@
+{"index":8,"lineNumber":1,"column":9,"message":"Line 1: Invalid optional chain from new expression","description":"Invalid optional chain from new expression"}

test/Esprima.Tests/Fixtures/es2020/optional-chaining/invalid-optional-chaining-new-callee-without-args.js

@@ -0,0 +1 @@
+new a?.b

test/Esprima.Tests/Fixtures/es2020/optional-chaining/invalid-optional-chaining-new-construction.failure.json

@@ -0,0 +1 @@
+{"index":7,"lineNumber":1,"column":8,"message":"Line 1: Unexpected token (","description":"Unexpected token ("}

test/Esprima.Tests/Fixtures/es2020/optional-chaining/invalid-optional-chaining-new-construction.js

@@ -0,0 +1 @@
+new a?.()

test/Esprima.Tests/Fixtures/es2020/optional-chaining/invalid-optional-chaining-new-leading-paren.failure.json

@@ -0,0 +1 @@
+{"index":14,"lineNumber":1,"column":15,"message":"Line 1: Invalid optional chain from new expression","description":"Invalid optional chain from new expression"}

test/Esprima.Tests/Fixtures/es2020/optional-chaining/invalid-optional-chaining-new-leading-paren.js

@@ -0,0 +1 @@
+new  (a?.b)?.c

test/Esprima.Tests/Fixtures/es2020/optional-chaining/invalid-optional-chaining-super-call.failure.json

@@ -0,0 +1 @@
+{"index":46,"lineNumber":2,"column":26,"message":"Line 2: 'super' keyword unexpected here","description":"'super' keyword unexpected here"}

test/Esprima.Tests/Fixtures/es2020/optional-chaining/invalid-optional-chaining-super-call.js

@@ -0,0 +1,3 @@
+class B extends A {
+    constructor() { super?.(); }
+}

test/Esprima.Tests/Fixtures/es2020/optional-chaining/invalid-optional-chaining-super-member-access.failure.json

@@ -0,0 +1 @@
+{"index":50,"lineNumber":2,"column":30,"message":"Line 2: 'super' keyword unexpected here","description":"'super' keyword unexpected here"}

test/Esprima.Tests/Fixtures/es2020/optional-chaining/invalid-optional-chaining-super-member-access.js

@@ -0,0 +1,3 @@
+class B extends A {
+    get prop() { return super?.a; }
+}

test/Esprima.Tests/Fixtures/es2020/optional-chaining/optional-chaining-computed-property.js

@@ -1,4 +1,5 @@
 a?.['b'].c
 a.b?.['c']
-new a?.['b'].c
-new a.b?.['c']
+new (a?.['b'].c)
+new (a?.['b']).c
+new (a.b?.['c'])