From dbf148db0fcb4cbb5ee33ecff254af921a4b59c2 Mon Sep 17 00:00:00 2001 From: MahdiBM Date: Tue, 7 Nov 2023 19:38:10 +0330 Subject: [PATCH] done --- .../SwiftFormatPlugin/SwiftFormatPlugin.swift | 25 +++++++-- .../SwiftFormatPluginXcode.swift | 54 ------------------- 2 files changed, 21 insertions(+), 58 deletions(-) delete mode 100644 Plugins/SwiftFormatPlugin/SwiftFormatPluginXcode.swift diff --git a/Plugins/SwiftFormatPlugin/SwiftFormatPlugin.swift b/Plugins/SwiftFormatPlugin/SwiftFormatPlugin.swift index 5d597804b..f8a961ba4 100644 --- a/Plugins/SwiftFormatPlugin/SwiftFormatPlugin.swift +++ b/Plugins/SwiftFormatPlugin/SwiftFormatPlugin.swift @@ -41,14 +41,15 @@ import PackagePlugin print("Command plugin execution with arguments \(arguments.description) for Swift package \(context.package.displayName). All target information: \(context.package.targets.description)") } - var targetsToProcess: [Target] = context.package.targets - var argExtractor = ArgumentExtractor(arguments) let selectedTargets = argExtractor.extractOption(named: "target") - if selectedTargets.isEmpty == false { - targetsToProcess = context.package.targets.filter { selectedTargets.contains($0.name) }.map { $0 } + let targetsToProcess: [Target] + if selectedTargets.isEmpty { + targetsToProcess = context.package.targets + } else { + targetsToProcess = try context.allLocalTargets(for: selectedTargets) } for target in targetsToProcess { @@ -58,4 +59,20 @@ import PackagePlugin } } } + + extension PluginContext { + func allLocalTargets(for targetNames: [String]) throws -> [Target] { + let matchingTargets = try self.package.targets(named: targetNames) + let packageTargets = Set(self.package.targets.map(\.id)) + let withLocalDependencies = matchingTargets.flatMap { [$0] + $0.recursiveTargetDependencies } + .filter { packageTargets.contains($0.id) } + let enumeratedKeyValues = withLocalDependencies.map(\.id).enumerated() + .map { (key: $0.element, value: $0.offset) } + let indexLookupTable = Dictionary(enumeratedKeyValues, uniquingKeysWith: { l, _ in l }) + let groupedByID = Dictionary(grouping: withLocalDependencies, by: \.id) + let sortedUniqueTargets = groupedByID.map(\.value[0]) + .sorted { indexLookupTable[$0.id, default: 0] < indexLookupTable[$1.id, default: 0] } + return sortedUniqueTargets + } + } #endif diff --git a/Plugins/SwiftFormatPlugin/SwiftFormatPluginXcode.swift b/Plugins/SwiftFormatPlugin/SwiftFormatPluginXcode.swift deleted file mode 100644 index 514449d8e..000000000 --- a/Plugins/SwiftFormatPlugin/SwiftFormatPluginXcode.swift +++ /dev/null @@ -1,54 +0,0 @@ -// -// SwiftFormatPluginXcode.swift -// SwiftFormat -// -// Created by Marco Eidinger -// Copyright 2022 Nick Lockwood -// -// Distributed under the permissive MIT license -// Get the latest version from here: -// -// https://github.com/nicklockwood/SwiftFormat -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. -// - -import Foundation -import PackagePlugin - -#if swift(>=5.6) - #if canImport(XcodeProjectPlugin) - import XcodeProjectPlugin - - extension SwiftFormatPlugin: XcodeCommandPlugin { - /// This entry point is called when operating on an Xcode project. - func performCommand(context: XcodePluginContext, arguments: [String]) throws { - if arguments.contains("--verbose") { - print("Command plugin execution with arguments \(arguments.description) for Swift package \(context.xcodeProject.displayName). All target information: \(context.xcodeProject.targets.description)") - print("Plugin will run for directory: \(context.xcodeProject.directory.description)") - } - - var argExtractor = ArgumentExtractor(arguments) - _ = argExtractor.extractOption(named: "target") - - try formatCode(in: context.xcodeProject.directory, context: context, arguments: argExtractor.remainingArguments) - } - } - #endif -#endif