Skip to content

Commit 909dc4a

Browse files
kishikawakatsumikishikawakatsumi
authored
Merge pull request #259 from SwiftFiddle/test
Fix experimental parser tests
2 parents a1df82e + fd3ff47 commit 909dc4a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+5124
-5875
lines changed

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
run: |
1717
set -ex
1818
swift test
19+
(cd Resources/branch_release-5.9 && swift test)
1920
- name: Build
2021
run: |
2122
set -ex

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<span class='CodeBlockItemList' data-title='let number = 0' data-content='CodeBlockItemListSyntax' data-type='Syntax' data-range='{"startRow":1,"startColumn":1,"endRow":1,"endColumn":15}'>
33
<span class='CodeBlockItem' data-title='let number = 0' data-content='CodeBlockItemSyntax' data-type='Syntax' data-range='{"startRow":1,"startColumn":1,"endRow":1,"endColumn":15}'>
44
<span class='VariableDecl' data-title='let number = 0' data-content='VariableDeclSyntax' data-type='Syntax' data-range='{"startRow":1,"startColumn":1,"endRow":1,"endColumn":15}'>
5-
<span class='Token' data-title='let' data-content='letKeyword' data-type='Token' data-range='{"startRow":1,"startColumn":1,"endRow":1,"endColumn":4}'>
6-
<span class='token keyword' data-title='let' data-content='letKeyword' data-type='Token' data-range='{"startRow":1,"startColumn":1,"endRow":1,"endColumn":4}'>let</span>&nbsp;
5+
<span class='Token' data-title='let' data-content='keyword(SwiftSyntax.Keyword.let)' data-type='Token' data-range='{"startRow":1,"startColumn":1,"endRow":1,"endColumn":4}'>
6+
<span class='token keyword' data-title='let' data-content='keyword(SwiftSyntax.Keyword.let)' data-type='Token' data-range='{"startRow":1,"startColumn":1,"endRow":1,"endColumn":4}'>let</span>&nbsp;
77
</span>
88
<span class='PatternBindingList' data-title='number = 0' data-content='PatternBindingListSyntax' data-type='Syntax' data-range='{"startRow":1,"startColumn":5,"endRow":1,"endColumn":15}'>
99
<span class='PatternBinding' data-title='number = 0' data-content='PatternBindingSyntax' data-type='Syntax' data-range='{"startRow":1,"startColumn":5,"endRow":1,"endColumn":15}'>

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

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -106,19 +106,7 @@
106106
}
107107
},
108108
{
109-
"name": "unexpectedBetweenSemicolonAndErrorTokens",
110-
"value": {
111-
"text": "nil"
112-
}
113-
},
114-
{
115-
"name": "errorTokens",
116-
"value": {
117-
"text": "nil"
118-
}
119-
},
120-
{
121-
"name": "unexpectedAfterErrorTokens",
109+
"name": "unexpectedAfterSemicolon",
122110
"value": {
123111
"text": "nil"
124112
}
@@ -162,20 +150,20 @@
162150
}
163151
},
164152
{
165-
"name": "unexpectedBetweenModifiersAndLetOrVarKeyword",
153+
"name": "unexpectedBetweenModifiersAndBindingKeyword",
166154
"value": {
167155
"text": "nil"
168156
}
169157
},
170158
{
171-
"name": "letOrVarKeyword",
159+
"name": "bindingKeyword",
172160
"value": {
173-
"kind": "letKeyword",
161+
"kind": "keyword(SwiftSyntax.Keyword.let)",
174162
"text": "let␣"
175163
}
176164
},
177165
{
178-
"name": "unexpectedBetweenLetOrVarKeywordAndBindings",
166+
"name": "unexpectedBetweenBindingKeywordAndBindings",
179167
"value": {
180168
"text": "nil"
181169
}
@@ -209,7 +197,7 @@
209197
"structure": [],
210198
"text": "let",
211199
"token": {
212-
"kind": "letKeyword",
200+
"kind": "keyword(SwiftSyntax.Keyword.let)",
213201
"leadingTrivia": "",
214202
"trailingTrivia": "␣"
215203
},

‎Resources/branch_main/Tests/Tests/Fixtures/test-1-2.html‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<span class='CodeBlockItemList' data-title='var temperatureInFahrenheit = 90↲↲if temperatureInFahrenheit &lt;= 32 {↲ print(&quot;It&apos;s very cold. Consider wearing a scarf.&quot;)↲} else if temperatureInFahrenheit &gt;= 86 {↲ print(&quot;It&apos;s really warm. Don&apos;t forget to wear sunscreen.&quot;)↲} else {↲ print(&quot;It&apos;s not that cold. Wear a t-shirt.&quot;)↲}' data-content='CodeBlockItemListSyntax' data-type='Syntax' data-range='{"startRow":1,"startColumn":1,"endRow":9,"endColumn":2}'>
33
<span class='CodeBlockItem' data-title='var temperatureInFahrenheit = 90' data-content='CodeBlockItemSyntax' data-type='Syntax' data-range='{"startRow":1,"startColumn":1,"endRow":1,"endColumn":33}'>
44
<span class='VariableDecl' data-title='var temperatureInFahrenheit = 90' data-content='VariableDeclSyntax' data-type='Syntax' data-range='{"startRow":1,"startColumn":1,"endRow":1,"endColumn":33}'>
5-
<span class='Token' data-title='var' data-content='varKeyword' data-type='Token' data-range='{"startRow":1,"startColumn":1,"endRow":1,"endColumn":4}'>
6-
<span class='token keyword' data-title='var' data-content='varKeyword' data-type='Token' data-range='{"startRow":1,"startColumn":1,"endRow":1,"endColumn":4}'>var</span>&nbsp;
5+
<span class='Token' data-title='var' data-content='keyword(SwiftSyntax.Keyword.var)' data-type='Token' data-range='{"startRow":1,"startColumn":1,"endRow":1,"endColumn":4}'>
6+
<span class='token keyword' data-title='var' data-content='keyword(SwiftSyntax.Keyword.var)' data-type='Token' data-range='{"startRow":1,"startColumn":1,"endRow":1,"endColumn":4}'>var</span>&nbsp;
77
</span>
88
<span class='PatternBindingList' data-title='temperatureInFahrenheit = 90' data-content='PatternBindingListSyntax' data-type='Syntax' data-range='{"startRow":1,"startColumn":5,"endRow":1,"endColumn":33}'>
99
<span class='PatternBinding' data-title='temperatureInFahrenheit = 90' data-content='PatternBindingSyntax' data-type='Syntax' data-range='{"startRow":1,"startColumn":5,"endRow":1,"endColumn":33}'>
@@ -27,11 +27,12 @@
2727
</span>
2828
</span>
2929
<span class='CodeBlockItem' data-title='if temperatureInFahrenheit &lt;= 32 {↲ print(&quot;It&apos;s very cold. Consider wearing a scarf.&quot;)↲} else if temperatureInFahrenheit &gt;= 86 {↲ print(&quot;It&apos;s really warm. Don&apos;t forget to wear sunscreen.&quot;)↲} else {↲ print(&quot;It&apos;s not that cold. Wear a t-shirt.&quot;)↲}' data-content='CodeBlockItemSyntax' data-type='Syntax' data-range='{"startRow":3,"startColumn":1,"endRow":9,"endColumn":2}'>
30-
<span class='IfStmt' data-title='if temperatureInFahrenheit &lt;= 32 {↲ print(&quot;It&apos;s very cold. Consider wearing a scarf.&quot;)↲} else if temperatureInFahrenheit &gt;= 86 {↲ print(&quot;It&apos;s really warm. Don&apos;t forget to wear sunscreen.&quot;)↲} else {↲ print(&quot;It&apos;s not that cold. Wear a t-shirt.&quot;)↲}' data-content='IfStmtSyntax' data-type='Syntax' data-range='{"startRow":3,"startColumn":1,"endRow":9,"endColumn":2}'>
31-
<span class='Token' data-title='if' data-content='ifKeyword' data-type='Token' data-range='{"startRow":3,"startColumn":1,"endRow":3,"endColumn":3}'>
30+
<span class='ExpressionStmt' data-title='if temperatureInFahrenheit &lt;= 32 {↲ print(&quot;It&apos;s very cold. Consider wearing a scarf.&quot;)↲} else if temperatureInFahrenheit &gt;= 86 {↲ print(&quot;It&apos;s really warm. Don&apos;t forget to wear sunscreen.&quot;)↲} else {↲ print(&quot;It&apos;s not that cold. Wear a t-shirt.&quot;)↲}' data-content='ExpressionStmtSyntax' data-type='Syntax' data-range='{"startRow":3,"startColumn":1,"endRow":9,"endColumn":2}'>
31+
<span class='IfExpr' data-title='if temperatureInFahrenheit &lt;= 32 {↲ print(&quot;It&apos;s very cold. Consider wearing a scarf.&quot;)↲} else if temperatureInFahrenheit &gt;= 86 {↲ print(&quot;It&apos;s really warm. Don&apos;t forget to wear sunscreen.&quot;)↲} else {↲ print(&quot;It&apos;s not that cold. Wear a t-shirt.&quot;)↲}' data-content='IfExprSyntax' data-type='Syntax' data-range='{"startRow":3,"startColumn":1,"endRow":9,"endColumn":2}'>
32+
<span class='Token' data-title='if' data-content='keyword(SwiftSyntax.Keyword.if)' data-type='Token' data-range='{"startRow":3,"startColumn":1,"endRow":3,"endColumn":3}'>
3233
<br>
3334
<br>
34-
<span class='token keyword' data-title='if' data-content='ifKeyword' data-type='Token' data-range='{"startRow":3,"startColumn":1,"endRow":3,"endColumn":3}'>if</span>&nbsp;
35+
<span class='token keyword' data-title='if' data-content='keyword(SwiftSyntax.Keyword.if)' data-type='Token' data-range='{"startRow":3,"startColumn":1,"endRow":3,"endColumn":3}'>if</span>&nbsp;
3536
</span>
3637
<span class='ConditionElementList' data-title='temperatureInFahrenheit &lt;= 32' data-content='ConditionElementListSyntax' data-type='Syntax' data-range='{"startRow":3,"startColumn":4,"endRow":3,"endColumn":33}'>
3738
<span class='ConditionElement' data-title='temperatureInFahrenheit &lt;= 32' data-content='ConditionElementSyntax' data-type='Syntax' data-range='{"startRow":3,"startColumn":4,"endRow":3,"endColumn":33}'>
@@ -43,8 +44,8 @@
4344
</span>
4445
</span>
4546
<span class='BinaryOperatorExpr' data-title='&lt;=' data-content='BinaryOperatorExprSyntax' data-type='Syntax' data-range='{"startRow":3,"startColumn":28,"endRow":3,"endColumn":30}'>
46-
<span class='Token' data-title='&lt;=' data-content='spacedBinaryOperator(&quot;&lt;=&quot;)' data-type='Token' data-range='{"startRow":3,"startColumn":28,"endRow":3,"endColumn":30}'>
47-
<span class='token spacedBinaryOperator' data-title='&lt;=' data-content='spacedBinaryOperator(&quot;&lt;=&quot;)' data-type='Token' data-range='{"startRow":3,"startColumn":28,"endRow":3,"endColumn":30}'>&lt;=</span>&nbsp;
47+
<span class='Token' data-title='&lt;=' data-content='binaryOperator(&quot;&lt;=&quot;)' data-type='Token' data-range='{"startRow":3,"startColumn":28,"endRow":3,"endColumn":30}'>
48+
<span class='token binaryOperator' data-title='&lt;=' data-content='binaryOperator(&quot;&lt;=&quot;)' data-type='Token' data-range='{"startRow":3,"startColumn":28,"endRow":3,"endColumn":30}'>&lt;=</span>&nbsp;
4849
</span>
4950
</span>
5051
<span class='IntegerLiteralExpr' data-title='32' data-content='IntegerLiteralExprSyntax' data-type='Syntax' data-range='{"startRow":3,"startColumn":31,"endRow":3,"endColumn":33}'>
@@ -102,12 +103,12 @@
102103
<span class='token rightBrace' data-title='}' data-content='rightBrace' data-type='Token' data-range='{"startRow":5,"startColumn":1,"endRow":5,"endColumn":2}'>}</span>&nbsp;
103104
</span>
104105
</span>
105-
<span class='Token' data-title='else' data-content='elseKeyword' data-type='Token' data-range='{"startRow":5,"startColumn":3,"endRow":5,"endColumn":7}'>
106-
<span class='token keyword' data-title='else' data-content='elseKeyword' data-type='Token' data-range='{"startRow":5,"startColumn":3,"endRow":5,"endColumn":7}'>else</span>&nbsp;
106+
<span class='Token' data-title='else' data-content='keyword(SwiftSyntax.Keyword.else)' data-type='Token' data-range='{"startRow":5,"startColumn":3,"endRow":5,"endColumn":7}'>
107+
<span class='token keyword' data-title='else' data-content='keyword(SwiftSyntax.Keyword.else)' data-type='Token' data-range='{"startRow":5,"startColumn":3,"endRow":5,"endColumn":7}'>else</span>&nbsp;
107108
</span>
108-
<span class='IfStmt' data-title='if temperatureInFahrenheit &gt;= 86 {↲ print(&quot;It&apos;s really warm. Don&apos;t forget to wear sunscreen.&quot;)↲} else {↲ print(&quot;It&apos;s not that cold. Wear a t-shirt.&quot;)↲}' data-content='IfStmtSyntax' data-type='Syntax' data-range='{"startRow":5,"startColumn":8,"endRow":9,"endColumn":2}'>
109-
<span class='Token' data-title='if' data-content='ifKeyword' data-type='Token' data-range='{"startRow":5,"startColumn":8,"endRow":5,"endColumn":10}'>
110-
<span class='token keyword' data-title='if' data-content='ifKeyword' data-type='Token' data-range='{"startRow":5,"startColumn":8,"endRow":5,"endColumn":10}'>if</span>&nbsp;
109+
<span class='IfExpr' data-title='if temperatureInFahrenheit &gt;= 86 {↲ print(&quot;It&apos;s really warm. Don&apos;t forget to wear sunscreen.&quot;)↲} else {↲ print(&quot;It&apos;s not that cold. Wear a t-shirt.&quot;)↲}' data-content='IfExprSyntax' data-type='Syntax' data-range='{"startRow":5,"startColumn":8,"endRow":9,"endColumn":2}'>
110+
<span class='Token' data-title='if' data-content='keyword(SwiftSyntax.Keyword.if)' data-type='Token' data-range='{"startRow":5,"startColumn":8,"endRow":5,"endColumn":10}'>
111+
<span class='token keyword' data-title='if' data-content='keyword(SwiftSyntax.Keyword.if)' data-type='Token' data-range='{"startRow":5,"startColumn":8,"endRow":5,"endColumn":10}'>if</span>&nbsp;
111112
</span>
112113
<span class='ConditionElementList' data-title='temperatureInFahrenheit &gt;= 86' data-content='ConditionElementListSyntax' data-type='Syntax' data-range='{"startRow":5,"startColumn":11,"endRow":5,"endColumn":40}'>
113114
<span class='ConditionElement' data-title='temperatureInFahrenheit &gt;= 86' data-content='ConditionElementSyntax' data-type='Syntax' data-range='{"startRow":5,"startColumn":11,"endRow":5,"endColumn":40}'>
@@ -119,8 +120,8 @@
119120
</span>
120121
</span>
121122
<span class='BinaryOperatorExpr' data-title='&gt;=' data-content='BinaryOperatorExprSyntax' data-type='Syntax' data-range='{"startRow":5,"startColumn":35,"endRow":5,"endColumn":37}'>
122-
<span class='Token' data-title='&gt;=' data-content='spacedBinaryOperator(&quot;&gt;=&quot;)' data-type='Token' data-range='{"startRow":5,"startColumn":35,"endRow":5,"endColumn":37}'>
123-
<span class='token spacedBinaryOperator' data-title='&gt;=' data-content='spacedBinaryOperator(&quot;&gt;=&quot;)' data-type='Token' data-range='{"startRow":5,"startColumn":35,"endRow":5,"endColumn":37}'>&gt;=</span>&nbsp;
123+
<span class='Token' data-title='&gt;=' data-content='binaryOperator(&quot;&gt;=&quot;)' data-type='Token' data-range='{"startRow":5,"startColumn":35,"endRow":5,"endColumn":37}'>
124+
<span class='token binaryOperator' data-title='&gt;=' data-content='binaryOperator(&quot;&gt;=&quot;)' data-type='Token' data-range='{"startRow":5,"startColumn":35,"endRow":5,"endColumn":37}'>&gt;=</span>&nbsp;
124125
</span>
125126
</span>
126127
<span class='IntegerLiteralExpr' data-title='86' data-content='IntegerLiteralExprSyntax' data-type='Syntax' data-range='{"startRow":5,"startColumn":38,"endRow":5,"endColumn":40}'>
@@ -178,8 +179,8 @@
178179
<span class='token rightBrace' data-title='}' data-content='rightBrace' data-type='Token' data-range='{"startRow":7,"startColumn":1,"endRow":7,"endColumn":2}'>}</span>&nbsp;
179180
</span>
180181
</span>
181-
<span class='Token' data-title='else' data-content='elseKeyword' data-type='Token' data-range='{"startRow":7,"startColumn":3,"endRow":7,"endColumn":7}'>
182-
<span class='token keyword' data-title='else' data-content='elseKeyword' data-type='Token' data-range='{"startRow":7,"startColumn":3,"endRow":7,"endColumn":7}'>else</span>&nbsp;
182+
<span class='Token' data-title='else' data-content='keyword(SwiftSyntax.Keyword.else)' data-type='Token' data-range='{"startRow":7,"startColumn":3,"endRow":7,"endColumn":7}'>
183+
<span class='token keyword' data-title='else' data-content='keyword(SwiftSyntax.Keyword.else)' data-type='Token' data-range='{"startRow":7,"startColumn":3,"endRow":7,"endColumn":7}'>else</span>&nbsp;
183184
</span>
184185
<span class='CodeBlock' data-title='{↲ print(&quot;It&apos;s not that cold. Wear a t-shirt.&quot;)↲}' data-content='CodeBlockSyntax' data-type='Syntax' data-range='{"startRow":7,"startColumn":8,"endRow":9,"endColumn":2}'>
185186
<span class='Token' data-title='{' data-content='leftBrace' data-type='Token' data-range='{"startRow":7,"startColumn":8,"endRow":7,"endColumn":9}'>
@@ -231,6 +232,7 @@
231232
</span>
232233
</span>
233234
</span>
235+
</span>
234236
<span class='Token' data-title='' data-content='eof' data-type='Token' data-range='{"startRow":11,"startColumn":62,"endRow":11,"endColumn":62}'>
235237
<br>
236238
<br>

0 commit comments

Comments
 (0)