Skip to content

Commit 607abb9

Browse files
hamishknighthamishknight
authored
Merge pull request #84272 from a7medev/add-parameter-name-to-signature
[IDE] Add internal parameter names in signature help
2 parents 99e9ed8 + cb9afaa commit 607abb9

14 files changed

+125
-4
lines changed

‎test/SourceKit/SignatureHelp/signature_help_currying.swift‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ func testCurryMemberFull() {
8282
key.name: "add(_ self: Adder) -> (Int, Int) -> Int",
8383
key.parameters: [
8484
{
85+
key.name: "self",
8586
key.nameoffset: 4,
8687
key.namelength: 13
8788
}
@@ -92,6 +93,7 @@ func testCurryMemberFull() {
9293
key.name: "add(_ self: Adder) -> (inout Int) -> ()",
9394
key.parameters: [
9495
{
96+
key.name: "self",
9597
key.nameoffset: 4,
9698
key.namelength: 13
9799
}
@@ -102,6 +104,7 @@ func testCurryMemberFull() {
102104
key.name: "add(_ self: Adder) -> (AdditiveArithmetic, AdditiveArithmetic) -> AdditiveArithmetic",
103105
key.parameters: [
104106
{
107+
key.name: "self",
105108
key.nameoffset: 4,
106109
key.namelength: 13
107110
}
@@ -112,6 +115,7 @@ func testCurryMemberFull() {
112115
key.name: "add(_ self: Adder) -> (Double?, Float, Int) -> Double",
113116
key.parameters: [
114117
{
118+
key.name: "self",
115119
key.nameoffset: 4,
116120
key.namelength: 13
117121
}
@@ -122,6 +126,7 @@ func testCurryMemberFull() {
122126
key.name: "add(_ self: Adder) -> (Double, Float, Int) -> Double",
123127
key.parameters: [
124128
{
129+
key.name: "self",
125130
key.nameoffset: 4,
126131
key.namelength: 13
127132
}
@@ -132,6 +137,7 @@ func testCurryMemberFull() {
132137
key.name: "add(_ self: Adder) -> (Double...) -> Double",
133138
key.parameters: [
134139
{
140+
key.name: "self",
135141
key.nameoffset: 4,
136142
key.namelength: 13
137143
}
@@ -142,6 +148,7 @@ func testCurryMemberFull() {
142148
key.name: "add(_ self: Adder) -> (Int, Int, (Int, Int) throws -> Int) throws -> Int?",
143149
key.parameters: [
144150
{
151+
key.name: "self",
145152
key.nameoffset: 4,
146153
key.namelength: 13
147154
}
@@ -152,6 +159,7 @@ func testCurryMemberFull() {
152159
key.name: "add(_ self: Adder) -> (Int) -> (Int) -> Int",
153160
key.parameters: [
154161
{
162+
key.name: "self",
155163
key.nameoffset: 4,
156164
key.namelength: 13
157165
}
@@ -168,10 +176,12 @@ func testCurryMemberFull() {
168176
key.name: "(_ x: Int, to: Int) -> Int",
169177
key.parameters: [
170178
{
179+
key.name: "x",
171180
key.nameoffset: 1,
172181
key.namelength: 8
173182
},
174183
{
184+
key.name: "y",
175185
key.nameoffset: 11,
176186
key.namelength: 7
177187
}
@@ -182,6 +192,7 @@ func testCurryMemberFull() {
182192
key.name: "(oneTo: inout Int)",
183193
key.parameters: [
184194
{
195+
key.name: "x",
185196
key.nameoffset: 1,
186197
key.namelength: 16
187198
}
@@ -192,10 +203,12 @@ func testCurryMemberFull() {
192203
key.name: "(_ x: AdditiveArithmetic, to: AdditiveArithmetic) -> AdditiveArithmetic",
193204
key.parameters: [
194205
{
206+
key.name: "x",
195207
key.nameoffset: 1,
196208
key.namelength: 23
197209
},
198210
{
211+
key.name: "y",
199212
key.nameoffset: 26,
200213
key.namelength: 22
201214
}
@@ -206,14 +219,17 @@ func testCurryMemberFull() {
206219
key.name: "(first: Double!, second: Float, third: Int) -> Double",
207220
key.parameters: [
208221
{
222+
key.name: "first",
209223
key.nameoffset: 1,
210224
key.namelength: 14
211225
},
212226
{
227+
key.name: "second",
213228
key.nameoffset: 17,
214229
key.namelength: 13
215230
},
216231
{
232+
key.name: "third",
217233
key.nameoffset: 32,
218234
key.namelength: 10
219235
}
@@ -224,14 +240,17 @@ func testCurryMemberFull() {
224240
key.name: "(arg1: Double, arg2: Float, arg3: Int) -> Double",
225241
key.parameters: [
226242
{
243+
key.name: "param1",
227244
key.nameoffset: 1,
228245
key.namelength: 12
229246
},
230247
{
248+
key.name: "arg2",
231249
key.nameoffset: 15,
232250
key.namelength: 11
233251
},
234252
{
253+
key.name: "param3",
235254
key.nameoffset: 28,
236255
key.namelength: 9
237256
}
@@ -242,6 +261,7 @@ func testCurryMemberFull() {
242261
key.name: "(numbers: Double...) -> Double",
243262
key.parameters: [
244263
{
264+
key.name: "numbers",
245265
key.nameoffset: 1,
246266
key.namelength: 18
247267
}
@@ -252,14 +272,17 @@ func testCurryMemberFull() {
252272
key.name: "(x: Int, y: Int, with: (Int, Int) throws -> Int) throws -> Int!",
253273
key.parameters: [
254274
{
275+
key.name: "x",
255276
key.nameoffset: 1,
256277
key.namelength: 6
257278
},
258279
{
280+
key.name: "y",
259281
key.nameoffset: 9,
260282
key.namelength: 6
261283
},
262284
{
285+
key.name: "adder",
263286
key.nameoffset: 17,
264287
key.namelength: 30
265288
}
@@ -270,6 +293,7 @@ func testCurryMemberFull() {
270293
key.name: "(x: Int) -> (Int) -> Int",
271294
key.parameters: [
272295
{
296+
key.name: "x",
273297
key.nameoffset: 1,
274298
key.namelength: 6
275299
}

‎test/SourceKit/SignatureHelp/signature_help_default_args.swift‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,12 @@ add()
3535
key.name: "add(_ x: Int = 10, to: Int) -> Int",
3636
key.parameters: [
3737
{
38+
key.name: "x",
3839
key.nameoffset: 4,
3940
key.namelength: 13
4041
},
4142
{
43+
key.name: "y",
4244
key.nameoffset: 19,
4345
key.namelength: 7
4446
}
@@ -49,6 +51,7 @@ add()
4951
key.name: "add(oneTo: inout Int)",
5052
key.parameters: [
5153
{
54+
key.name: "x",
5255
key.nameoffset: 4,
5356
key.namelength: 16
5457
}
@@ -59,10 +62,12 @@ add()
5962
key.name: "add(_ x: Int, to: Int? = nil) -> String",
6063
key.parameters: [
6164
{
65+
key.name: "x",
6266
key.nameoffset: 4,
6367
key.namelength: 8
6468
},
6569
{
70+
key.name: "y",
6671
key.nameoffset: 14,
6772
key.namelength: 14
6873
}
@@ -73,14 +78,17 @@ add()
7378
key.name: "add(first: Double!, second: Float = .pi, third: Int) -> Double",
7479
key.parameters: [
7580
{
81+
key.name: "first",
7682
key.nameoffset: 4,
7783
key.namelength: 14
7884
},
7985
{
86+
key.name: "second",
8087
key.nameoffset: 20,
8188
key.namelength: 19
8289
},
8390
{
91+
key.name: "third",
8492
key.nameoffset: 41,
8593
key.namelength: 10
8694
}
@@ -91,6 +99,7 @@ add()
9199
key.name: "add(s: S = S(a: false)) -> Double",
92100
key.parameters: [
93101
{
102+
key.name: "s",
94103
key.nameoffset: 4,
95104
key.namelength: 18
96105
}
@@ -101,14 +110,17 @@ add()
101110
key.name: "add(x: Int, y: Int, with: (Int, Int) -> Int = { $0 + $1 }) -> Int",
102111
key.parameters: [
103112
{
113+
key.name: "x",
104114
key.nameoffset: 4,
105115
key.namelength: 6
106116
},
107117
{
118+
key.name: "y",
108119
key.nameoffset: 12,
109120
key.namelength: 6
110121
},
111122
{
123+
key.name: "adder",
112124
key.nameoffset: 20,
113125
key.namelength: 37
114126
}
@@ -119,6 +131,7 @@ add()
119131
key.name: "add(x: Int = importantValue)",
120132
key.parameters: [
121133
{
134+
key.name: "x",
122135
key.nameoffset: 4,
123136
key.namelength: 23
124137
}
@@ -129,14 +142,17 @@ add()
129142
key.name: "add(x: Int, line: UInt = #line, file: StaticString = #file)",
130143
key.parameters: [
131144
{
145+
key.name: "x",
132146
key.nameoffset: 4,
133147
key.namelength: 6
134148
},
135149
{
150+
key.name: "line",
136151
key.nameoffset: 12,
137152
key.namelength: 18
138153
},
139154
{
155+
key.name: "file",
140156
key.nameoffset: 32,
141157
key.namelength: 26
142158
}

‎test/SourceKit/SignatureHelp/signature_help_doc.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@ add(x: )
3030
key.doc_comment: "Adds two integers.\n\n- Parameters:\n - x: The first integer to add.\n - y: The second integer to add.\n\nUsage:\n```swift\nadd(1, to: 2) // 3\n```\n\n- Returns: The sum of the two integers.",
3131
key.parameters: [
3232
{
33+
key.name: "x",
3334
key.nameoffset: 4,
3435
key.namelength: 8
3536
},
3637
{
38+
key.name: "y",
3739
key.nameoffset: 14,
3840
key.namelength: 7
3941
}

‎test/SourceKit/SignatureHelp/signature_help_enum_case.swift‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,22 @@ func testUnlabled() {
2626
key.name: "upc(numberSystem: Int, manufacturer: Int, product: Int, check: Int) -> Barcode",
2727
key.parameters: [
2828
{
29+
key.name: "numberSystem",
2930
key.nameoffset: 4,
3031
key.namelength: 17
3132
},
3233
{
34+
key.name: "manufacturer",
3335
key.nameoffset: 23,
3436
key.namelength: 17
3537
},
3638
{
39+
key.name: "product",
3740
key.nameoffset: 42,
3841
key.namelength: 12
3942
},
4043
{
44+
key.name: "check",
4145
key.nameoffset: 56,
4246
key.namelength: 10
4347
}

‎test/SourceKit/SignatureHelp/signature_help_init.swift‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,17 @@ Person(name: "John", age: )
1717
key.name: "init(name: String, age: Int, profession: String)",
1818
key.parameters: [
1919
{
20+
key.name: "name",
2021
key.nameoffset: 5,
2122
key.namelength: 12
2223
},
2324
{
25+
key.name: "age",
2426
key.nameoffset: 19,
2527
key.namelength: 8
2628
},
2729
{
30+
key.name: "job",
2831
key.nameoffset: 29,
2932
key.namelength: 18
3033
}

0 commit comments

Comments
 (0)