Fix class declaration availability in code block scopes.

Author: MAJKFL

Sources/SwiftLexicalLookup/LookupName.swift

@@ -18,14 +18,14 @@ import SwiftSyntax
   case identifier(IdentifiableSyntax, accessibleAfter: AbsolutePosition?)
   /// Declaration associated with the name.
   /// Could be class, struct, actor, protocol, function and more.
-  case declaration(NamedDeclSyntax, accessibleAfter: AbsolutePosition?)
+  case declaration(NamedDeclSyntax)
 
   /// Syntax associated with this name.
   @_spi(Experimental) public var syntax: SyntaxProtocol {
     switch self {
     case .identifier(let syntax, _):
       return syntax
-    case .declaration(let syntax, _):
+    case .declaration(let syntax):
       return syntax
     }
   }
@@ -35,7 +35,7 @@ import SwiftSyntax
     switch self {
     case .identifier(let syntax, _):
       return Identifier(syntax.identifier)
-    case .declaration(let syntax, _):
+    case .declaration(let syntax):
       return Identifier(syntax.name)
     }
   }
@@ -44,8 +44,10 @@ import SwiftSyntax
   /// If set to `nil`, the name is available at any point in scope.
   var accessibleAfter: AbsolutePosition? {
     switch self {
-    case .identifier(_, let absolutePosition), .declaration(_, let absolutePosition):
+    case .identifier(_, let absolutePosition):
       return absolutePosition
+    default:
+      return nil
     }
   }
 
@@ -133,6 +135,6 @@ import SwiftSyntax
     namedDecl: NamedDeclSyntax,
     accessibleAfter: AbsolutePosition? = nil
   ) -> [LookupName] {
-    [.declaration(namedDecl, accessibleAfter: accessibleAfter)]
+    [.declaration(namedDecl)]
   }
 }

Tests/SwiftLexicalLookupTest/NameLookupTests.swift

@@ -486,13 +486,13 @@ final class testNameLookup: XCTestCase {
 
         9️⃣class d {}
 
-        let x = 0️⃣d
+        let 🔟a = 0️⃣d
         """,
       references: [
         "3️⃣": [.fromFileScope(expectedNames: ["1️⃣", "8️⃣"])],
         "4️⃣": [.fromFileScope(expectedNames: ["2️⃣"])],
         "5️⃣": [.fromFileScope(expectedNames: ["7️⃣"])],
-        "6️⃣": [],
+        "6️⃣": [.fromFileScope(expectedNames: ["9️⃣"])],
         "0️⃣": [.fromFileScope(expectedNames: ["9️⃣"])],
       ],
       expectedResultTypes: .all(ClassDeclSyntax.self, except: ["8️⃣": IdentifierPatternSyntax.self])
@@ -516,16 +516,19 @@ final class testNameLookup: XCTestCase {
 
         9️⃣class d {}
 
-        let x = 0️⃣d
+        let 🔟a = 0️⃣d
         """,
       references: [
-        "3️⃣": [.fromFileScope(expectedNames: ["1️⃣", "8️⃣"])],
+        "3️⃣": [.fromFileScope(expectedNames: ["1️⃣", "8️⃣", "🔟"])],
         "4️⃣": [.fromFileScope(expectedNames: ["2️⃣"])],
         "5️⃣": [.fromFileScope(expectedNames: ["7️⃣"])],
         "6️⃣": [.fromFileScope(expectedNames: ["9️⃣"])],
         "0️⃣": [.fromFileScope(expectedNames: ["9️⃣"])],
       ],
-      expectedResultTypes: .all(ClassDeclSyntax.self, except: ["8️⃣": IdentifierPatternSyntax.self]),
+      expectedResultTypes: .all(ClassDeclSyntax.self, except: [
+        "8️⃣": IdentifierPatternSyntax.self,
+        "🔟": IdentifierPatternSyntax.self
+      ]),
       config: LookupConfig(fileScopeHandling: .memberBlock)
     )
   }
@@ -547,17 +550,35 @@ final class testNameLookup: XCTestCase {
 
         9️⃣class d {}
 
-        let x = 0️⃣d
+        let 🔟a = 0️⃣d
         """,
       references: [
         "3️⃣": [.fromFileScope(expectedNames: ["1️⃣"])],
-        "4️⃣": [],
-        "5️⃣": [],
-        "6️⃣": [],
+        "4️⃣": [.fromFileScope(expectedNames: ["2️⃣"])],
+        "5️⃣": [.fromFileScope(expectedNames: ["7️⃣"])],
+        "6️⃣": [.fromFileScope(expectedNames: ["9️⃣"])],
         "0️⃣": [.fromFileScope(expectedNames: ["9️⃣"])],
       ],
       expectedResultTypes: .all(ClassDeclSyntax.self, except: ["8️⃣": IdentifierPatternSyntax.self]),
       config: LookupConfig(fileScopeHandling: .codeBlock)
     )
   }
+  
+  func testDeclarationAvailabilityInCodeBlock() {
+    assertLexicalNameLookup(
+      source: """
+        func x {
+          1️⃣class A {}
+        
+          let a = 2️⃣A()
+        
+          3️⃣class A {}
+        }
+        """,
+      references: [
+        "2️⃣": [.fromScope(CodeBlockSyntax.self, expectedNames: ["1️⃣", "3️⃣"])]
+      ],
+      expectedResultTypes: .all(ClassDeclSyntax.self)
+    )
+  }
 }