Skip to content

Commit 4b506b2

Browse files
ahoppenahoppen
committed
[libSyntax] Add test variants for building the syntax map via libSyntax
1 parent e7fe537 commit 4b506b2

23 files changed

+945
-45
lines changed

‎test/SourceKit/SyntaxMapData/syntaxmap-edit-block-comment.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// RUN: %sourcekitd-test -req=open -print-raw-response %S/Inputs/syntaxmap-edit-block-comment.swift == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-block-comment.swift -pos=4:2 -replace=" " -length=1 == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-block-comment.swift -pos=4:2 -replace="/" -length=1 == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-block-comment.swift -pos=1:1 -replace="//" -length=2 | %sed_clean > %t.response
22
// RUN: %FileCheck -input-file=%t.response %s
3+
// RUN: %sourcekitd-test -req=open -print-raw-response %S/Inputs/syntaxmap-edit-block-comment.swift == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-block-comment.swift -pos=4:2 -replace=" " -length=1 == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-block-comment.swift -pos=4:2 -replace="/" -length=1 == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-block-comment.swift -pos=1:1 -replace="//" -length=2 -libsyntax-based-processing | %sed_clean > %t.libSyntax.response
4+
// RUN: %FileCheck -input-file=%t.libSyntax.response %s
35

46
// Initial state
57

‎test/SourceKit/SyntaxMapData/syntaxmap-edit-chained-comment.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// RUN: %sourcekitd-test -req=open -print-raw-response %S/Inputs/syntaxmap-edit-chained-comment.swift == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-chained-comment.swift -pos=1:9 -replace=" " -length=1 == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-chained-comment.swift -pos=1:9 -replace="/" -length=1 | %sed_clean > %t.response
22
// RUN: %FileCheck -input-file=%t.response %s
3+
// RUN: %sourcekitd-test -req=open -print-raw-response %S/Inputs/syntaxmap-edit-chained-comment.swift == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-chained-comment.swift -pos=1:9 -replace=" " -length=1 == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-chained-comment.swift -pos=1:9 -replace="/" -length=1 -libsyntax-based-processing | %sed_clean > %t.libsyntax.response
4+
// RUN: %FileCheck -input-file=%t.libsyntax.response %s
35

46
// Initial state
57

‎test/SourceKit/SyntaxMapData/syntaxmap-edit-del.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,8 @@
22
// RUN: diff -u %s.response %t.response
33
// RUN: %sourcekitd-test -req=syntax-map -pos=4:1 -length=2 -replace="" %S/Inputs/syntaxmap-edit-del.swift | %sed_clean > %t.response2
44
// RUN: diff -u %s.response2 %t.response2
5+
6+
// RUN: %sourcekitd-test -req=syntax-map -pos=2:1 -length=2 -replace=" " %S/Inputs/syntaxmap-edit-del.swift -libsyntax-based-processing | %sed_clean > %t.libsyntax.response
7+
// RUN: diff -u %s.response %t.libsyntax.response
8+
// RUN: %sourcekitd-test -req=syntax-map -pos=4:1 -length=2 -replace="" %S/Inputs/syntaxmap-edit-del.swift -libsyntax-based-processing | %sed_clean > %t.libsyntax.response2
9+
// RUN: diff -u %s.response2 %t.libsyntax.response2

‎test/SourceKit/SyntaxMapData/syntaxmap-edit-disjoint-effect.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// RUN: %sourcekitd-test -req=open -print-raw-response %S/Inputs/syntaxmap-edit-disjoint-effect.swift == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-disjoint-effect.swift -pos=1:11 -replace='(' -length=1 | %sed_clean > %t.response
22
// RUN: %FileCheck -input-file=%t.response %s
3+
// RUN: %sourcekitd-test -req=open -print-raw-response %S/Inputs/syntaxmap-edit-disjoint-effect.swift == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-disjoint-effect.swift -pos=1:11 -replace='(' -length=1 -libsyntax-based-processing | %sed_clean > %t.libsyntax.response
4+
// RUN: %FileCheck -input-file=%t.libsyntax.response %s
35

46
// Original contents
57

‎test/SourceKit/SyntaxMapData/syntaxmap-edit-multiline-string.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// RUN: %sourcekitd-test -req=open -print-raw-response %S/Inputs/syntaxmap-edit-multiline-string.swift == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-multiline-string.swift -pos=8:1 -replace='"""' -length=3 == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-multiline-string.swift -pos=6:2 -replace=')' -length=1 == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-multiline-string.swift -pos=2:10 -replace=' ' -length=1 | %sed_clean > %t.response
22
// RUN: %FileCheck -input-file=%t.response %s
3+
// RUN: %sourcekitd-test -req=open -print-raw-response %S/Inputs/syntaxmap-edit-multiline-string.swift == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-multiline-string.swift -pos=8:1 -replace='"""' -length=3 == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-multiline-string.swift -pos=6:2 -replace=')' -length=1 == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-multiline-string.swift -pos=2:10 -replace=' ' -length=1 -libsyntax-based-processing | %sed_clean > %t.libsyntax.response
4+
// RUN: %FileCheck -input-file=%t.libsyntax.response %s
35

46
// Original file contents
57

‎test/SourceKit/SyntaxMapData/syntaxmap-edit-nested-token.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// RUN: %sourcekitd-test -req=open -print-raw-response %S/Inputs/syntaxmap-edit-nested-token.swift == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-nested-token.swift -pos=10:43 -replace='impact' -length=6 | %sed_clean > %t.response
22
// RUN: %FileCheck -input-file=%t.response %s
3+
// RUN: %sourcekitd-test -req=open -print-raw-response %S/Inputs/syntaxmap-edit-nested-token.swift == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-nested-token.swift -pos=10:43 -replace='impact' -length=6 -libsyntax-based-processing | %sed_clean > %t.libsyntax.response
4+
// RUN: %FileCheck -input-file=%t.libsyntax.response %s
35

46
// Original file contents
57

‎test/SourceKit/SyntaxMapData/syntaxmap-edit-remove.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// RUN: %sourcekitd-test -req=open -print-raw-response %S/Inputs/syntaxmap-edit-remove.swift == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-remove.swift -pos=3:3 -length=1 -replace='' == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-remove.swift -pos=2:1 -replace='' -length=1 == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-remove.swift -pos=1:9 -length=1 -replace='' | %sed_clean > %t.response
22
// RUN: %FileCheck -input-file=%t.response %s
3+
// RUN: %sourcekitd-test -req=open -print-raw-response %S/Inputs/syntaxmap-edit-remove.swift == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-remove.swift -pos=3:3 -length=1 -replace='' == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-remove.swift -pos=2:1 -replace='' -length=1 == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-remove.swift -pos=1:9 -length=1 -replace='' -libsyntax-based-processing | %sed_clean > %t.libsyntax.response
4+
// RUN: %FileCheck -input-file=%t.libsyntax.response %s
35

46
// Initial state
57

‎test/SourceKit/SyntaxMapData/syntaxmap-edit.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
// RUN: %sourcekitd-test -req=syntax-map -pos=4:10 -replace="Bar" %S/Inputs/syntaxmap-edit.swift > %t.response
22
// RUN: diff -u %s.response %t.response
3+
// RUN: %sourcekitd-test -req=syntax-map -pos=4:10 -replace="Bar" %S/Inputs/syntaxmap-edit.swift -libsyntax-based-processing > %t.libsyntax.response
4+
// RUN: diff -u %s.libsyntax.response %t.libsyntax.response

‎test/SourceKit/SyntaxMapData/syntaxmap-edit.swift.libsyntax.response

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
{
2+
key.offset: 0,
3+
key.length: 114,
4+
key.diagnostic_stage: source.diagnostic.stage.swift.parse,
5+
key.syntaxmap: [
6+
{
7+
key.kind: source.lang.swift.syntaxtype.comment,
8+
key.offset: 0,
9+
key.length: 21
10+
},
11+
{
12+
key.kind: source.lang.swift.syntaxtype.comment,
13+
key.offset: 22,
14+
key.length: 57
15+
},
16+
{
17+
key.kind: source.lang.swift.syntaxtype.keyword,
18+
key.offset: 81,
19+
key.length: 5
20+
},
21+
{
22+
key.kind: source.lang.swift.syntaxtype.identifier,
23+
key.offset: 87,
24+
key.length: 3
25+
},
26+
{
27+
key.kind: source.lang.swift.syntaxtype.keyword,
28+
key.offset: 97,
29+
key.length: 3
30+
},
31+
{
32+
key.kind: source.lang.swift.syntaxtype.identifier,
33+
key.offset: 101,
34+
key.length: 4
35+
},
36+
{
37+
key.kind: source.lang.swift.syntaxtype.typeidentifier,
38+
key.offset: 108,
39+
key.length: 3
40+
}
41+
]
42+
}
43+
{
44+
key.offset: 87,
45+
key.length: 6,
46+
key.diagnostic_stage: source.diagnostic.stage.swift.parse,
47+
key.syntaxmap: [
48+
{
49+
key.kind: source.lang.swift.syntaxtype.identifier,
50+
key.offset: 87,
51+
key.length: 6
52+
}
53+
]
54+
}

‎test/SourceKit/SyntaxMapData/syntaxmap-multiple-edits.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// RUN: %sourcekitd-test -req=open -print-raw-response %S/Inputs/syntaxmap-multiple-edits.swift == -req=edit -print-raw-response -pos=6:13 -length=1 -replace=" " %S/Inputs/syntaxmap-multiple-edits.swift == -req="edit" -pos=14:1 -length=0 -replace="let y = 2" -print-raw-response %S/Inputs/syntaxmap-multiple-edits.swift == -req="edit" -pos=8:10 -length=7 -replace='Int64 = 3; let z = 2' -print-raw-response %S/Inputs/syntaxmap-multiple-edits.swift == -req="edit" -pos=4:9 -length=2 -replace='50 * 95 - 100' -print-raw-response %S/Inputs/syntaxmap-multiple-edits.swift == -req="edit" -pos=1:1 -length=0 -replace='func firstFunc(x: Int) {}' -print-raw-response %S/Inputs/syntaxmap-multiple-edits.swift | %sed_clean > %t.response
22
// RUN: %FileCheck -input-file=%t.response %s
3+
// RUN: %sourcekitd-test -req=open -print-raw-response %S/Inputs/syntaxmap-multiple-edits.swift == -req=edit -print-raw-response -pos=6:13 -length=1 -replace=" " %S/Inputs/syntaxmap-multiple-edits.swift == -req="edit" -pos=14:1 -length=0 -replace="let y = 2" -print-raw-response %S/Inputs/syntaxmap-multiple-edits.swift == -req="edit" -pos=8:10 -length=7 -replace='Int64 = 3; let z = 2' -print-raw-response %S/Inputs/syntaxmap-multiple-edits.swift == -req="edit" -pos=4:9 -length=2 -replace='50 * 95 - 100' -print-raw-response %S/Inputs/syntaxmap-multiple-edits.swift == -req="edit" -pos=1:1 -length=0 -replace='func firstFunc(x: Int) {}' -print-raw-response %S/Inputs/syntaxmap-multiple-edits.swift -libsyntax-based-processing | %sed_clean > %t.libsyntax.response
4+
// RUN: %FileCheck -input-file=%t.libsyntax.response %s
35

46
// Initial syntax map
57

‎test/SourceKit/SyntaxMapData/syntaxmap-object-literals.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// RUN: %sourcekitd-test -req=syntax-map %s | %sed_clean > %t.response
22
// RUN: diff -u %s.response %t.response
3+
// RUN: %sourcekitd-test -req=syntax-map %s -libsyntax-based-processing | %sed_clean > %t.libsyntax.response
4+
// RUN: diff -u %s.libsyntax.response %t.libsyntax.response
35

46
let image = #imageLiteral(resourceName: "cloud.png")
57
let color = #colorLiteral(red: 1, blue: 0, green: 1, alpha: 1)

‎test/SourceKit/SyntaxMapData/syntaxmap-object-literals.swift.libsyntax.response

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
{
2+
key.offset: 0,
3+
key.length: 448,
4+
key.diagnostic_stage: source.diagnostic.stage.swift.parse,
5+
key.syntaxmap: [
6+
{
7+
key.kind: source.lang.swift.syntaxtype.comment,
8+
key.offset: 0,
9+
key.length: 70
10+
},
11+
{
12+
key.kind: source.lang.swift.syntaxtype.comment,
13+
key.offset: 71,
14+
key.length: 39
15+
},
16+
{
17+
key.kind: source.lang.swift.syntaxtype.comment,
18+
key.offset: 111,
19+
key.length: 108
20+
},
21+
{
22+
key.kind: source.lang.swift.syntaxtype.comment,
23+
key.offset: 220,
24+
key.length: 59
25+
},
26+
{
27+
key.kind: source.lang.swift.syntaxtype.keyword,
28+
key.offset: 281,
29+
key.length: 3
30+
},
31+
{
32+
key.kind: source.lang.swift.syntaxtype.identifier,
33+
key.offset: 285,
34+
key.length: 5
35+
},
36+
{
37+
key.kind: source.lang.swift.syntaxtype.objectliteral,
38+
key.offset: 293,
39+
key.length: 13
40+
},
41+
{
42+
key.kind: source.lang.swift.syntaxtype.identifier,
43+
key.offset: 307,
44+
key.length: 12
45+
},
46+
{
47+
key.kind: source.lang.swift.syntaxtype.string,
48+
key.offset: 321,
49+
key.length: 11
50+
},
51+
{
52+
key.kind: source.lang.swift.syntaxtype.keyword,
53+
key.offset: 334,
54+
key.length: 3
55+
},
56+
{
57+
key.kind: source.lang.swift.syntaxtype.identifier,
58+
key.offset: 338,
59+
key.length: 5
60+
},
61+
{
62+
key.kind: source.lang.swift.syntaxtype.objectliteral,
63+
key.offset: 346,
64+
key.length: 13
65+
},
66+
{
67+
key.kind: source.lang.swift.syntaxtype.identifier,
68+
key.offset: 360,
69+
key.length: 3
70+
},
71+
{
72+
key.kind: source.lang.swift.syntaxtype.number,
73+
key.offset: 365,
74+
key.length: 1
75+
},
76+
{
77+
key.kind: source.lang.swift.syntaxtype.identifier,
78+
key.offset: 368,
79+
key.length: 4
80+
},
81+
{
82+
key.kind: source.lang.swift.syntaxtype.number,
83+
key.offset: 374,
84+
key.length: 1
85+
},
86+
{
87+
key.kind: source.lang.swift.syntaxtype.identifier,
88+
key.offset: 377,
89+
key.length: 5
90+
},
91+
{
92+
key.kind: source.lang.swift.syntaxtype.number,
93+
key.offset: 384,
94+
key.length: 1
95+
},
96+
{
97+
key.kind: source.lang.swift.syntaxtype.identifier,
98+
key.offset: 387,
99+
key.length: 5
100+
},
101+
{
102+
key.kind: source.lang.swift.syntaxtype.number,
103+
key.offset: 394,
104+
key.length: 1
105+
},
106+
{
107+
key.kind: source.lang.swift.syntaxtype.keyword,
108+
key.offset: 397,
109+
key.length: 3
110+
},
111+
{
112+
key.kind: source.lang.swift.syntaxtype.identifier,
113+
key.offset: 401,
114+
key.length: 4
115+
},
116+
{
117+
key.kind: source.lang.swift.syntaxtype.objectliteral,
118+
key.offset: 408,
119+
key.length: 12
120+
},
121+
{
122+
key.kind: source.lang.swift.syntaxtype.identifier,
123+
key.offset: 421,
124+
key.length: 12
125+
},
126+
{
127+
key.kind: source.lang.swift.syntaxtype.string,
128+
key.offset: 435,
129+
key.length: 10
130+
}
131+
]
132+
}

‎test/SourceKit/SyntaxMapData/syntaxmap-object-literals.swift.response

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
key.offset: 0,
3-
key.length: 279,
3+
key.length: 448,
44
key.diagnostic_stage: source.diagnostic.stage.swift.parse,
55
key.syntaxmap: [
66
{
@@ -13,49 +13,59 @@
1313
key.offset: 71,
1414
key.length: 40
1515
},
16+
{
17+
key.kind: source.lang.swift.syntaxtype.comment,
18+
key.offset: 111,
19+
key.length: 109
20+
},
21+
{
22+
key.kind: source.lang.swift.syntaxtype.comment,
23+
key.offset: 220,
24+
key.length: 60
25+
},
1626
{
1727
key.kind: source.lang.swift.syntaxtype.keyword,
18-
key.offset: 112,
28+
key.offset: 281,
1929
key.length: 3
2030
},
2131
{
2232
key.kind: source.lang.swift.syntaxtype.identifier,
23-
key.offset: 116,
33+
key.offset: 285,
2434
key.length: 5
2535
},
2636
{
2737
key.kind: source.lang.swift.syntaxtype.objectliteral,
28-
key.offset: 124,
38+
key.offset: 293,
2939
key.length: 40
3040
},
3141
{
3242
key.kind: source.lang.swift.syntaxtype.keyword,
33-
key.offset: 165,
43+
key.offset: 334,
3444
key.length: 3
3545
},
3646
{
3747
key.kind: source.lang.swift.syntaxtype.identifier,
38-
key.offset: 169,
48+
key.offset: 338,
3949
key.length: 5
4050
},
4151
{
4252
key.kind: source.lang.swift.syntaxtype.objectliteral,
43-
key.offset: 177,
53+
key.offset: 346,
4454
key.length: 50
4555
},
4656
{
4757
key.kind: source.lang.swift.syntaxtype.keyword,
48-
key.offset: 228,
58+
key.offset: 397,
4959
key.length: 3
5060
},
5161
{
5262
key.kind: source.lang.swift.syntaxtype.identifier,
53-
key.offset: 232,
63+
key.offset: 401,
5464
key.length: 4
5565
},
5666
{
5767
key.kind: source.lang.swift.syntaxtype.objectliteral,
58-
key.offset: 239,
68+
key.offset: 408,
5969
key.length: 38
6070
}
6171
]

‎test/SourceKit/SyntaxMapData/syntaxmap-partial-delete.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// RUN: %sourcekitd-test -req=open -print-raw-response %S/Inputs/syntaxmap-partial-delete.swift == -req=edit -print-raw-response -pos=2:10 -length=2 -replace='' %S/Inputs/syntaxmap-partial-delete.swift | %sed_clean > %t.response
22
// RUN: %FileCheck -input-file=%t.response %s
3+
// RUN: %sourcekitd-test -req=open -print-raw-response %S/Inputs/syntaxmap-partial-delete.swift == -req=edit -print-raw-response -pos=2:10 -length=2 -replace='' %S/Inputs/syntaxmap-partial-delete.swift -libsyntax-based-processing | %sed_clean > %t.libsyntax.response
4+
// RUN: %FileCheck -input-file=%t.libsyntax.response %s
35

46
// CHECK: {{^}}{
57
// CHECK-NEXT: key.offset: 0,

‎test/SourceKit/SyntaxMapData/syntaxmap-pound-keyword.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// RUN: %sourcekitd-test -req=syntax-map %s | %sed_clean > %t.response
22
// RUN: diff -u %s.response %t.response
3+
// RUN: %sourcekitd-test -req=syntax-map %s -libsyntax-based-processing | %sed_clean > %t.libsyntax.response
4+
// RUN: diff -u %s.libsyntax.response %t.libsyntax.response
35

46
let fn = #function
57
let f = #file

0 commit comments

Comments
 (0)