@@ -232,23 +232,23 @@ private func sllConsumedResults(
232
232
233
233
return results. flatMap { result in
234
234
switch result {
235
- case . lookInMembers ( let lookInMembers ) :
235
+ case . lookForMembers ( let syntax ) :
236
236
return [
237
237
ConsumedLookupResult (
238
238
rawName: " " ,
239
- position: lookInMembers . lookupMembersPosition,
239
+ position: ( syntax . asProtocol ( SyntaxProtocol . self ) as! LookInMembersScopeSyntax ) . lookupMembersPosition,
240
240
flags: . shouldLookInMembers
241
241
)
242
242
]
243
- case . lookInGenericParametersOfExtendedType ( let extensionDecl) :
243
+ case . lookForGenericParameters ( let extensionDecl) :
244
244
return [
245
245
ConsumedLookupResult (
246
246
rawName: " " ,
247
247
position: extensionDecl. extensionKeyword. positionAfterSkippingLeadingTrivia,
248
248
flags: . ignoreNextFromHere
249
249
)
250
250
]
251
- case . mightIntroduceDollarIdentifiers ( let closure) :
251
+ case . lookForImplicitClosureParameters ( let closure) :
252
252
return [
253
253
ConsumedLookupResult (
254
254
rawName: " " ,
@@ -263,15 +263,15 @@ private func sllConsumedResults(
263
263
{
264
264
// If lookup started from inside function attributes, don't reverse.
265
265
return result. names. map { name in
266
- ConsumedLookupResult ( rawName: name. identifier? . name ?? " " , position: name. position, flags: [ ] )
266
+ ConsumedLookupResult ( rawName: name. identifier. name, position: name. position, flags: [ ] )
267
267
}
268
268
} else if parent. is ( FunctionDeclSyntax . self) || parent. is ( SubscriptDeclSyntax . self)
269
269
|| result. scope. range. contains ( lookupToken. position)
270
270
{
271
271
// If a result from function generic parameter clause or lookup started within it, reverse introduced names.
272
272
return result. names. reversed ( ) . map { name in
273
273
ConsumedLookupResult (
274
- rawName: name. identifier? . name ?? " " ,
274
+ rawName: name. identifier. name,
275
275
position: name. position,
276
276
flags: . placementRearranged
277
277
)
@@ -282,7 +282,7 @@ private func sllConsumedResults(
282
282
// If lookup started from nominal type inheritance clause, reverse introduced names.
283
283
return result. names. reversed ( ) . map { name in
284
284
ConsumedLookupResult (
285
- rawName: name. identifier? . name ?? " " ,
285
+ rawName: name. identifier. name,
286
286
position: name. position,
287
287
flags: . placementRearranged
288
288
)
@@ -293,7 +293,7 @@ private func sllConsumedResults(
293
293
// If lookup from inside the parent initializer decl, reverse introduced names.
294
294
return result. names. reversed ( ) . map { name in
295
295
ConsumedLookupResult (
296
- rawName: name. identifier? . name ?? " " ,
296
+ rawName: name. identifier. name,
297
297
position: name. position,
298
298
flags: . placementRearranged
299
299
)
@@ -304,7 +304,7 @@ private func sllConsumedResults(
304
304
// If lookup started from inside type alias initializer, reverse introduced names.
305
305
return result. names. reversed ( ) . map { name in
306
306
ConsumedLookupResult (
307
- rawName: name. identifier? . name ?? " " ,
307
+ rawName: name. identifier. name,
308
308
position: name. position,
309
309
flags: . placementRearranged
310
310
)
@@ -313,15 +313,15 @@ private func sllConsumedResults(
313
313
314
314
// No flags or reorderings to perform.
315
315
return result. names. map { name in
316
- ConsumedLookupResult ( rawName: name. identifier? . name ?? " " , position: name. position, flags: [ ] )
316
+ ConsumedLookupResult ( rawName: name. identifier. name, position: name. position, flags: [ ] )
317
317
}
318
318
} else {
319
319
return result. names. map { name in
320
320
// If a Self name not from protocol declaration, should be omitted if no match is found.
321
- let shouldBeOmitted = name. identifier? . name == " Self " ? !result. scope. is ( ProtocolDeclSyntax . self) : false
321
+ let shouldBeOmitted = name. identifier. name == " Self " ? !result. scope. is ( ProtocolDeclSyntax . self) : false
322
322
323
323
return ConsumedLookupResult (
324
- rawName: name. identifier? . name ?? " " ,
324
+ rawName: name. identifier. name,
325
325
position: name. position,
326
326
flags: shouldBeOmitted ? [ . shouldBeOptionallyOmitted] : [ ]
327
327
)
0 commit comments