Skip to content

Commit 11c0e3e

Browse files
committed
[Commands] Switch AddSetting/Migrate to use refactoring action from swift-syntax
1 parent d3db503 commit 11c0e3e

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Sources/Commands/PackageCommands/AddSetting.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import CoreCommands
1616
import Foundation
1717
import PackageGraph
1818
import PackageModel
19-
import PackageModelSyntax
2019
import SwiftParser
20+
@_spi(PackageRefactor) import SwiftRefactor
2121
import TSCBasic
2222
import TSCUtility
2323
import Workspace
@@ -124,7 +124,7 @@ extension SwiftPackageCommand {
124124
}
125125
}
126126

127-
let editResult: PackageEditResult
127+
let editResult: PackageEdit
128128

129129
switch setting {
130130
case .experimentalFeature:
@@ -146,7 +146,7 @@ extension SwiftPackageCommand {
146146

147147
editResult = try AddSwiftSetting.languageMode(
148148
to: target,
149-
mode: mode,
149+
mode: mode.rawValue,
150150
manifest: manifestSyntax
151151
)
152152
case .strictMemorySafety:

Sources/Commands/PackageCommands/Migrate.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ import OrderedCollections
2323

2424
import PackageGraph
2525
import PackageModel
26-
import enum PackageModelSyntax.ManifestEditError
26+
27+
@_spi(PackageRefactor)
28+
import enum SwiftRefactor.ManifestEditError
2729

2830
import SPMBuildCore
2931
import SwiftFixIt
@@ -283,16 +285,14 @@ extension SwiftPackageCommand {
283285
switch error {
284286
case .cannotFindPackage,
285287
.cannotAddSettingsToPluginTarget,
286-
.existingDependency:
288+
.existingDependency,
289+
.malformedManifest:
287290
break
288291
case .cannotFindArrayLiteralArgument,
289292
// This means the target could not be found
290293
// syntactically, not that it does not exist.
291294
.cannotFindTargets,
292-
.cannotFindTarget,
293-
// This means the swift-tools-version is lower than
294-
// the version where one of the setting was introduced.
295-
.oldManifest:
295+
.cannotFindTarget:
296296
let settings = try features.map {
297297
try $0.swiftSettingDescription
298298
}.joined(separator: ", ")

0 commit comments

Comments
 (0)