Skip to content

Commit 6c42243

Browse files
committed
formatter
1 parent 68a2eb2 commit 6c42243

File tree

2 files changed

+18
-12
lines changed

2 files changed

+18
-12
lines changed

Plugins/GRPCProtobufGeneratorCommand/CommandConfig.swift

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ struct CommandConfig {
4141

4242
extension CommandConfig {
4343
static func helpRequested(
44-
argumentExtractor: inout ArgumentExtractor,
44+
argumentExtractor: inout ArgumentExtractor
4545
) -> Bool {
4646
let help = argumentExtractor.extractFlag(named: OptionsAndFlags.help.rawValue)
4747
return help != 0
@@ -60,8 +60,7 @@ extension CommandConfig {
6060
if let value = extractSingleValue(flag, values: accessLevel) {
6161
if let accessLevel = GenerationConfig.AccessLevel(rawValue: value) {
6262
config.common.accessLevel = accessLevel
63-
}
64-
else {
63+
} else {
6564
Diagnostics.error("Unknown access level '--\(flag.rawValue)' \(value)")
6665
}
6766
}
@@ -95,8 +94,7 @@ extension CommandConfig {
9594
if let value = extractSingleValue(flag, values: fileNaming) {
9695
if let fileNaming = GenerationConfig.FileNaming(rawValue: value) {
9796
config.common.fileNaming = fileNaming
98-
}
99-
else {
97+
} else {
10098
Diagnostics.error("Unknown file naming strategy '--\(flag.rawValue)' \(value)")
10199
}
102100
}
@@ -119,7 +117,8 @@ extension CommandConfig {
119117

120118
case .output:
121119
let output = argExtractor.extractOption(named: flag.rawValue)
122-
config.common.outputPath = extractSingleValue(flag, values: output) ?? pluginWorkDirectory.absoluteStringNoScheme
120+
config.common.outputPath =
121+
extractSingleValue(flag, values: output) ?? pluginWorkDirectory.absoluteStringNoScheme
123122

124123
case .verbose:
125124
let verbose = argExtractor.extractFlag(named: flag.rawValue)
@@ -130,7 +129,7 @@ extension CommandConfig {
130129
config.dryRun = dryRun != 0
131130

132131
case .help:
133-
() // handled elsewhere
132+
() // handled elsewhere
134133
}
135134
}
136135

@@ -150,7 +149,9 @@ extension CommandConfig {
150149

151150
func extractSingleValue(_ flag: OptionsAndFlags, values: [String]) -> String? {
152151
if values.count > 1 {
153-
Stderr.print("Warning: '--\(flag.rawValue)' was unexpectedly repeated, the first value will be used.")
152+
Stderr.print(
153+
"Warning: '--\(flag.rawValue)' was unexpectedly repeated, the first value will be used."
154+
)
154155
}
155156
return values.first
156157
}
@@ -303,7 +304,8 @@ extension OptionsAndFlags {
303304

304305
let spacing = 3
305306
let maxLength =
306-
(OptionsAndFlags.allCases.map(\.rawValue).max(by: { $0.count < $1.count })?.count ?? 0) + spacing
307+
(OptionsAndFlags.allCases.map(\.rawValue).max(by: { $0.count < $1.count })?.count ?? 0)
308+
+ spacing
307309
for flag in OptionsAndFlags.allCases {
308310
printMessage(
309311
" --\(flag.rawValue.padding(toLength: maxLength, withPad: " ", startingAt: 0))\(flag.usageDescription())"

Plugins/GRPCProtobufGeneratorCommand/Plugin.swift

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ struct GRPCProtobufGeneratorCommandPlugin: CommandPlugin {
2222
/// Perform command, the entry-point when using a Package manifest.
2323
func performCommand(context: PluginContext, arguments: [String]) async throws {
2424
var argExtractor = ArgumentExtractor(arguments)
25-
25+
2626
if CommandConfig.helpRequested(argumentExtractor: &argExtractor) {
2727
OptionsAndFlags.printHelp(requested: true)
2828
return
@@ -52,7 +52,9 @@ struct GRPCProtobufGeneratorCommandPlugin: CommandPlugin {
5252

5353
let outputDirectory = URL(fileURLWithPath: config.outputPath)
5454
if commandConfig.verbose {
55-
Stderr.print("Generated files will be written to: '\(outputDirectory.absoluteStringNoScheme)'")
55+
Stderr.print(
56+
"Generated files will be written to: '\(outputDirectory.absoluteStringNoScheme)'"
57+
)
5658
}
5759

5860
let inputFileURLs = inputFiles.map { URL(fileURLWithPath: $0) }
@@ -105,7 +107,9 @@ struct GRPCProtobufGeneratorCommandPlugin: CommandPlugin {
105107
process.waitUntilExit()
106108

107109
if process.terminationReason == .exit, process.terminationStatus == 0 {
108-
Stderr.print("Generated protobuf message Swift files for \(inputFiles.joined(separator: ", ")).")
110+
Stderr.print(
111+
"Generated protobuf message Swift files for \(inputFiles.joined(separator: ", "))."
112+
)
109113
} else {
110114
let problem = "\(process.terminationReason):\(process.terminationStatus)"
111115
Diagnostics.error("Generating Protobuf message Swift files failed: \(problem)")

0 commit comments

Comments
 (0)