Merge pull request #696 from dmonagle/rename-plugin-configuration-arg…

…ument Renamed plugin configuration parameter
swiftlang · Mar 7, 2024 · e4ce680 · e4ce680
2 parents 3129697 + 3d44a2f
commit e4ce680
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Plugins/FormatPlugin/plugin.swift b/Plugins/FormatPlugin/plugin.swift
@@ -40,7 +40,7 @@ extension FormatPlugin: CommandPlugin {
     let targetNames = argExtractor.extractOption(named: "target")
     let targetsToFormat = targetNames.isEmpty ? context.package.targets : try context.package.targets(named: targetNames)
 
-    let configurationFilePath = argExtractor.extractOption(named: "configuration").first
+    let configurationFilePath = argExtractor.extractOption(named: "swift-format-configuration").first
 
     let sourceCodeTargets = targetsToFormat.compactMap{ $0 as? SourceModuleTarget }
 
@@ -60,7 +60,7 @@ extension FormatPlugin: XcodeCommandPlugin {
     let swiftFormatTool = try context.tool(named: "swift-format")
 
     var argExtractor = ArgumentExtractor(arguments)
-    let configurationFilePath = argExtractor.extractOption(named: "configuration").first
+    let configurationFilePath = argExtractor.extractOption(named: "swift-format-configuration").first
 
     try format(
       tool: swiftFormatTool,

diff --git a/Plugins/LintPlugin/plugin.swift b/Plugins/LintPlugin/plugin.swift
@@ -41,7 +41,7 @@ extension LintPlugin: CommandPlugin {
     let targetNames = argExtractor.extractOption(named: "target")
 
     let targetsToFormat = targetNames.isEmpty ? context.package.targets : try context.package.targets(named: targetNames)
-    let configurationFilePath = argExtractor.extractOption(named: "configuration").first
+    let configurationFilePath = argExtractor.extractOption(named: "swift-format-configuration").first
 
     let sourceCodeTargets = targetsToFormat.compactMap { $0 as? SourceModuleTarget }
 
@@ -60,7 +60,7 @@ extension LintPlugin: XcodeCommandPlugin {
   func performCommand(context: XcodeProjectPlugin.XcodePluginContext, arguments: [String]) throws {
     let swiftFormatTool = try context.tool(named: "swift-format")
     var argExtractor = ArgumentExtractor(arguments)
-    let configurationFilePath = argExtractor.extractOption(named: "configuration").first
+    let configurationFilePath = argExtractor.extractOption(named: "swift-format-configuration").first
 
     try lint(
       tool: swiftFormatTool,