cleanup

Author: tomerd

Sources/SPMTestSupport/MockWorkspace.swift

@@ -823,7 +823,7 @@ extension PackageReference.Kind {
 
 extension Workspace.ManagedDependency {
     fileprivate var checkoutState: CheckoutState? {
-        if case .sourceControl(let checkoutState) = self.state {
+        if case .sourceControlCheckout(let checkoutState) = self.state {
             return checkoutState
         }
         return .none

Sources/Workspace/ManagedDependency.swift

@@ -27,10 +27,10 @@ extension Workspace {
             case fileSystem(AbsolutePath)
 
             /// The dependency is a managed source control checkout.
-            case sourceControl(CheckoutState)
+            case sourceControlCheckout(CheckoutState)
 
             /// The dependency is downloaded from a registry.
-            case registry(version: Version)
+            case registryDownload(version: Version)
 
             /// The dependency is in edited state.
             ///
@@ -43,10 +43,10 @@ extension Workspace {
                 switch self {
                 case .fileSystem(let path):
                     return "fileSystem (\(path))"
-                case .sourceControl(let checkoutState):
-                    return "sourceControl (\(checkoutState))"
-                case .registry(let version):
-                    return "registry (\(version))"
+                case .sourceControlCheckout(let checkoutState):
+                    return "sourceControlCheckout (\(checkoutState))"
+                case .registryDownload(let version):
+                    return "registryDownload (\(version))"
                 case .edited:
                     return "edited"
                 }
@@ -78,8 +78,15 @@ extension Workspace {
         /// - Parameters:
         ///     - subpath: The subpath inside the editable directory.
         ///     - unmanagedPath: A custom absolute path instead of the subpath.
-        public func edited(subpath: RelativePath, unmanagedPath: AbsolutePath?) -> ManagedDependency {
-            return .edited(packageRef: self.packageRef, subpath: subpath, basedOn: self, unmanagedPath: unmanagedPath)
+        public func edited(subpath: RelativePath, unmanagedPath: AbsolutePath?) throws -> ManagedDependency {
+            guard case .sourceControlCheckout =  self.state else {
+                throw InternalError("invalid depenedency state: \(self.state)")
+            }
+            return ManagedDependency(
+                packageRef: self.packageRef,
+                state: .edited(basedOn: self, unmanagedPath: unmanagedPath),
+                subpath: subpath
+            )
         }
 
         /// Create a dependency present locally on the filesystem.
@@ -100,7 +107,7 @@ extension Workspace {
         }
 
         /// Create a source control dependency checked out
-        public static func sourceControl(
+        public static func sourceControlCheckout(
             packageRef: PackageReference,
             state: CheckoutState,
             subpath: RelativePath
@@ -109,16 +116,16 @@ extension Workspace {
             case .localSourceControl, .remoteSourceControl:
                 return ManagedDependency(
                     packageRef: packageRef,
-                    state: .sourceControl(state),
+                    state: .sourceControlCheckout(state),
                     subpath: subpath
                 )
             default:
                 throw InternalError("invalid package type: \(packageRef.kind)")
             }
         }
 
-        /// Create a registry  dependency downloaded
-        public static func registry(
+        /// Create a registry dependency downloaded
+        public static func registryDownload(
             packageRef: PackageReference,
             version: Version,
             subpath: RelativePath
@@ -128,7 +135,7 @@ extension Workspace {
             }
             return ManagedDependency(
                 packageRef: packageRef,
-                state: .registry(version: version),
+                state: .registryDownload(version: version),
                 subpath: subpath
             )
         }
@@ -166,7 +173,7 @@ extension Workspace {
         init(_ dependencies: [ManagedDependency] = []) {
             self.dependencies = Dictionary(uniqueKeysWithValues: dependencies.map{ ($0.packageRef.identity, $0) })
         }
-
+        
         public subscript(identity: PackageIdentity) -> ManagedDependency? {
             return self.dependencies[identity]
         }

Sources/Workspace/ResolverPrecomputationProvider.swift

@@ -97,7 +97,7 @@ private struct LocalPackageContainer: PackageContainer {
     let currentToolsVersion: ToolsVersion
 
     func versionsAscending() throws -> [Version] {
-        if case .version(let version, revision: _) = dependency?.state.checkout {
+        if case .sourceControlCheckout(.version(let version, revision: _)) = dependency?.state {
             return [version]
         } else {
             return []
@@ -123,7 +123,7 @@ private struct LocalPackageContainer: PackageContainer {
 
     func getDependencies(at version: Version, productFilter: ProductFilter) throws -> [PackageContainerConstraint] {
         // Because of the implementation of `reversedVersions`, we should only get the exact same version.
-        guard case .sourceControl(.version(version, revision: _)) = dependency?.state else {
+        guard case .sourceControlCheckout(.version(version, revision: _)) = dependency?.state else {
             throw InternalError("expected version checkout state, but state was \(String(describing: dependency?.state))")
         }
         return try manifest.dependencyConstraints(productFilter: productFilter)
@@ -133,7 +133,7 @@ private struct LocalPackageContainer: PackageContainer {
         // Return the dependencies if the checkout state matches the revision.
         let revision = Revision(identifier: revisionString)
         switch dependency?.state {
-        case .sourceControl(.branch(_, revision: revision)), .sourceControl(.revision(revision)):
+        case .sourceControlCheckout(.branch(_, revision: revision)), .sourceControlCheckout(.revision(revision)):
             return try manifest.dependencyConstraints(productFilter: productFilter)
         default:
             throw ResolverPrecomputationError.differentRequirement(
@@ -146,7 +146,7 @@ private struct LocalPackageContainer: PackageContainer {
 
     func getUnversionedDependencies(productFilter: ProductFilter) throws -> [PackageContainerConstraint] {
         // Throw an error when the dependency is not unversioned to fail resolution.
-        guard dependency?.isSourceControl != true else {
+        guard dependency?.isSourceControlCheckout != true else {
             throw ResolverPrecomputationError.differentRequirement(
                 package: package,
                 state: dependency?.state,
@@ -168,19 +168,8 @@ private struct LocalPackageContainer: PackageContainer {
 }
 
 private extension Workspace.ManagedDependency {
-    var isSourceControl: Bool {
-        if case .sourceControl = self.state { return true }
+    var isSourceControlCheckout: Bool {
+        if case .sourceControlCheckout = self.state { return true }
         return false
     }
 }
-
-private extension Workspace.ManagedDependency.State {
-    var checkout: CheckoutState? {
-        switch self {
-        case .sourceControl(let state):
-            return state
-        default:
-            return nil
-        }
-    }
-}