File tree Expand file tree Collapse file tree 1 file changed +7
-19
lines changed
Tools/generate-command-models Expand file tree Collapse file tree 1 file changed +7
-19
lines changed Original file line number Diff line number Diff line change @@ -277,28 +277,16 @@ struct GenerateCommandModels: AsyncParsableCommand {
277277 """
278278 }
279279
280- let argumentsFunc : String
281- if path. count == 0 {
282- argumentsFunc = """
283- public func commandArgs() -> [String] {
284- var genArgs: [String] = []
285-
286- \( ( options. asArgs + vars. asArgs) . joined ( separator: " \n " + indent( 1 ) ) )
287-
288- return genArgs
289- }
290- """ . split ( separator: " \n " , omittingEmptySubsequences: false ) . joined ( separator: " \n " + indent( 1 ) )
291- } else {
292- argumentsFunc = """
293- public func commandArgs() -> [String] {
294- var genArgs: [String] = self.parent.commandArgs() + [ " \( execName) " ]
280+ let genArgs = options. asArgs + vars. asArgs
281+ let argumentsFunc = """
282+ public func commandArgs() -> [String] {
283+ \( genArgs. isEmpty ? " let " : " var " ) genArgs: [String] = \( path. count == 0 ? " [] " : " self.parent.commandArgs() + [ \" \( execName) \" ] " )
295284
296- \( ( options . asArgs + vars . asArgs ) . joined ( separator: " \n " + indent( 1 ) ) )
285+ \( genArgs . joined ( separator: " \n " + indent( 1 ) ) )
297286
298- return genArgs
299- }
300- """ . split ( separator: " \n " , omittingEmptySubsequences: false ) . joined ( separator: " \n " + indent( 1 ) )
287+ return genArgs
301288 }
289+ """ . split ( separator: " \n " , omittingEmptySubsequences: false ) . joined ( separator: " \n " + indent( 1 ) )
302290
303291 let configFunc : String
304292 if path. count == 0 {
You can’t perform that action at this time.
0 commit comments