Drop support for Swift 5.7 (#623)

.github/workflows/test.yml

@@ -15,14 +15,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        xcode: ["14.3", "14.2", "14.1"]
+        xcode: ["14.3"]
         include:
           - xcode: "14.3"
             macos: macOS-13
-          - xcode: "14.2"
-            macos: macOS-12
-          - xcode: "14.1"
-            macos: macOS-12
     runs-on: ${{ matrix.macos }}
     name: macOS
     steps:
@@ -57,14 +53,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        swift: ["5.8", "5.7"]
+        swift: ["5.8"]
         include:
           - swift: "5.8"
             container: "swift:5.8"
             cache-version: 1
-          - swift: "5.7"
-            container: "swift:5.7"
-            cache-version: 1
     runs-on: ubuntu-20.04
     container: ${{ matrix.container }}
     name: Linux

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ##### Breaking
 
-- None.
+- Swift 5.7 is no longer supported.
 
 ##### Enhancements
 

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.8
 import PackageDescription
 
 var dependencies: [Package.Dependency] = [
@@ -7,7 +7,7 @@ var dependencies: [Package.Dependency] = [
     .package(url: "https://github.com/tadija/AEXML", from: "4.0.0"),
     .package(url: "https://github.com/apple/swift-argument-parser", from: "1.0.0"),
     .package(url: "https://github.com/ileitch/swift-indexstore", from: "9.0.0"),
-    .package(url: "https://github.com/peripheryapp/swift-syntax", .exact("1.0.2")),
+    .package(url: "https://github.com/peripheryapp/swift-syntax", exact: "1.0.2"),
     .package(url: "https://github.com/ileitch/swift-filename-matcher", from: "0.0.0"),
 ]
 

Sources/PeripheryKit/Indexer/SwiftIndexer.swift

@@ -11,10 +11,6 @@ public final class SwiftIndexer: Indexer {
     private let configuration: Configuration
     private let indexStorePaths: [FilePath]
 
-    private lazy var letShorthandWorkaroundEnabled: Bool = {
-        SwiftVersion.current.version.isVersion(lessThan: "5.8")
-    }()
-
     public required init(
         sourceFiles: [FilePath: Set<String>],
         graph: SourceGraph,
@@ -88,8 +84,7 @@ public final class SwiftIndexer: Indexer {
                 units: units,
                 graph: graph,
                 logger: logger,
-                configuration: configuration,
-                letShorthandWorkaroundEnabled: letShorthandWorkaroundEnabled
+                configuration: configuration
             )
         }
 
@@ -129,23 +124,20 @@ public final class SwiftIndexer: Indexer {
         private let graph: SourceGraph
         private let logger: ContextualLogger
         private let configuration: Configuration
-        private let letShorthandWorkaroundEnabled: Bool
 
         required init(
             file: SourceFile,
             units: [(IndexStore, IndexStoreUnit)],
             graph: SourceGraph,
             logger: ContextualLogger,
-            configuration: Configuration,
-            letShorthandWorkaroundEnabled: Bool
+            configuration: Configuration
 
         ) {
             self.file = file
             self.units = units
             self.graph = graph
             self.logger = logger
             self.configuration = configuration
-            self.letShorthandWorkaroundEnabled = letShorthandWorkaroundEnabled
         }
 
         struct RawRelation {
@@ -248,7 +240,6 @@ public final class SwiftIndexer: Indexer {
         func phaseTwo() throws {
             let multiplexingSyntaxVisitor = try MultiplexingSyntaxVisitor(file: file)
             let declarationSyntaxVisitor = multiplexingSyntaxVisitor.add(DeclarationSyntaxVisitor.self)
-            declarationSyntaxVisitor.letShorthandWorkaroundEnabled = letShorthandWorkaroundEnabled
             let importSyntaxVisitor = multiplexingSyntaxVisitor.add(ImportSyntaxVisitor.self)
 
             multiplexingSyntaxVisitor.visit()

Sources/PeripheryKit/SourceGraph/SourceGraphMutatorRunner.swift

@@ -39,7 +39,6 @@ public final class SourceGraphMutatorRunner {
         StringInterpolationAppendInterpolationRetainer.self,
         PropertyWrapperRetainer.self,
         ResultBuilderRetainer.self,
-        MainActorRetainer.self,
         CapitalSelfFunctionCallRetainer.self,
 
         PlainExtensionEliminator.self,

Sources/PeripheryKit/SwiftVersion.swift

@@ -4,7 +4,7 @@ import Shared
 public struct SwiftVersion {
     public static let current = SwiftVersion()
 
-    static let minimumVersion = "5.6"
+    static let minimumVersion = "5.8"
 
     public let version: VersionString
     public let fullVersion: String

Sources/PeripheryKit/Syntax/DeclarationSyntaxVisitor.swift

@@ -22,14 +22,10 @@ final class DeclarationSyntaxVisitor: PeripherySyntaxVisitor {
         hasGenericFunctionReturnedMetatypeParameters: Bool
     )
 
-    var letShorthandWorkaroundEnabled: Bool = false
-
     private let sourceLocationBuilder: SourceLocationBuilder
     private let typeSyntaxInspector: TypeSyntaxInspector
     private(set) var results: [Result] = []
-    private var letShorthandIdentifiers: Set<String> = []
     private var didVisitCapitalSelfFunctionCall: Bool = false
-    private var declarationBodyStackDepth = 0
 
     var resultsByLocation: [SourceLocation: Result] {
         results.reduce(into: [SourceLocation: Result]()) { (dict, result) in
@@ -121,13 +117,7 @@ final class DeclarationSyntaxVisitor: PeripherySyntaxVisitor {
         )
     }
 
-    func visit(_: FunctionDeclSyntax) {
-        declarationBodyStackDepth += 1
-    }
-
     func visitPost(_ node: FunctionDeclSyntax) {
-        declarationBodyStackDepth -= 1
-
         parse(
             modifiers: node.modifiers,
             attributes: node.attributes,
@@ -140,13 +130,7 @@ final class DeclarationSyntaxVisitor: PeripherySyntaxVisitor {
         )
     }
 
-    func visit(_: InitializerDeclSyntax) {
-        declarationBodyStackDepth += 1
-    }
-
     func visitPost(_ node: InitializerDeclSyntax) {
-        declarationBodyStackDepth -= 1
-
         parse(
             modifiers: node.modifiers,
             attributes: node.attributes,
@@ -158,13 +142,7 @@ final class DeclarationSyntaxVisitor: PeripherySyntaxVisitor {
         )
     }
 
-    func visit(_: DeinitializerDeclSyntax) {
-        declarationBodyStackDepth += 1
-    }
-
     func visitPost(_ node: DeinitializerDeclSyntax) {
-        declarationBodyStackDepth -= 1
-
         parse(
             modifiers: node.modifiers,
             attributes: node.attributes,
@@ -173,13 +151,7 @@ final class DeclarationSyntaxVisitor: PeripherySyntaxVisitor {
         )
     }
 
-    func visit(_: SubscriptDeclSyntax) {
-        declarationBodyStackDepth += 1
-    }
-
     func visitPost(_ node: SubscriptDeclSyntax) {
-        declarationBodyStackDepth -= 1
-
         parse(
             modifiers: node.modifiers,
             attributes: node.attributes,
@@ -192,13 +164,7 @@ final class DeclarationSyntaxVisitor: PeripherySyntaxVisitor {
         )
     }
 
-    func visit(_: VariableDeclSyntax) {
-        declarationBodyStackDepth += 1
-    }
-
     func visitPost(_ node: VariableDeclSyntax) {
-        declarationBodyStackDepth -= 1
-
         for binding in node.bindings {
             if binding.pattern.is(IdentifierPatternSyntax.self) {
                 let closureSignature = binding.initializer?.value.as(ClosureExprSyntax.self)?.signature
@@ -299,17 +265,6 @@ final class DeclarationSyntaxVisitor: PeripherySyntaxVisitor {
         )
     }
 
-    func visit(_ node: OptionalBindingConditionSyntax) {
-        guard letShorthandWorkaroundEnabled else { return }
-
-        guard node.initializer == nil,
-              let identifier = node.pattern.as(IdentifierPatternSyntax.self)?.identifier,
-              let parentStmt = node.parent?.parent?.parent,
-              (parentStmt.is(IfExprSyntax.self) || parentStmt.is(GuardStmtSyntax.self))
-        else { return }
-        letShorthandIdentifiers.insert(identifier.text)
-    }
-
     func visit(_ node: FunctionCallExprSyntax) {
         if let identifierExpr = node.calledExpression.as(IdentifierExprSyntax.self),
            identifierExpr.identifier.tokenKind == .keyword(.Self) {
@@ -343,13 +298,6 @@ final class DeclarationSyntaxVisitor: PeripherySyntaxVisitor {
         let location = sourceLocationBuilder.location(at: position)
         var letShorthandIdentifiers = Set<String>()
 
-        // Only associate let shorthand identifiers in nested code blocks with the top-most
-        // code block.
-        if declarationBodyStackDepth == 0 {
-            letShorthandIdentifiers = self.letShorthandIdentifiers
-            self.letShorthandIdentifiers.removeAll()
-        }
-
         var didVisitCapitalSelfFunctionCall = false
         if consumeCapitalSelfFunctionCalls {
             didVisitCapitalSelfFunctionCall = self.didVisitCapitalSelfFunctionCall