[Commands] Switch AddSetting/Migrate to use refactoring action from swift-syntax

Author: xedin

Sources/Commands/PackageCommands/AddSetting.swift

@@ -15,9 +15,11 @@ import Basics
 import CoreCommands
 import Foundation
 import PackageGraph
+import PackageLoading
 import PackageModel
-import PackageModelSyntax
 import SwiftParser
+import SwiftSyntax
+@_spi(PackageRefactor) import SwiftRefactor
 import TSCBasic
 import TSCUtility
 import Workspace
@@ -124,32 +126,40 @@ extension SwiftPackageCommand {
                     }
                 }
 
-                let editResult: PackageEditResult
+                let editResult: PackageEdit
 
                 switch setting {
                 case .experimentalFeature:
+                    try manifestSyntax.checkManifestAtLeast(.v5_8)
+
                     editResult = try AddSwiftSetting.experimentalFeature(
                         to: target,
                         name: value,
                         manifest: manifestSyntax
                     )
                 case .upcomingFeature:
+                    try manifestSyntax.checkManifestAtLeast(.v5_8)
+
                     editResult = try AddSwiftSetting.upcomingFeature(
                         to: target,
                         name: value,
                         manifest: manifestSyntax
                     )
                 case .languageMode:
+                    try manifestSyntax.checkManifestAtLeast(.v6_0)
+
                     guard let mode = SwiftLanguageVersion(string: value) else {
                         throw ValidationError("Unknown Swift language mode: \(value)")
                     }
 
                     editResult = try AddSwiftSetting.languageMode(
                         to: target,
-                        mode: mode,
+                        mode: mode.rawValue,
                         manifest: manifestSyntax
                     )
                 case .strictMemorySafety:
+                    try manifestSyntax.checkManifestAtLeast(.v6_2)
+
                     guard value.isEmpty || value == SwiftSetting.strictMemorySafety.rawValue else {
                         throw ValidationError("'strictMemorySafety' does not support argument '\(value)'")
                     }
@@ -170,3 +180,12 @@ extension SwiftPackageCommand {
         }
     }
 }
+
+fileprivate extension SourceFileSyntax {
+    func checkManifestAtLeast(_ version: ToolsVersion) throws {
+        let toolsVersion = try ToolsVersionParser.parse(utf8String: description)
+        if toolsVersion < version {
+            throw StringError("package manifest version \(toolsVersion) is too old: please update to manifest version \(version) or newer")
+        }
+    }
+}

Sources/Commands/PackageCommands/Migrate.swift

@@ -23,7 +23,9 @@ import OrderedCollections
 
 import PackageGraph
 import PackageModel
-import enum PackageModelSyntax.ManifestEditError
+
+@_spi(PackageRefactor)
+import enum SwiftRefactor.ManifestEditError
 
 import SPMBuildCore
 import SwiftFixIt
@@ -283,16 +285,14 @@ extension SwiftPackageCommand {
                     switch error {
                     case .cannotFindPackage,
                          .cannotAddSettingsToPluginTarget,
-                         .existingDependency:
+                         .existingDependency,
+                         .malformedManifest:
                         break
                     case .cannotFindArrayLiteralArgument,
                          // This means the target could not be found
                          // syntactically, not that it does not exist.
                          .cannotFindTargets,
-                         .cannotFindTarget,
-                         // This means the swift-tools-version is lower than
-                         // the version where one of the setting was introduced.
-                         .oldManifest:
+                         .cannotFindTarget:
                         let settings = try features.map {
                             try $0.swiftSettingDescription
                         }.joined(separator: ", ")

Tests/CommandsTests/PackageCommandTests.swift

@@ -2333,8 +2333,8 @@ class PackageCommandTestCase: CommandsBuildProviderTestCase {
                     error.stderr,
                     .contains(
                         """
-                        error: Could not update manifest to enable requested features for target 'A' (package manifest version 5.8.0 is too old: please update to manifest version 6.2.0 or newer). Please enable them manually by adding the following Swift settings to the target: '.enableUpcomingFeature("ExistentialAny"), .enableUpcomingFeature("InferIsolatedConformances"), .strictMemorySafety()'
-                        error: Could not update manifest to enable requested features for target 'B' (package manifest version 5.8.0 is too old: please update to manifest version 6.2.0 or newer). Please enable them manually by adding the following Swift settings to the target: '.enableUpcomingFeature("ExistentialAny"), .enableUpcomingFeature("InferIsolatedConformances"), .strictMemorySafety()'
+                        error: Could not update manifest to enable requested features for target 'A' (package manifest version 5.8.0 is too old: please update to manifest version 6.2.0 or newer)
+                        error: Could not update manifest to enable requested features for target 'B' (package manifest version 5.8.0 is too old: please update to manifest version 6.2.0 or newer)
                         error: Could not update manifest to enable requested features for target 'CannotFindSettings' (unable to find array literal for 'swiftSettings' argument). Please enable them manually by adding the following Swift settings to the target: '.enableUpcomingFeature("ExistentialAny"), .enableUpcomingFeature("InferIsolatedConformances"), .strictMemorySafety()'
                         error: Could not update manifest to enable requested features for target 'CannotFindTarget' (unable to find target named 'CannotFindTarget' in package). Please enable them manually by adding the following Swift settings to the target: '.enableUpcomingFeature("ExistentialAny"), .enableUpcomingFeature("InferIsolatedConformances"), .strictMemorySafety()'
                         """