Fix merge artifacts.

Author: MAJKFL

Sources/SwiftLexicalLookup/LookupName.swift

@@ -55,7 +55,7 @@ import SwiftSyntax
       "oldValue"
     }
   }
-  
+
   /// Identifier used for name comparison.
   var identifier: Identifier {
     Identifier(name)

Sources/SwiftLexicalLookup/ScopeImplementations.swift

@@ -106,7 +106,7 @@ import SwiftSyntax
     case .memberBlock:
       let names = introducedNames(using: .memberBlock)
         .filter { lookupName in
-          checkName(name, refersTo: lookupName, at: syntax)
+          checkName(identifier, refersTo: lookupName, at: syntax)
         }
 
       return names.isEmpty ? [] : [.fromFileScope(self, withNames: names)]
@@ -124,7 +124,7 @@ import SwiftSyntax
           if item.is(DeclSyntax.self) || item.is(VariableDeclSyntax.self) {
             let foundNames = LookupName.getNames(from: item)
 
-            members.append(contentsOf: foundNames.filter { checkName(name, refersTo: $0, at: syntax) })
+            members.append(contentsOf: foundNames.filter { checkName(identifier, refersTo: $0, at: syntax) })
           } else {
             encounteredNonDeclaration = true
             sequentialItems.append(codeBlockItem)
@@ -284,9 +284,9 @@ import SwiftSyntax
     state: LookupState
   ) -> [LookupResult] {
     if let elseBody, elseBody.position <= syntax.position, elseBody.endPosition >= syntax.position {
-      return lookupInParent(for: name, at: syntax, with: config, state: state)
+      return lookupInParent(for: identifier, at: syntax, with: config, state: state)
     } else {
-      return defaultLookupImplementation(for: name, at: syntax, with: config, state: state)
+      return defaultLookupImplementation(for: identifier, at: syntax, with: config, state: state)
     }
   }
 }
@@ -310,7 +310,7 @@ import SwiftSyntax
     let names = conditions.flatMap { element in
       LookupName.getNames(from: element.condition, accessibleAfter: element.endPosition)
     }.filter { introducedName in
-      checkName(name, refersTo: introducedName, at: syntax)
+      checkName(identifier, refersTo: introducedName, at: syntax)
     }
 
     return names.isEmpty ? [] : [.fromScope(self, withNames: names)]

Sources/SwiftLexicalLookup/ScopeSyntax.swift

@@ -95,7 +95,7 @@ extension SyntaxProtocol {
     let filteredNames =
       introducedNames
       .filter { introducedName in
-        checkName(name, refersTo: introducedName, at: syntax)
+        checkName(identifier, refersTo: introducedName, at: syntax)
       }
 
     if filteredNames.isEmpty {
@@ -116,7 +116,7 @@ extension SyntaxProtocol {
     parentScope?.lookup(for: identifier, at: syntax, with: config, state: state) ?? []
   }
 
-  func checkName(_ name: String?, refersTo introducedName: LookupName, at syntax: SyntaxProtocol) -> Bool {
+  func checkName(_ name: Identifier?, refersTo introducedName: LookupName, at syntax: SyntaxProtocol) -> Bool {
     introducedName.isAccessible(at: syntax) && (name == nil || introducedName.refersTo(name!))
   }
 }

Sources/SwiftLexicalLookup/SequentialScopeSyntax.swift

@@ -75,7 +75,7 @@ extension SequentialScopeSyntax {
               from: codeBlockItem.item,
               accessibleAfter: codeBlockItem.endPosition
             ).filter { introducedName in
-              checkName(name, refersTo: introducedName, at: syntax)
+              checkName(identifier, refersTo: introducedName, at: syntax)
             }
         )
       }
@@ -87,6 +87,7 @@ extension SequentialScopeSyntax {
       currentChunk = []
     }
 
-    return (result.isEmpty ? [] : result.reversed()) + lookupInParent(for: identifier, at: syntax, with: config, state: state)
+    return (result.isEmpty ? [] : result.reversed())
+      + lookupInParent(for: identifier, at: syntax, with: config, state: state)
   }
 }

Sources/SwiftSyntax/Identifier.swift

@@ -15,7 +15,7 @@ public struct Identifier: Equatable, Hashable, Sendable {
   enum IdentifierKind: Hashable {
     case token(raw: RawIdentifier, arena: SyntaxArenaRef)
     case string(String)
-    
+
     static func sanitize(string: String) -> IdentifierKind {
       let backtick = "`"
       if string.count > 2 && string.hasPrefix(backtick) && string.hasSuffix(backtick) {
@@ -27,7 +27,7 @@ public struct Identifier: Equatable, Hashable, Sendable {
       }
     }
   }
-  
+
   /// The sanitized name of the identifier.
   public var name: String {
     switch identifier {
@@ -37,7 +37,7 @@ public struct Identifier: Equatable, Hashable, Sendable {
       string
     }
   }
-  
+
   @_spi(RawSyntax)
   public var raw: RawIdentifier? {
     switch identifier {
@@ -54,14 +54,14 @@ public struct Identifier: Equatable, Hashable, Sendable {
     guard case .identifier = token.tokenKind else {
       return nil
     }
-    
+
     self.identifier = .token(raw: RawIdentifier(token.tokenView), arena: token.tokenView.raw.arenaReference)
   }
-  
+
   public init(_ string: String) {
     self.identifier = IdentifierKind.sanitize(string: string)
   }
-  
+
   public static func == (lhs: Self, rhs: Self) -> Bool {
     lhs.name == rhs.name
   }

Tests/SwiftLexicalLookupTest/Assertions.swift

@@ -15,6 +15,7 @@ import SwiftParser
 import SwiftSyntax
 import XCTest
 import _SwiftSyntaxTestSupport
+
 /// `methodUnderTest` is called with the token at every position marker in the keys of `expected`.
 /// It then asserts that the positions of the syntax nodes returned by `methodUnderTest` are the values in `expected`.
 /// It also checks whether result types match rules specified in `expectedResultTypes`.
@@ -93,7 +94,7 @@ func assertLexicalNameLookup(
     source: source,
     methodUnderTest: { marker, tokenAtMarker in
       let lookupIdentifier = Identifier(tokenAtMarker) ?? Identifier(tokenAtMarker.text)
-      
+
       let result = tokenAtMarker.lookup(for: useNilAsTheParameter ? nil : lookupIdentifier, with: config)
 
       guard let expectedValues = references[marker] else {

Tests/SwiftLexicalLookupTest/NameLookupTests.swift

@@ -668,7 +668,7 @@ final class testNameLookup: XCTestCase {
       ]
     )
   }
-  
+
   func testBacktickCompatibility() {
     assertLexicalNameLookup(
       source: """
@@ -679,7 +679,7 @@ final class testNameLookup: XCTestCase {
             print(4️⃣`self`)
           }
         }
-        
+
         5️⃣struct Bar {
           func test() {
             print(6️⃣self)
@@ -691,18 +691,18 @@ final class testNameLookup: XCTestCase {
       references: [
         "3️⃣": [
           .fromScope(CodeBlockSyntax.self, expectedNames: [NameExpectation.identifier("2️⃣")]),
-          .fromScope(StructDeclSyntax.self, expectedNames: [NameExpectation.implicit(.self("1️⃣"))])
+          .fromScope(StructDeclSyntax.self, expectedNames: [NameExpectation.implicit(.self("1️⃣"))]),
         ],
         "4️⃣": [
           .fromScope(CodeBlockSyntax.self, expectedNames: [NameExpectation.identifier("2️⃣")]),
-          .fromScope(StructDeclSyntax.self, expectedNames: [NameExpectation.implicit(.self("1️⃣"))])
+          .fromScope(StructDeclSyntax.self, expectedNames: [NameExpectation.implicit(.self("1️⃣"))]),
         ],
         "6️⃣": [
           .fromScope(StructDeclSyntax.self, expectedNames: [NameExpectation.implicit(.self("5️⃣"))])
         ],
         "8️⃣": [
           .fromScope(CodeBlockSyntax.self, expectedNames: [NameExpectation.identifier("7️⃣")]),
-          .fromScope(StructDeclSyntax.self, expectedNames: [NameExpectation.implicit(.self("5️⃣"))])
+          .fromScope(StructDeclSyntax.self, expectedNames: [NameExpectation.implicit(.self("5️⃣"))]),
         ],
       ]
     )