Merge pull request #261 from SwiftFiddle/test

Fix experimental parser tests

Author: kishikawakatsumi

.github/workflows/test.yml

@@ -17,6 +17,7 @@ jobs:
           set -ex
           swift test
           (cd Resources/branch_release-5.9 && swift test)
+          (cd Resources/branch_main && swift test)
       - name: Build
         run: |
           set -ex

Resources/branch_main/Tests/Tests/Fixtures/test-1-1.json

@@ -22,20 +22,20 @@
         }
       },
       {
-        "name": "unexpectedBetweenStatementsAndEOFToken",
+        "name": "unexpectedBetweenStatementsAndEndOfFileToken",
         "value": {
           "text": "nil"
         }
       },
       {
-        "name": "eofToken",
+        "name": "endOfFileToken",
         "value": {
           "kind": "eof",
           "text": ""
         }
       },
       {
-        "name": "unexpectedAfterEOFToken",
+        "name": "unexpectedAfterEndOfFileToken",
         "value": {
           "text": "nil"
         }

Resources/branch_main/Tests/Tests/Fixtures/test-1-2.json

@@ -22,20 +22,20 @@
         }
       },
       {
-        "name": "unexpectedBetweenStatementsAndEOFToken",
+        "name": "unexpectedBetweenStatementsAndEndOfFileToken",
         "value": {
           "text": "nil"
         }
       },
       {
-        "name": "eofToken",
+        "name": "endOfFileToken",
         "value": {
           "kind": "eof",
           "text": "↲↲//␣Prints␣\"It's␣really␣warm.␣Don't␣forget␣to␣wear␣sunscreen.\""
         }
       },
       {
-        "name": "unexpectedAfterEOFToken",
+        "name": "unexpectedAfterEndOfFileToken",
         "value": {
           "text": "nil"
         }
@@ -862,20 +862,20 @@
     },
     "structure": [
       {
-        "name": "unexpectedBeforeOperatorToken",
+        "name": "unexpectedBeforeOperator",
         "value": {
           "text": "nil"
         }
       },
       {
-        "name": "operatorToken",
+        "name": "operator",
         "value": {
           "kind": "binaryOperator(\"<=\")",
           "text": "<=␣"
         }
       },
       {
-        "name": "unexpectedAfterOperatorToken",
+        "name": "unexpectedAfterOperator",
         "value": {
           "text": "nil"
         }
@@ -1930,20 +1930,20 @@
     },
     "structure": [
       {
-        "name": "unexpectedBeforeOperatorToken",
+        "name": "unexpectedBeforeOperator",
         "value": {
           "text": "nil"
         }
       },
       {
-        "name": "operatorToken",
+        "name": "operator",
         "value": {
           "kind": "binaryOperator(\">=\")",
           "text": ">=␣"
         }
       },
       {
-        "name": "unexpectedAfterOperatorToken",
+        "name": "unexpectedAfterOperator",
         "value": {
           "text": "nil"
         }

Resources/branch_main/Tests/Tests/Fixtures/test-1-3.html

@@ -5,8 +5,8 @@
 <span class='Token' data-title='import' data-content='keyword(SwiftSyntax.Keyword.import)' data-type='Token' data-range='{"startRow":1,"startColumn":1,"endRow":1,"endColumn":7}'>
 <span class='token keyword' data-title='import' data-content='keyword(SwiftSyntax.Keyword.import)' data-type='Token' data-range='{"startRow":1,"startColumn":1,"endRow":1,"endColumn":7}'>import</span>&nbsp;
 </span>
-<span class='AccessPath' data-title='Foundation' data-content='AccessPathSyntax' data-type='Syntax' data-range='{"startRow":1,"startColumn":8,"endRow":1,"endColumn":18}'>
-<span class='AccessPathComponent' data-title='Foundation' data-content='AccessPathComponentSyntax' data-type='Syntax' data-range='{"startRow":1,"startColumn":8,"endRow":1,"endColumn":18}'>
+<span class='ImportPath' data-title='Foundation' data-content='ImportPathSyntax' data-type='Syntax' data-range='{"startRow":1,"startColumn":8,"endRow":1,"endColumn":18}'>
+<span class='ImportPathComponent' data-title='Foundation' data-content='ImportPathComponentSyntax' data-type='Syntax' data-range='{"startRow":1,"startColumn":8,"endRow":1,"endColumn":18}'>
 <span class='Token' data-title='Foundation' data-content='identifier(&quot;Foundation&quot;)' data-type='Token' data-range='{"startRow":1,"startColumn":8,"endRow":1,"endColumn":18}'>
 <span class='token identifier' data-title='Foundation' data-content='identifier(&quot;Foundation&quot;)' data-type='Token' data-range='{"startRow":1,"startColumn":8,"endRow":1,"endColumn":18}'>Foundation</span>
 </span>
@@ -1155,4 +1155,4 @@
 <br>
 <span class='token eof' data-title='' data-content='eof' data-type='Token' data-range='{"startRow":45,"startColumn":1,"endRow":45,"endColumn":1}'></span>
 </span>
-</span>
+</span>