Skip to content

Commit c0ac78f

Browse files
kishikawakatsumikishikawakatsumi
authored
Merge branch 'master' into refactor
2 parents dcdebf3 + 440d688 commit c0ac78f

18 files changed

+5279
-2479
lines changed

‎Package.resolved‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Resources/parsers/trunk/Package.resolved‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Resources/parsers/trunk/Tests/Tests/Fixtures/test-1-1.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +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='AttributeList' data-title='' data-content='AttributeListSyntax' data-type='Syntax' data-range='{"startRow":1,"startColumn":1,"endRow":1,"endColumn":1}'></span>
6+
<span class='DeclModifierList' data-title='' data-content='DeclModifierListSyntax' data-type='Syntax' data-range='{"startRow":1,"startColumn":1,"endRow":1,"endColumn":1}'></span>
57
<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}'>
68
<span class='token keyword present' data-title='let' data-content='keyword(SwiftSyntax.Keyword.let)' data-type='Token' data-range='{"startRow":1,"startColumn":1,"endRow":1,"endColumn":4}'>
79
let

‎Resources/parsers/trunk/Tests/Tests/Fixtures/test-1-1.json‎

Lines changed: 72 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,9 @@
133133
},
134134
{
135135
"name": "attributes",
136+
"ref": "AttributeListSyntax",
136137
"value": {
137-
"text": "nil"
138+
"text": "AttributeListSyntax"
138139
}
139140
},
140141
{
@@ -145,8 +146,9 @@
145146
},
146147
{
147148
"name": "modifiers",
149+
"ref": "DeclModifierListSyntax",
148150
"value": {
149-
"text": "nil"
151+
"text": "DeclModifierListSyntax"
150152
}
151153
},
152154
{
@@ -188,6 +190,58 @@
188190
{
189191
"id": 4,
190192
"parent": 3,
193+
"range": {
194+
"endColumn": 1,
195+
"endRow": 1,
196+
"startColumn": 1,
197+
"startRow": 1
198+
},
199+
"structure": [
200+
{
201+
"name": "Element",
202+
"value": {
203+
"text": "Element"
204+
}
205+
},
206+
{
207+
"name": "Count",
208+
"value": {
209+
"text": "0"
210+
}
211+
}
212+
],
213+
"text": "AttributeList",
214+
"type": "collection"
215+
},
216+
{
217+
"id": 5,
218+
"parent": 3,
219+
"range": {
220+
"endColumn": 1,
221+
"endRow": 1,
222+
"startColumn": 1,
223+
"startRow": 1
224+
},
225+
"structure": [
226+
{
227+
"name": "Element",
228+
"value": {
229+
"text": "DeclModifierSyntax"
230+
}
231+
},
232+
{
233+
"name": "Count",
234+
"value": {
235+
"text": "0"
236+
}
237+
}
238+
],
239+
"text": "DeclModifierList",
240+
"type": "collection"
241+
},
242+
{
243+
"id": 6,
244+
"parent": 3,
191245
"range": {
192246
"endColumn": 4,
193247
"endRow": 1,
@@ -204,7 +258,7 @@
204258
"type": "other"
205259
},
206260
{
207-
"id": 5,
261+
"id": 7,
208262
"parent": 3,
209263
"range": {
210264
"endColumn": 15,
@@ -230,8 +284,8 @@
230284
"type": "collection"
231285
},
232286
{
233-
"id": 6,
234-
"parent": 5,
287+
"id": 8,
288+
"parent": 7,
235289
"range": {
236290
"endColumn": 15,
237291
"endRow": 1,
@@ -312,8 +366,8 @@
312366
"type": "other"
313367
},
314368
{
315-
"id": 7,
316-
"parent": 6,
369+
"id": 9,
370+
"parent": 8,
317371
"range": {
318372
"endColumn": 11,
319373
"endRow": 1,
@@ -345,8 +399,8 @@
345399
"type": "pattern"
346400
},
347401
{
348-
"id": 8,
349-
"parent": 7,
402+
"id": 10,
403+
"parent": 9,
350404
"range": {
351405
"endColumn": 11,
352406
"endRow": 1,
@@ -363,8 +417,8 @@
363417
"type": "other"
364418
},
365419
{
366-
"id": 9,
367-
"parent": 6,
420+
"id": 11,
421+
"parent": 8,
368422
"range": {
369423
"endColumn": 15,
370424
"endRow": 1,
@@ -409,8 +463,8 @@
409463
"type": "other"
410464
},
411465
{
412-
"id": 10,
413-
"parent": 9,
466+
"id": 12,
467+
"parent": 11,
414468
"range": {
415469
"endColumn": 13,
416470
"endRow": 1,
@@ -427,8 +481,8 @@
427481
"type": "other"
428482
},
429483
{
430-
"id": 11,
431-
"parent": 9,
484+
"id": 13,
485+
"parent": 11,
432486
"range": {
433487
"endColumn": 15,
434488
"endRow": 1,
@@ -460,8 +514,8 @@
460514
"type": "expr"
461515
},
462516
{
463-
"id": 12,
464-
"parent": 11,
517+
"id": 14,
518+
"parent": 13,
465519
"range": {
466520
"endColumn": 15,
467521
"endRow": 1,
@@ -478,7 +532,7 @@
478532
"type": "other"
479533
},
480534
{
481-
"id": 13,
535+
"id": 15,
482536
"parent": 0,
483537
"range": {
484538
"endColumn": 15,

‎Resources/parsers/trunk/Tests/Tests/Fixtures/test-1-2.html‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +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='AttributeList' data-title='' data-content='AttributeListSyntax' data-type='Syntax' data-range='{"startRow":1,"startColumn":1,"endRow":1,"endColumn":1}'></span>
6+
<span class='DeclModifierList' data-title='' data-content='DeclModifierListSyntax' data-type='Syntax' data-range='{"startRow":1,"startColumn":1,"endRow":1,"endColumn":1}'></span>
57
<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}'>
68
<span class='token keyword present' data-title='var' data-content='keyword(SwiftSyntax.Keyword.var)' data-type='Token' data-range='{"startRow":1,"startColumn":1,"endRow":1,"endColumn":4}'>
79
var
@@ -133,6 +135,7 @@
133135
)
134136
</span>
135137
</span>
138+
<span class='MultipleTrailingClosureElementList' data-title='' data-content='MultipleTrailingClosureElementListSyntax' data-type='Syntax' data-range='{"startRow":4,"startColumn":53,"endRow":4,"endColumn":53}'></span>
136139
</span>
137140
</span>
138141
</span>
@@ -242,6 +245,7 @@
242245
)
243246
</span>
244247
</span>
248+
<span class='MultipleTrailingClosureElementList' data-title='' data-content='MultipleTrailingClosureElementListSyntax' data-type='Syntax' data-range='{"startRow":6,"startColumn":61,"endRow":6,"endColumn":61}'></span>
245249
</span>
246250
</span>
247251
</span>
@@ -312,6 +316,7 @@
312316
)
313317
</span>
314318
</span>
319+
<span class='MultipleTrailingClosureElementList' data-title='' data-content='MultipleTrailingClosureElementListSyntax' data-type='Syntax' data-range='{"startRow":8,"startColumn":47,"endRow":8,"endColumn":47}'></span>
315320
</span>
316321
</span>
317322
</span>

0 commit comments

Comments
 (0)