Add suggested changes from the previous PR.

Author: MAJKFL

Sources/SwiftLexicalLookup/Configurations/LookupConfig.swift

@@ -15,9 +15,9 @@ import Foundation
 @_spi(Experimental) public struct LookupConfig {
   /// Specifies behaviour of file scope.
   /// `memberBlockUpToLastDecl` by default.
-  public var fileScopeHandling: FileScopeHandlingConfig
+  @_spi(Experimental) public var fileScopeHandling: FileScopeHandlingConfig
 
-  public init(
+  @_spi(Experimental) public init(
     fileScopeHandling: FileScopeHandlingConfig = .memberBlockUpToLastDecl
   ) {
     self.fileScopeHandling = fileScopeHandling

Sources/SwiftLexicalLookup/IdentifiableSyntax.swift

@@ -13,25 +13,25 @@
 import SwiftSyntax
 
 /// Syntax node that can be refered to with an identifier.
-public protocol IdentifiableSyntax: SyntaxProtocol {
+@_spi(Experimental) public protocol IdentifiableSyntax: SyntaxProtocol {
   var identifier: TokenSyntax { get }
 }
 
-extension IdentifierPatternSyntax: IdentifiableSyntax {}
+@_spi(Experimental) extension IdentifierPatternSyntax: IdentifiableSyntax {}
 
-extension ClosureParameterSyntax: IdentifiableSyntax {
+@_spi(Experimental) extension ClosureParameterSyntax: IdentifiableSyntax {
   @_spi(Experimental) public var identifier: TokenSyntax {
     secondName ?? firstName
   }
 }
 
-extension ClosureShorthandParameterSyntax: IdentifiableSyntax {
+@_spi(Experimental) extension ClosureShorthandParameterSyntax: IdentifiableSyntax {
   @_spi(Experimental) public var identifier: TokenSyntax {
     name
   }
 }
 
-extension ClosureCaptureSyntax: IdentifiableSyntax {
+@_spi(Experimental) extension ClosureCaptureSyntax: IdentifiableSyntax {
   @_spi(Experimental) public var identifier: TokenSyntax {
     /* Doesn't work with closures like:
      _ = { [y=1+2] in
@@ -42,7 +42,7 @@ extension ClosureCaptureSyntax: IdentifiableSyntax {
   }
 }
 
-extension AccessorParametersSyntax: IdentifiableSyntax {
+@_spi(Experimental) extension AccessorParametersSyntax: IdentifiableSyntax {
   @_spi(Experimental) public var identifier: TokenSyntax {
     name
   }

Sources/SwiftLexicalLookup/LookupName.swift

@@ -124,8 +124,11 @@ import SwiftSyntax
     return name == lookedUpName
   }
 
-  /// Extracts names introduced by the given `from` structure.
-  static func getNames(from syntax: SyntaxProtocol, accessibleAfter: AbsolutePosition? = nil) -> [LookupName] {
+  /// Extracts names introduced by the given `syntax` structure.
+  static func getNames(
+    from syntax: SyntaxProtocol,
+    accessibleAfter: AbsolutePosition? = nil
+  ) -> [LookupName] {
     switch Syntax(syntax).as(SyntaxEnum.self) {
     case .variableDecl(let variableDecl):
       variableDecl.bindings.flatMap { binding in
@@ -165,21 +168,26 @@ import SwiftSyntax
   }
 
   /// Extracts name introduced by `IdentifiableSyntax` node.
-  private static func handle(identifiable: IdentifiableSyntax, accessibleAfter: AbsolutePosition? = nil) -> [LookupName]
-  {
+  private static func handle(
+    identifiable: IdentifiableSyntax,
+    accessibleAfter: AbsolutePosition? = nil
+  ) -> [LookupName] {
     if let closureCapture = identifiable as? ClosureCaptureSyntax,
       closureCapture.identifier.tokenKind == .keyword(.self)
     {
       return [.implicit(.self(closureCapture))]  // Handle `self` closure capture.
-    } else if identifiable.identifier.text != "_" {
+    } else if identifiable.identifier.tokenKind != .wildcard {
       return [.identifier(identifiable, accessibleAfter: accessibleAfter)]
     } else {
       return []
     }
   }
 
   /// Extracts name introduced by `NamedDeclSyntax` node.
-  private static func handle(namedDecl: NamedDeclSyntax, accessibleAfter: AbsolutePosition? = nil) -> [LookupName] {
+  private static func handle(
+    namedDecl: NamedDeclSyntax,
+    accessibleAfter: AbsolutePosition? = nil
+  ) -> [LookupName] {
     [.declaration(namedDecl, accessibleAfter: accessibleAfter)]
   }
 }

Sources/SwiftLexicalLookup/LookupResult.swift

@@ -12,7 +12,7 @@
 
 import SwiftSyntax
 
-/// Represents resul
+/// Represents result from a specific scope.
 @_spi(Experimental) public enum LookupResult {
   /// Scope and the names that matched lookup.
   case fromScope(ScopeSyntax, withNames: [LookupName])

Sources/SwiftLexicalLookup/LookupState.swift

@@ -15,7 +15,7 @@ import Foundation
 @_spi(Experimental) public struct LookupState {
   /// Specifies scopes that introduce names to their parent and
   /// should be skipped during lookup in sequential scopes.
-  var skipSequentialIntroductionFrom: IntroducingToSequentialParentScopeSyntax?
+  @_spi(Experimental) public var skipSequentialIntroductionFrom: IntroducingToSequentialParentScopeSyntax?
 
   @_spi(Experimental) public init() {}
 }

Sources/SwiftLexicalLookup/ScopeImplementations.swift

@@ -12,9 +12,9 @@
 
 import SwiftSyntax
 
-extension SyntaxProtocol {
+@_spi(Experimental) extension SyntaxProtocol {
   /// Parent scope of this syntax node, or scope introduced by this syntax node.
-  var scope: ScopeSyntax? {
+  @_spi(Experimental) public var scope: ScopeSyntax? {
     if let scopeSyntax = Syntax(self).asProtocol(SyntaxProtocol.self) as? ScopeSyntax {
       scopeSyntax
     } else {
@@ -26,7 +26,7 @@ extension SyntaxProtocol {
 @_spi(Experimental) extension SourceFileSyntax: SequentialScopeSyntax {
   /// All names introduced in the file scope
   /// according to the default strategy: `memberBlockUpToLastDecl`.
-  public var introducedNames: [LookupName] {
+  @_spi(Experimental) public var introducedNames: [LookupName] {
     introducedNames(using: .memberBlockUpToLastDecl)
   }
 
@@ -47,10 +47,10 @@ extension SyntaxProtocol {
   /// ```
   /// During lookup, according to different configurations,
   /// names available at the marked place are:
-  /// - for `fileScopeNameIntroductionStrategy` - a, b, c, d
+  /// - for `memberBlockUpToLastDecl` - a, b, c, d
   /// - for `memberBlock` - a, b, c, d, e, f
   /// - for `codeBlock` - a
-  public func introducedNames(using fileScopeHandling: FileScopeHandlingConfig) -> [LookupName] {
+  @_spi(Experimental) public func introducedNames(using fileScopeHandling: FileScopeHandlingConfig) -> [LookupName] {
     switch fileScopeHandling {
     case .memberBlockUpToLastDecl:
       var encounteredNonDeclaration = false
@@ -61,7 +61,7 @@ extension SyntaxProtocol {
         if encounteredNonDeclaration {
           return LookupName.getNames(from: item, accessibleAfter: codeBlockItem.endPosition)
         } else {
-          if item.is(DeclSyntax.self) || item.is(VariableDeclSyntax.self) {
+          if item.is(DeclSyntax.self) {
             return LookupName.getNames(from: item)
           } else {
             encounteredNonDeclaration = true
@@ -97,10 +97,10 @@ extension SyntaxProtocol {
   /// ```
   /// According to different configurations,
   /// names available at the marked place are:
-  /// - for `fileScopeNameIntroductionStrategy` - a, b, c, d
+  /// - for `memberBlockUpToLastDecl` - a, b, c, d
   /// - for `memberBlock` - a, b, c, d, e, f
   /// - for `codeBlock` - a
-  public func lookup(
+  @_spi(Experimental) public func lookup(
     for name: String?,
     at syntax: SyntaxProtocol,
     with config: LookupConfig,
@@ -162,13 +162,13 @@ extension SyntaxProtocol {
 @_spi(Experimental) extension CodeBlockSyntax: SequentialScopeSyntax {
   /// Names introduced in the code block scope
   /// accessible after their declaration.
-  public var introducedNames: [LookupName] {
+  @_spi(Experimental) public var introducedNames: [LookupName] {
     statements.flatMap { codeBlockItem in
       LookupName.getNames(from: codeBlockItem.item, accessibleAfter: codeBlockItem.endPosition)
     }
   }
 
-  public func lookup(
+  @_spi(Experimental) public func lookup(
     for name: String?,
     at syntax: SyntaxProtocol,
     with config: LookupConfig,
@@ -187,7 +187,7 @@ extension SyntaxProtocol {
 
 @_spi(Experimental) extension ForStmtSyntax: ScopeSyntax {  
   /// Names introduced in the `for` body.
-  public var introducedNames: [LookupName] {
+  @_spi(Experimental) public var introducedNames: [LookupName] {
     LookupName.getNames(from: pattern)
   }
 }
@@ -204,26 +204,20 @@ extension SyntaxProtocol {
   /// ```
   /// During lookup, names available at the marked place are:
   /// `self`, a, b.
-  public var introducedNames: [LookupName] {
+  @_spi(Experimental) public var introducedNames: [LookupName] {
     let captureNames =
-      signature?.capture?.children(viewMode: .sourceAccurate).flatMap { child in
-        if let captureList = child.as(ClosureCaptureListSyntax.self) {
-          captureList.children(viewMode: .sourceAccurate).flatMap { capture in
-            LookupName.getNames(from: capture)
-          }
-        } else {
-          LookupName.getNames(from: child)
-        }
+      signature?.capture?.items.flatMap { element in
+        LookupName.getNames(from: element)
       } ?? []
 
     let parameterNames =
       signature?.parameterClause?.children(viewMode: .sourceAccurate).flatMap { parameter in
         if let parameterList = parameter.as(ClosureParameterListSyntax.self) {
-          parameterList.children(viewMode: .sourceAccurate).flatMap { parameter in
+          return parameterList.children(viewMode: .sourceAccurate).flatMap { parameter in
             LookupName.getNames(from: parameter)
           }
         } else {
-          LookupName.getNames(from: parameter)
+          return LookupName.getNames(from: parameter)
         }
       } ?? []
 
@@ -233,7 +227,7 @@ extension SyntaxProtocol {
 
 @_spi(Experimental) extension WhileStmtSyntax: ScopeSyntax {
   /// Names introduced by the `while` loop by its conditions.
-  public var introducedNames: [LookupName] {
+  @_spi(Experimental) public var introducedNames: [LookupName] {
     conditions.flatMap { element in
       LookupName.getNames(from: element.condition)
     }
@@ -242,7 +236,7 @@ extension SyntaxProtocol {
 
 @_spi(Experimental) extension IfExprSyntax: ScopeSyntax {
   /// Parent scope, omitting ancestor `if` statements if part of their `else if` clause.
-  public var parentScope: ScopeSyntax? {
+  @_spi(Experimental) public var parentScope: ScopeSyntax? {
     getParent(for: self.parent, previousIfElse: self.elseKeyword == nil)
   }
 
@@ -278,7 +272,7 @@ extension SyntaxProtocol {
   }
 
   /// Names introduced by the `if` optional binding conditions.
-  public var introducedNames: [LookupName] {
+  @_spi(Experimental) public var introducedNames: [LookupName] {
     conditions.flatMap { element in
       LookupName.getNames(from: element.condition, accessibleAfter: element.endPosition)
     }
@@ -296,7 +290,7 @@ extension SyntaxProtocol {
   ///   // <-- a is not visible here
   /// }
   /// ```
-  public func lookup(
+  @_spi(Experimental) public func lookup(
     for name: String?,
     at syntax: SyntaxProtocol,
     with config: LookupConfig,
@@ -312,15 +306,15 @@ extension SyntaxProtocol {
 
 @_spi(Experimental) extension MemberBlockSyntax: ScopeSyntax {
   /// All names introduced by members of this member scope.
-  public var introducedNames: [LookupName] {
+  @_spi(Experimental) public var introducedNames: [LookupName] {
     members.flatMap { member in
       LookupName.getNames(from: member.decl)
     }
   }
 }
 
 @_spi(Experimental) extension GuardStmtSyntax: IntroducingToSequentialParentScopeSyntax {
-  public func introducesToSequentialParent(
+  @_spi(Experimental) public func introducesToSequentialParent(
     for name: String?,
     at syntax: SwiftSyntax.SyntaxProtocol,
     with config: LookupConfig,
@@ -335,7 +329,7 @@ extension SyntaxProtocol {
     return names.isEmpty ? [] : [.fromScope(self, withNames: names)]
   }
 
-  public var introducedNames: [LookupName] {
+  @_spi(Experimental) public var introducedNames: [LookupName] {
     []
   }
 
@@ -350,7 +344,7 @@ extension SyntaxProtocol {
   /// }
   /// // a is visible here
   /// ```
-  public func lookup(
+  @_spi(Experimental) public func lookup(
     for name: String?,
     at syntax: SyntaxProtocol,
     with config: LookupConfig,
@@ -373,7 +367,7 @@ extension SyntaxProtocol {
 @_spi(Experimental) extension ExtensionDeclSyntax: TypeScopeSyntax {}
 
 @_spi(Experimental) extension AccessorDeclSyntax: ScopeSyntax {
-  public var introducedNames: [LookupName] {
+  @_spi(Experimental) public var introducedNames: [LookupName] {
     if let parameters {
       LookupName.getNames(from: parameters)
     } else {

Sources/SwiftLexicalLookup/ScopeSyntax.swift

@@ -14,10 +14,10 @@ import SwiftSyntax
 
 extension SyntaxProtocol {
   /// Returns all names that `for` refers to at this syntax node.
-  /// Optional configuration can be passed as `with` to customize the lookup behavior.
+  /// Optional configuration can be passed as `config` to customize the lookup behavior.
   ///
-  /// - Returns: An array of `LookupResult` for name `for` at this syntax node,
-  /// ordered by visibility. If set to `nil`, returns all available names ordered by visibility.
+  /// - Returns: An array of `LookupResult` for `name`  at this syntax node,
+  /// ordered by visibility. If `name` is set to `nil`, returns all available names ordered by visibility.
   /// The order is from the innermost to the outermost scope,
   /// and within each result, names are ordered by their introduction
   /// in the source code.
@@ -56,7 +56,7 @@ extension SyntaxProtocol {
   var parentScope: ScopeSyntax? { get }
   /// Names found in this scope. Ordered from first to last introduced.
   var introducedNames: [LookupName] { get }
-  /// Finds all declarations `name` refers to. `at` specifies the node lookup was triggered with.
+  /// Finds all declarations `name` refers to. `syntax` specifies the node lookup was triggered with.
   /// If `name` set to `nil`, returns all available names at the given node.
   func lookup(for name: String?, 
               at syntax: SyntaxProtocol,
@@ -65,14 +65,14 @@ extension SyntaxProtocol {
 }
 
 @_spi(Experimental) extension ScopeSyntax {
-  public var parentScope: ScopeSyntax? {
+  @_spi(Experimental) public var parentScope: ScopeSyntax? {
     self.parent?.scope
   }
 
   /// Returns `LookupResult` of all names introduced in this scope that `name`
   /// refers to and is accessible at given syntax node then passes lookup to the parent.
   /// If `name` set to `nil`, returns all available names at the given node.
-  public func lookup(
+  @_spi(Experimental) public func lookup(
     for name: String?,
     at syntax: SyntaxProtocol,
     with config: LookupConfig,

Sources/SwiftLexicalLookup/SequentialScopeSyntax.swift

@@ -30,7 +30,7 @@ import SwiftSyntax
 }
 
 @_spi(Experimental) extension SequentialScopeSyntax {
-  public func sequentialLookup(
+  @_spi(Experimental) public func sequentialLookup(
     in codeBlockItems: any Collection<CodeBlockItemSyntax>,
     for name: String?,
     at syntax: SyntaxProtocol,

Sources/SwiftLexicalLookup/TypeScopeSyntax.swift

@@ -17,11 +17,11 @@ import SwiftSyntax
 }
 
 @_spi(Experimental) extension TypeScopeSyntax {
-  public var implicitInstanceAndTypeNames: [LookupName] {
+  @_spi(Experimental) public var implicitInstanceAndTypeNames: [LookupName] {
     [.implicit(.self(self)), .implicit(.Self(self))]
   }
 
-  public var introducedNames: [LookupName] {
+  @_spi(Experimental) public var introducedNames: [LookupName] {
     implicitInstanceAndTypeNames
   }
 }