Skip to content

Refactor SwiftLexicalLookup validation to use updated public API interface #80063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 25, 2025
Merged

Refactor SwiftLexicalLookup validation to use updated public API interface #80063

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23de52f
Merge remote-tracking branch 'upstream/main'
MAJKFL Dec 18, 2024
d25f6fc
Merge remote-tracking branch 'upstream/main'
MAJKFL Feb 21, 2025
06c1315
Switch to using structs from SwiftLexicalLookup results.
MAJKFL Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions lib/ASTGen/Sources/ASTGen/LexicalLookup.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,23 +232,23 @@ private func sllConsumedResults(

return results.flatMap { result in
switch result {
case .lookInMembers(let lookInMembers):
case .lookForMembers(let syntax):
return [
ConsumedLookupResult(
rawName: "",
position: lookInMembers.lookupMembersPosition,
position: (syntax.asProtocol(SyntaxProtocol.self) as! LookInMembersScopeSyntax).lookupMembersPosition,
flags: .shouldLookInMembers
)
]
case .lookInGenericParametersOfExtendedType(let extensionDecl):
case .lookForGenericParameters(let extensionDecl):
return [
ConsumedLookupResult(
rawName: "",
position: extensionDecl.extensionKeyword.positionAfterSkippingLeadingTrivia,
flags: .ignoreNextFromHere
)
]
case .mightIntroduceDollarIdentifiers(let closure):
case .lookForImplicitClosureParameters(let closure):
return [
ConsumedLookupResult(
rawName: "",
Expand All @@ -263,15 +263,15 @@ private func sllConsumedResults(
{
// If lookup started from inside function attributes, don't reverse.
return result.names.map { name in
ConsumedLookupResult(rawName: name.identifier?.name ?? "", position: name.position, flags: [])
ConsumedLookupResult(rawName: name.identifier.name, position: name.position, flags: [])
}
} else if parent.is(FunctionDeclSyntax.self) || parent.is(SubscriptDeclSyntax.self)
|| result.scope.range.contains(lookupToken.position)
{
// If a result from function generic parameter clause or lookup started within it, reverse introduced names.
return result.names.reversed().map { name in
ConsumedLookupResult(
rawName: name.identifier?.name ?? "",
rawName: name.identifier.name,
position: name.position,
flags: .placementRearranged
)
Expand All @@ -282,7 +282,7 @@ private func sllConsumedResults(
// If lookup started from nominal type inheritance clause, reverse introduced names.
return result.names.reversed().map { name in
ConsumedLookupResult(
rawName: name.identifier?.name ?? "",
rawName: name.identifier.name,
position: name.position,
flags: .placementRearranged
)
Expand All @@ -293,7 +293,7 @@ private func sllConsumedResults(
// If lookup from inside the parent initializer decl, reverse introduced names.
return result.names.reversed().map { name in
ConsumedLookupResult(
rawName: name.identifier?.name ?? "",
rawName: name.identifier.name,
position: name.position,
flags: .placementRearranged
)
Expand All @@ -304,7 +304,7 @@ private func sllConsumedResults(
// If lookup started from inside type alias initializer, reverse introduced names.
return result.names.reversed().map { name in
ConsumedLookupResult(
rawName: name.identifier?.name ?? "",
rawName: name.identifier.name,
position: name.position,
flags: .placementRearranged
)
Expand All @@ -313,15 +313,15 @@ private func sllConsumedResults(

// No flags or reorderings to perform.
return result.names.map { name in
ConsumedLookupResult(rawName: name.identifier?.name ?? "", position: name.position, flags: [])
ConsumedLookupResult(rawName: name.identifier.name, position: name.position, flags: [])
}
} else {
return result.names.map { name in
// If a Self name not from protocol declaration, should be omitted if no match is found.
let shouldBeOmitted = name.identifier?.name == "Self" ? !result.scope.is(ProtocolDeclSyntax.self) : false
let shouldBeOmitted = name.identifier.name == "Self" ? !result.scope.is(ProtocolDeclSyntax.self) : false

return ConsumedLookupResult(
rawName: name.identifier?.name ?? "",
rawName: name.identifier.name,
position: name.position,
flags: shouldBeOmitted ? [.shouldBeOptionallyOmitted] : []
)
Expand Down