Fix merge artifacts.

Author: MAJKFL

Sources/SwiftLexicalLookup/Scopes/GenericParameterOrAssociatedTypeScopeSyntax.swift

@@ -39,18 +39,18 @@ import SwiftSyntax
   /// this method passes lookup to function scope's parent scope
   /// (in this case: file scope).
   @_spi(Experimental) public func lookup(
-    identifier: Identifier?,
+    _ identifier: Identifier?,
     at lookUpPosition: AbsolutePosition,
     with config: LookupConfig
   ) -> [LookupResult] {
     return defaultLookupImplementation(
-      identifier: identifier,
+      identifier,
       at: lookUpPosition,
       with: config,
       propagateToParent: false
     )
       + lookupBypassingParentResults(
-        identifier: identifier,
+        identifier,
         at: lookUpPosition,
         with: config
       )
@@ -75,7 +75,7 @@ import SwiftSyntax
   /// to pass lookup to the function scope's parent scope (in this case: file scope)
   /// and effectively bypass names already looked up before.
   private func lookupBypassingParentResults(
-    identifier: Identifier?,
+    _ identifier: Identifier?,
     at lookUpPosition: AbsolutePosition,
     with config: LookupConfig
   ) -> [LookupResult] {
@@ -84,9 +84,9 @@ import SwiftSyntax
     if let parentScope = Syntax(parentScope).asProtocol(SyntaxProtocol.self)
       as? WithGenericParametersOrAssociatedTypesScopeSyntax
     {
-      return parentScope.lookupInParent(identifier: identifier, at: lookUpPosition, with: config)
+      return parentScope.lookupInParent(identifier, at: lookUpPosition, with: config)
     } else {
-      return lookupInParent(identifier: identifier, at: lookUpPosition, with: config)
+      return lookupInParent(identifier, at: lookUpPosition, with: config)
     }
   }
 }

Sources/SwiftLexicalLookup/Scopes/ScopeSyntax.swift

@@ -87,20 +87,18 @@ extension SyntaxProtocol {
   func defaultLookupImplementation(
     _ identifier: Identifier?,
     at lookUpPosition: AbsolutePosition,
-    with config: LookupConfig
+    with config: LookupConfig,
+    propagateToParent: Bool = true
   ) -> [LookupResult] {
     let filteredNames =
       introducedNames
       .filter { introducedName in
         checkIdentifier(identifier, refersTo: introducedName, at: lookUpPosition)
       }
 
-    if filteredNames.isEmpty {
-      return lookupInParent(identifier, at: lookUpPosition, with: config)
-    } else {
-      return [.fromScope(self, withNames: filteredNames)]
-        + lookupInParent(identifier, at: lookUpPosition, with: config)
-    }
+    let fromThisScope = filteredNames.isEmpty ? [] : [LookupResult.fromScope(self, withNames: filteredNames)]
+
+    return fromThisScope + (propagateToParent ? lookupInParent(identifier, at: lookUpPosition, with: config) : [])
   }
 
   /// Looks up in parent scope.

Sources/SwiftLexicalLookup/Scopes/WithGenericParametersOrAssociatedTypesScopeSyntax.swift

@@ -38,18 +38,18 @@ import SwiftSyntax
   /// scope (`WithGenericParametersOrAssociatedTypesScopeSyntax`)
   /// instead of it's actual parent scope (in this case: file scope).
   @_spi(Experimental) public func lookup(
-    identifier: Identifier?,
+    _ identifier: Identifier?,
     at lookUpPosition: AbsolutePosition,
     with config: LookupConfig
   ) -> [LookupResult] {
     return defaultLookupImplementation(
-      identifier: identifier,
+      identifier,
       at: position,
       with: config,
       propagateToParent: false
     )
       + lookupThroughGenericParameterScope(
-        identifier: identifier,
+        identifier,
         at: lookUpPosition,
         with: config
       )
@@ -72,16 +72,16 @@ import SwiftSyntax
   /// scope (`WithGenericParametersOrAssociatedTypesScopeSyntax`)
   /// with this method (instead of using standard `lookupInParent`).
   private func lookupThroughGenericParameterScope(
-    identifier: Identifier?,
+    _ identifier: Identifier?,
     at lookUpPosition: AbsolutePosition,
     with config: LookupConfig
   ) -> [LookupResult] {
     if let genericParameterClause {
-      return genericParameterClause.lookup(identifier: identifier, at: lookUpPosition, with: config)
+      return genericParameterClause.lookup(identifier, at: lookUpPosition, with: config)
     } else if let primaryAssociatedTypeClause {
-      return primaryAssociatedTypeClause.lookup(identifier: identifier, at: lookUpPosition, with: config)
+      return primaryAssociatedTypeClause.lookup(identifier, at: lookUpPosition, with: config)
     } else {
-      return lookupInParent(identifier: identifier, at: lookUpPosition, with: config)
+      return lookupInParent(identifier, at: lookUpPosition, with: config)
     }
   }
 }