Skip to content

Commit 79f2669

Browse files
scala-stewardscala-steward
committed
Reformat with scalafmt 3.7.17
Executed command: scalafmt --non-interactive
1 parent a6f5670 commit 79f2669

16 files changed

+243
-150
lines changed

‎build.sc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ trait MainArgsPublishModule
5454
)
5555

5656
def ivyDeps = Agg(
57-
ivy"org.scala-lang.modules::scala-collection-compat::2.8.1",
57+
ivy"org.scala-lang.modules::scala-collection-compat::2.8.1"
5858
)
5959
}
6060

‎mainargs/src/Invoker.scala‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ object Invoker {
55
cep: TokensReader.Class[T],
66
args: Seq[String],
77
allowPositional: Boolean,
8-
allowRepeats: Boolean,
8+
allowRepeats: Boolean
99
): Result[T] = construct(cep, args, allowPositional, allowRepeats, Util.nullNameMapper)
1010

1111
def construct[T](
@@ -40,9 +40,9 @@ object Invoker {
4040
Right(ParamResult.Success(Flag(kvs.contains(a)).asInstanceOf[T]))
4141
case r: TokensReader.Simple[T] => Right(makeReadCall(kvs, base, a, r))
4242
case r: TokensReader.Constant[T] => Right(r.read() match {
43-
case Left(s) => ParamResult.Failure(Seq(Result.ParamError.Failed(a, Nil, s)))
44-
case Right(v) => ParamResult.Success(v)
45-
})
43+
case Left(s) => ParamResult.Failure(Seq(Result.ParamError.Failed(a, Nil, s)))
44+
case Right(v) => ParamResult.Success(v)
45+
})
4646
case r: TokensReader.Leftover[T, _] => Right(makeReadVarargsCall(a, extras, r))
4747
case r: TokensReader.Class[T] =>
4848
Left(
@@ -91,7 +91,8 @@ object Invoker {
9191
mains: MethodMains[B],
9292
args: Seq[String],
9393
allowPositional: Boolean,
94-
allowRepeats: Boolean): Either[Result.Failure.Early, (MainData[Any, B], Result[Any])] = {
94+
allowRepeats: Boolean
95+
): Either[Result.Failure.Early, (MainData[Any, B], Result[Any])] = {
9596
runMains(mains, args, allowPositional, allowRepeats, Util.nullNameMapper)
9697
}
9798
def runMains[B](
@@ -126,16 +127,20 @@ object Invoker {
126127
case Seq(main) => groupArgs(main, args)
127128
case multiple =>
128129
args.toList match {
129-
case List() => Left(Result.Failure.Early.SubcommandNotSpecified(multiple.map(_.name(nameMapper))))
130+
case List() =>
131+
Left(Result.Failure.Early.SubcommandNotSpecified(multiple.map(_.name(nameMapper))))
130132
case head :: tail =>
131133
if (head.startsWith("-")) {
132134
Left(Result.Failure.Early.SubcommandSelectionDashes(head))
133135
} else {
134-
multiple.find{ m =>
136+
multiple.find { m =>
135137
val name = m.name(nameMapper)
136138
name == head || (m.mainName.isEmpty && m.defaultName == head)
137139
} match {
138-
case None => Left(Result.Failure.Early.UnableToFindSubcommand(multiple.map(_.name(nameMapper)), head))
140+
case None => Left(Result.Failure.Early.UnableToFindSubcommand(
141+
multiple.map(_.name(nameMapper)),
142+
head
143+
))
139144
case Some(main) => groupArgs(main, tail)
140145
}
141146
}

‎mainargs/src/Parser.scala‎

Lines changed: 38 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ class ParserForMethods[B](val mains: MethodMains[B]) {
1313
docsOnNewLine: Boolean,
1414
customNames: Map[String, String],
1515
customDocs: Map[String, String],
16-
sorted: Boolean): String = {
16+
sorted: Boolean
17+
): String = {
1718
helpText(totalWidth, docsOnNewLine, customNames, customDocs, sorted, Util.kebabCaseNameMapper)
1819
}
1920

@@ -83,7 +84,7 @@ class ParserForMethods[B](val mains: MethodMains[B]) {
8384
docsOnNewLine: Boolean,
8485
autoPrintHelpAndExit: Option[(Int, PrintStream)],
8586
customNames: Map[String, String],
86-
customDocs: Map[String, String],
87+
customDocs: Map[String, String]
8788
): Any = runOrThrow(
8889
args,
8990
allowPositional,
@@ -93,7 +94,7 @@ class ParserForMethods[B](val mains: MethodMains[B]) {
9394
docsOnNewLine,
9495
autoPrintHelpAndExit,
9596
customNames,
96-
customDocs,
97+
customDocs
9798
)
9899

99100
def runOrThrow(
@@ -140,7 +141,14 @@ class ParserForMethods[B](val mains: MethodMains[B]) {
140141
): Either[String, Any] = {
141142
if (autoPrintHelpAndExit.nonEmpty && args.take(1) == Seq("--help")) {
142143
val (exitCode, outputStream) = autoPrintHelpAndExit.get
143-
outputStream.println(helpText(totalWidth, docsOnNewLine, customNames, customDocs, sorted, nameMapper))
144+
outputStream.println(helpText(
145+
totalWidth,
146+
docsOnNewLine,
147+
customNames,
148+
customDocs,
149+
sorted,
150+
nameMapper
151+
))
144152
Compat.exit(exitCode)
145153
} else runRaw0(args, allowPositional, allowRepeats, nameMapper) match {
146154
case Left(err) => Left(Renderer.renderEarlyError(err))
@@ -189,21 +197,19 @@ class ParserForMethods[B](val mains: MethodMains[B]) {
189197
sorted = false
190198
)
191199

192-
193-
194200
@deprecated("Binary Compatibility Shim", "mainargs 0.6.0")
195201
def runEither(
196-
args: Seq[String],
197-
allowPositional: Boolean,
198-
allowRepeats: Boolean,
199-
totalWidth: Int,
200-
printHelpOnExit: Boolean,
201-
docsOnNewLine: Boolean,
202-
autoPrintHelpAndExit: Option[(Int, PrintStream)],
203-
customNames: Map[String, String],
204-
customDocs: Map[String, String],
205-
sorted: Boolean
206-
): Either[String, Any] = runEither(
202+
args: Seq[String],
203+
allowPositional: Boolean,
204+
allowRepeats: Boolean,
205+
totalWidth: Int,
206+
printHelpOnExit: Boolean,
207+
docsOnNewLine: Boolean,
208+
autoPrintHelpAndExit: Option[(Int, PrintStream)],
209+
customNames: Map[String, String],
210+
customDocs: Map[String, String],
211+
sorted: Boolean
212+
): Either[String, Any] = runEither(
207213
args,
208214
allowPositional,
209215
allowRepeats,
@@ -220,9 +226,12 @@ class ParserForMethods[B](val mains: MethodMains[B]) {
220226
def runRaw(
221227
args: Seq[String],
222228
allowPositional: Boolean,
223-
allowRepeats: Boolean,
229+
allowRepeats: Boolean
224230
): Result[Any] = runRaw(
225-
args, allowPositional, allowRepeats, Util.kebabCaseNameMapper
231+
args,
232+
allowPositional,
233+
allowRepeats,
234+
Util.kebabCaseNameMapper
226235
)
227236
def runRaw(
228237
args: Seq[String],
@@ -240,7 +249,7 @@ class ParserForMethods[B](val mains: MethodMains[B]) {
240249
def runRaw0(
241250
args: Seq[String],
242251
allowPositional: Boolean,
243-
allowRepeats: Boolean,
252+
allowRepeats: Boolean
244253
): Either[Result.Failure.Early, (MainData[_, B], Result[Any])] = runRaw0(
245254
args,
246255
allowPositional,
@@ -270,7 +279,9 @@ class ParserForClass[T](val main: MainData[T, Any], val companion: () => Any)
270279
docsOnNewLine: Boolean,
271280
customName: String,
272281
customDoc: String,
273-
sorted: Boolean): String = helpText(totalWidth, docsOnNewLine, customName, customDoc, sorted, Util.kebabCaseNameMapper)
282+
sorted: Boolean
283+
): String =
284+
helpText(totalWidth, docsOnNewLine, customName, customDoc, sorted, Util.kebabCaseNameMapper)
274285

275286
def helpText(
276287
totalWidth: Int = 100,
@@ -312,7 +323,8 @@ class ParserForClass[T](val main: MainData[T, Any], val companion: () => Any)
312323
docsOnNewLine: Boolean,
313324
autoPrintHelpAndExit: Option[(Int, PrintStream)],
314325
customName: String,
315-
customDoc: String): T = constructOrExit(
326+
customDoc: String
327+
): T = constructOrExit(
316328
args,
317329
allowPositional,
318330
allowRepeats,
@@ -367,7 +379,7 @@ class ParserForClass[T](val main: MainData[T, Any], val companion: () => Any)
367379
docsOnNewLine: Boolean,
368380
autoPrintHelpAndExit: Option[(Int, PrintStream)],
369381
customName: String,
370-
customDoc: String,
382+
customDoc: String
371383
): T = constructOrThrow(
372384
args,
373385
allowPositional,
@@ -420,7 +432,7 @@ class ParserForClass[T](val main: MainData[T, Any], val companion: () => Any)
420432
autoPrintHelpAndExit: Option[(Int, PrintStream)],
421433
customName: String,
422434
customDoc: String,
423-
sorted: Boolean,
435+
sorted: Boolean
424436
): Either[String, T] = constructEither(
425437
args,
426438
allowPositional,
@@ -431,7 +443,7 @@ class ParserForClass[T](val main: MainData[T, Any], val companion: () => Any)
431443
autoPrintHelpAndExit,
432444
customName,
433445
customDoc,
434-
sorted,
446+
sorted
435447
)
436448
def constructEither(
437449
args: Seq[String],
@@ -498,7 +510,7 @@ class ParserForClass[T](val main: MainData[T, Any], val companion: () => Any)
498510
def constructRaw(
499511
args: Seq[String],
500512
allowPositional: Boolean,
501-
allowRepeats: Boolean,
513+
allowRepeats: Boolean
502514
): Result[T] = constructRaw(
503515
args,
504516
allowPositional,

‎mainargs/src/Renderer.scala‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ object Renderer {
2626
case r: TokensReader.Simple[_] =>
2727
val shortPrefix = arg.shortName.map(c => s"-$c")
2828
val typeSuffix = s"<${r.shortName}>"
29-
val nameSuffix = if (arg.positional) arg.longName(nameMapper) else arg.longName(nameMapper).map(s => s"--$s")
29+
val nameSuffix =
30+
if (arg.positional) arg.longName(nameMapper) else arg.longName(nameMapper).map(s => s"--$s")
3031
(shortPrefix ++ nameSuffix ++ Seq(typeSuffix)).mkString(" ")
3132

3233
case r: TokensReader.Leftover[_, _] =>
@@ -36,14 +37,15 @@ object Renderer {
3637
/**
3738
* Returns a `Some[string]` with the sortable string or a `None` if it is an leftover.
3839
*/
39-
private def sortableName(arg: ArgSig, nameMapper: String => Option[String]): Option[String] = arg match {
40-
case arg: ArgSig if arg.reader.isLeftover => None
41-
42-
case a: ArgSig =>
43-
a.shortName.map(_.toString).orElse(a.longName(nameMapper)).orElse(Some(""))
44-
case a: ArgSig =>
45-
a.longName(nameMapper)
46-
}
40+
private def sortableName(arg: ArgSig, nameMapper: String => Option[String]): Option[String] =
41+
arg match {
42+
case arg: ArgSig if arg.reader.isLeftover => None
43+
44+
case a: ArgSig =>
45+
a.shortName.map(_.toString).orElse(a.longName(nameMapper)).orElse(Some(""))
46+
case a: ArgSig =>
47+
a.longName(nameMapper)
48+
}
4749

4850
object ArgOrd extends math.Ordering[ArgSig] {
4951
override def compare(x: ArgSig, y: ArgSig): Int =
@@ -58,7 +60,8 @@ object Renderer {
5860
def renderArg(
5961
arg: ArgSig,
6062
leftOffset: Int,
61-
wrappedWidth: Int): (String, String) = renderArg(arg, leftOffset, wrappedWidth, Util.kebabCaseNameMapper)
63+
wrappedWidth: Int
64+
): (String, String) = renderArg(arg, leftOffset, wrappedWidth, Util.kebabCaseNameMapper)
6265

6366
def renderArg(
6467
arg: ArgSig,
@@ -76,8 +79,16 @@ object Renderer {
7679
docsOnNewLine: Boolean,
7780
customNames: Map[String, String],
7881
customDocs: Map[String, String],
79-
sorted: Boolean,
80-
): String = formatMainMethods(mainMethods, totalWidth, docsOnNewLine, customNames, customDocs, sorted, Util.kebabCaseNameMapper)
82+
sorted: Boolean
83+
): String = formatMainMethods(
84+
mainMethods,
85+
totalWidth,
86+
docsOnNewLine,
87+
customNames,
88+
customDocs,
89+
sorted,
90+
Util.kebabCaseNameMapper
91+
)
8192

8293
def formatMainMethods(
8394
mainMethods: Seq[MainData[_, _]],
@@ -137,7 +148,7 @@ object Renderer {
137148
totalWidth: Int,
138149
docsOnNewLine: Boolean,
139150
customNames: Map[String, String],
140-
customDocs: Map[String, String],
151+
customDocs: Map[String, String]
141152
): String = formatMainMethods(
142153
mainMethods,
143154
totalWidth,
@@ -207,7 +218,7 @@ object Renderer {
207218
docsOnNewLine,
208219
customName,
209220
customDoc,
210-
sorted = true,
221+
sorted = true
211222
)
212223

213224
@deprecated("Binary Compatibility Shim", "mainargs 0.6.0")
@@ -279,7 +290,7 @@ object Renderer {
279290
docsOnNewLine: Boolean,
280291
customName: Option[String],
281292
customDoc: Option[String],
282-
sorted: Boolean,
293+
sorted: Boolean
283294
): String = renderResult(
284295
main,
285296
result,

‎mainargs/src/TokenGrouping.scala‎

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ object TokenGrouping {
1111
argSigs: Seq[(ArgSig, TokensReader.Terminal[_])],
1212
allowPositional: Boolean,
1313
allowRepeats: Boolean,
14-
allowLeftover: Boolean,
14+
allowLeftover: Boolean
1515
): Result[TokenGrouping[B]] = {
1616
groupArgs(flatArgs0, argSigs, allowPositional, allowRepeats, allowLeftover, _ => None)
1717
}
@@ -39,20 +39,24 @@ object TokenGrouping {
3939
.toMap[String, ArgSig]
4040

4141
lazy val shortArgMap: Map[Char, ArgSig] = argSigs
42-
.collect{case (a, _) if !a.positional => a.shortName.map(_ -> a)}
42+
.collect { case (a, _) if !a.positional => a.shortName.map(_ -> a) }
4343
.flatten
4444
.toMap[Char, ArgSig]
4545

4646
lazy val shortFlagArgMap: Map[Char, ArgSig] = argSigs
47-
.collect{case (a, r: TokensReader.Flag) if !a.positional => a.shortName.map(_ -> a)}
47+
.collect { case (a, r: TokensReader.Flag) if !a.positional => a.shortName.map(_ -> a) }
4848
.flatten
4949
.toMap[Char, ArgSig]
5050

51-
lazy val longKeywordArgMap = makeKeywordArgMap(x => x.mappedName(nameMapper).map("--"+ _ ) ++ x.longName(Util.nullNameMapper).map("--" + _))
51+
lazy val longKeywordArgMap = makeKeywordArgMap(x =>
52+
x.mappedName(nameMapper).map("--" + _) ++ x.longName(Util.nullNameMapper).map("--" + _)
53+
)
5254

53-
def parseCombinedShortTokens(current: Map[ArgSig, Vector[String]],
54-
head: String,
55-
rest: List[String]) = {
55+
def parseCombinedShortTokens(
56+
current: Map[ArgSig, Vector[String]],
57+
head: String,
58+
rest: List[String]
59+
) = {
5660
val chars = head.drop(1)
5761
var rest2 = rest
5862
var i = 0
@@ -99,7 +103,10 @@ object TokenGrouping {
99103
else Right((rest2, currentMap))
100104
}
101105

102-
def lookupArgMap(k: String, m: Map[String, ArgSig]): Option[(ArgSig, mainargs.TokensReader[_])] = {
106+
def lookupArgMap(
107+
k: String,
108+
m: Map[String, ArgSig]
109+
): Option[(ArgSig, mainargs.TokensReader[_])] = {
103110
m.get(k).map(a => (a, a.reader))
104111
}
105112

@@ -110,14 +117,14 @@ object TokenGrouping {
110117
remaining match {
111118
case head :: rest =>
112119
// special handling for combined short args of the style "-xvf" or "-j10"
113-
if (head.startsWith("-") && head.lift(1).exists(c => c != '-')){
114-
parseCombinedShortTokens(current, head, rest) match{
115-
case Left(failure) => failure
116-
case Right((rest2, currentMap)) => rec(rest2, currentMap)
120+
if (head.startsWith("-") && head.lift(1).exists(c => c != '-')) {
121+
parseCombinedShortTokens(current, head, rest) match {
122+
case Left(failure) => failure
123+
case Right((rest2, currentMap)) => rec(rest2, currentMap)
117124
}
118125

119126
} else if (head.startsWith("-") && head.exists(_ != '-')) {
120-
head.split("=", 2) match{
127+
head.split("=", 2) match {
121128
case Array(first, second) =>
122129
lookupArgMap(first, longKeywordArgMap) match {
123130
case Some((cliArg, _: TokensReader.Simple[_])) =>
@@ -170,10 +177,10 @@ object TokenGrouping {
170177

171178
val missing = argSigs.collect {
172179
case (a, r: TokensReader.Simple[_])
173-
if !r.allowEmpty
174-
&& a.default.isEmpty
175-
&& !current.contains(a) =>
176-
a
180+
if !r.allowEmpty
181+
&& a.default.isEmpty
182+
&& !current.contains(a) =>
183+
a
177184
}
178185

179186
val unknown = if (allowLeftover) Nil else remaining

0 commit comments

Comments
 (0)