@@ -232,23 +232,23 @@ private func sllConsumedResults(
232232
233233 return results. flatMap { result in
234234 switch result {
235- case . lookInMembers ( let lookInMembers ) :
235+ case . lookForMembers ( let syntax ) :
236236 return [
237237 ConsumedLookupResult (
238238 rawName: " " ,
239- position: lookInMembers . lookupMembersPosition,
239+ position: ( syntax . asProtocol ( SyntaxProtocol . self ) as! LookInMembersScopeSyntax ) . lookupMembersPosition,
240240 flags: . shouldLookInMembers
241241 )
242242 ]
243- case . lookInGenericParametersOfExtendedType ( let extensionDecl) :
243+ case . lookForGenericParameters ( let extensionDecl) :
244244 return [
245245 ConsumedLookupResult (
246246 rawName: " " ,
247247 position: extensionDecl. extensionKeyword. positionAfterSkippingLeadingTrivia,
248248 flags: . ignoreNextFromHere
249249 )
250250 ]
251- case . mightIntroduceDollarIdentifiers ( let closure) :
251+ case . lookForImplicitClosureParameters ( let closure) :
252252 return [
253253 ConsumedLookupResult (
254254 rawName: " " ,
@@ -263,15 +263,15 @@ private func sllConsumedResults(
263263 {
264264 // If lookup started from inside function attributes, don't reverse.
265265 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: [ ] )
267267 }
268268 } else if parent. is ( FunctionDeclSyntax . self) || parent. is ( SubscriptDeclSyntax . self)
269269 || result. scope. range. contains ( lookupToken. position)
270270 {
271271 // If a result from function generic parameter clause or lookup started within it, reverse introduced names.
272272 return result. names. reversed ( ) . map { name in
273273 ConsumedLookupResult (
274- rawName: name. identifier? . name ?? " " ,
274+ rawName: name. identifier. name,
275275 position: name. position,
276276 flags: . placementRearranged
277277 )
@@ -282,7 +282,7 @@ private func sllConsumedResults(
282282 // If lookup started from nominal type inheritance clause, reverse introduced names.
283283 return result. names. reversed ( ) . map { name in
284284 ConsumedLookupResult (
285- rawName: name. identifier? . name ?? " " ,
285+ rawName: name. identifier. name,
286286 position: name. position,
287287 flags: . placementRearranged
288288 )
@@ -293,7 +293,7 @@ private func sllConsumedResults(
293293 // If lookup from inside the parent initializer decl, reverse introduced names.
294294 return result. names. reversed ( ) . map { name in
295295 ConsumedLookupResult (
296- rawName: name. identifier? . name ?? " " ,
296+ rawName: name. identifier. name,
297297 position: name. position,
298298 flags: . placementRearranged
299299 )
@@ -304,7 +304,7 @@ private func sllConsumedResults(
304304 // If lookup started from inside type alias initializer, reverse introduced names.
305305 return result. names. reversed ( ) . map { name in
306306 ConsumedLookupResult (
307- rawName: name. identifier? . name ?? " " ,
307+ rawName: name. identifier. name,
308308 position: name. position,
309309 flags: . placementRearranged
310310 )
@@ -313,15 +313,15 @@ private func sllConsumedResults(
313313
314314 // No flags or reorderings to perform.
315315 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: [ ] )
317317 }
318318 } else {
319319 return result. names. map { name in
320320 // 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
322322
323323 return ConsumedLookupResult (
324- rawName: name. identifier? . name ?? " " ,
324+ rawName: name. identifier. name,
325325 position: name. position,
326326 flags: shouldBeOmitted ? [ . shouldBeOptionallyOmitted] : [ ]
327327 )
0 commit comments