From 37fb6036bd14f485ec376be7840848c17b7c8493 Mon Sep 17 00:00:00 2001 From: Ethan Pippin Date: Wed, 11 Dec 2024 01:02:13 -0700 Subject: [PATCH 1/3] bullet format file errors --- Plugins/PluginsShared/PluginError.swift | 2 +- Plugins/PluginsShared/PluginUtils.swift | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Plugins/PluginsShared/PluginError.swift b/Plugins/PluginsShared/PluginError.swift index 9deb5d1b2..18c26b87d 100644 --- a/Plugins/PluginsShared/PluginError.swift +++ b/Plugins/PluginsShared/PluginError.swift @@ -37,7 +37,7 @@ enum PluginError: Swift.Error, CustomStringConvertible, LocalizedError { let targetNames = targetNames.joined(separator: ", ", lastSeparator: " and ") return "Found no targets with names \(targetNames)." case .fileErrors(let fileErrors): - return "Issues with required files: \(fileErrors.map(\.description).joined(separator: ", and"))." + return "Issues with required files:\n\(fileErrors.map { $0 .description.prepended("- ") }.joined(separator: "\n"))." } } diff --git a/Plugins/PluginsShared/PluginUtils.swift b/Plugins/PluginsShared/PluginUtils.swift index d03cb875b..423fa3af0 100644 --- a/Plugins/PluginsShared/PluginUtils.swift +++ b/Plugins/PluginsShared/PluginUtils.swift @@ -97,3 +97,9 @@ extension Array where Element == String { return "\(self.dropLast().joined(separator: separator))\(lastSeparator)\(self.last!)" } } + +extension String { + func prepended(_ prefix: String) -> String { + return prefix + self + } +} From 4fe1b3106ff23f8ada007d323d9979d2a4da9e87 Mon Sep 17 00:00:00 2001 From: Ethan Pippin Date: Wed, 11 Dec 2024 11:25:17 -0700 Subject: [PATCH 2/3] clean up bullet concatenation --- Plugins/PluginsShared/PluginError.swift | 2 +- Plugins/PluginsShared/PluginUtils.swift | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Plugins/PluginsShared/PluginError.swift b/Plugins/PluginsShared/PluginError.swift index 18c26b87d..58b28b019 100644 --- a/Plugins/PluginsShared/PluginError.swift +++ b/Plugins/PluginsShared/PluginError.swift @@ -37,7 +37,7 @@ enum PluginError: Swift.Error, CustomStringConvertible, LocalizedError { let targetNames = targetNames.joined(separator: ", ", lastSeparator: " and ") return "Found no targets with names \(targetNames)." case .fileErrors(let fileErrors): - return "Issues with required files:\n\(fileErrors.map { $0 .description.prepended("- ") }.joined(separator: "\n"))." + return "Issues with required files:\n\(fileErrors.map { "- " + $0 .description }.joined(separator: "\n"))." } } diff --git a/Plugins/PluginsShared/PluginUtils.swift b/Plugins/PluginsShared/PluginUtils.swift index 423fa3af0..d03cb875b 100644 --- a/Plugins/PluginsShared/PluginUtils.swift +++ b/Plugins/PluginsShared/PluginUtils.swift @@ -97,9 +97,3 @@ extension Array where Element == String { return "\(self.dropLast().joined(separator: separator))\(lastSeparator)\(self.last!)" } } - -extension String { - func prepended(_ prefix: String) -> String { - return prefix + self - } -} From e54527374417b81f1a8f26d20e171cd3b5193efe Mon Sep 17 00:00:00 2001 From: Ethan Pippin Date: Wed, 11 Dec 2024 13:14:51 -0700 Subject: [PATCH 3/3] Remove space Co-authored-by: Honza Dvorsky --- Plugins/PluginsShared/PluginError.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/PluginsShared/PluginError.swift b/Plugins/PluginsShared/PluginError.swift index 58b28b019..a0a411d8e 100644 --- a/Plugins/PluginsShared/PluginError.swift +++ b/Plugins/PluginsShared/PluginError.swift @@ -37,7 +37,7 @@ enum PluginError: Swift.Error, CustomStringConvertible, LocalizedError { let targetNames = targetNames.joined(separator: ", ", lastSeparator: " and ") return "Found no targets with names \(targetNames)." case .fileErrors(let fileErrors): - return "Issues with required files:\n\(fileErrors.map { "- " + $0 .description }.joined(separator: "\n"))." + return "Issues with required files:\n\(fileErrors.map { "- " + $0.description }.joined(separator: "\n"))." } }