Fix merge artifacts

Author: MAJKFL

Sources/SwiftLexicalLookup/ScopeImplementations.swift

@@ -14,7 +14,7 @@ import SwiftSyntax
 
 @_spi(Experimental) extension SyntaxProtocol {
   /// Parent scope of this syntax node, or scope introduced by this syntax node.
-  @_spi(Experimental) public var scope: ScopeSyntax? {
+  var scope: ScopeSyntax? {
     if let scopeSyntax = Syntax(self).asProtocol(SyntaxProtocol.self) as? ScopeSyntax {
       return scopeSyntax
     } else {
@@ -358,15 +358,15 @@ import SwiftSyntax
   /// withing the accessor..
   @_spi(Experimental) public var introducedNames: [LookupName] {
     if let parameters {
-      LookupName.getNames(from: parameters)
+      return LookupName.getNames(from: parameters)
     } else {
       switch accessorSpecifier.tokenKind {
       case .keyword(.set), .keyword(.willSet):
-        [.implicit(.newValue(self))]
+        return [.implicit(.newValue(self))]
       case .keyword(.didSet):
-        [.implicit(.oldValue(self))]
+        return [.implicit(.oldValue(self))]
       default:
-        []
+        return []
       }
     }
   }

Sources/SwiftSyntax/Identifier.swift

@@ -32,19 +32,19 @@ public struct Identifier: Equatable, Hashable, Sendable {
   public var name: String {
     switch identifier {
     case .token(let raw, _):
-      String(syntaxText: raw.name)
+      return String(syntaxText: raw.name)
     case .string(let string):
-      string
+      return string
     }
   }
 
   @_spi(RawSyntax)
   public var raw: RawIdentifier? {
     switch identifier {
     case .token(let raw, _):
-      raw
+      return raw
     default:
-      nil
+      return nil
     }
   }
 

Tests/SwiftLexicalLookupTest/ExpectedName.swift

@@ -51,7 +51,7 @@ enum ImplicitNameExpectation {
       .error(let marker),
       .newValue(let marker),
       .oldValue(let marker):
-      marker
+      return marker
     }
   }
 }
@@ -67,9 +67,9 @@ enum NameExpectation: ExpectedName {
     switch self {
     case .identifier(let marker),
       .declaration(let marker):
-      marker
+      return marker
     case .implicit(let implicitName):
-      implicitName.marker
+      return implicitName.marker
     }
   }
 

Tests/SwiftLexicalLookupTest/ResultExpectation.swift

@@ -22,18 +22,18 @@ enum ResultExpectation {
   var expectedNames: [ExpectedName] {
     switch self {
     case .fromScope(_, let expectedNames):
-      expectedNames
+      return expectedNames
     case .fromFileScope(expectedNames: let expectedNames):
-      expectedNames
+      return expectedNames
     }
   }
 
   var debugDescription: String {
     switch self {
     case .fromScope:
-      "fromScope"
+      return "fromScope"
     case .fromFileScope:
-      "fromFileScope"
+      return "fromFileScope"
     }
   }
 
@@ -65,9 +65,9 @@ extension LookupResult {
   var debugDescription: String {
     switch self {
     case .fromScope:
-      "fromScope"
+      return "fromScope"
     case .fromFileScope:
-      "fromFileScope"
+      return "fromFileScope"
     }
   }
 }