@@ -64,7 +64,7 @@ object Settings:
6464
6565 @ unshared
6666 val settingCharacters = " [a-zA-Z0-9_\\ -]*" .r
67- def validateSettingString (name : String ): Unit =
67+ def validateSettingString (name : String ): Unit =
6868 assert(settingCharacters.matches(name), s " Setting string $name contains invalid characters " )
6969
7070
@@ -83,7 +83,7 @@ object Settings:
8383 deprecationMsg : Option [String ] = None ,
8484 // kept only for -Ykind-projector option compatibility
8585 legacyArgs : Boolean = false )(private [Settings ] val idx : Int ) {
86-
86+
8787 validateSettingString(prefix.getOrElse(name))
8888 aliases.foreach(validateSettingString)
8989 assert(name.startsWith(s " - ${category.prefixLetter}" ), s " Setting $name does not start with category - $category" )
@@ -92,7 +92,7 @@ object Settings:
9292 // Example: -opt Main.scala would be interpreted as -opt:Main.scala, and the source file would be ignored.
9393 assert(! (summon[ClassTag [T ]] == ListTag && ignoreInvalidArgs), s " Ignoring invalid args is not supported for multivalue settings: $name" )
9494
95- val allFullNames : List [String ] = s " $name" :: s " - $name" :: aliases
95+ val allFullNames : List [String ] = s " $name" :: s " - $name" :: aliases
9696
9797 def valueIn (state : SettingsState ): T = state.value(idx).asInstanceOf [T ]
9898
@@ -105,7 +105,7 @@ object Settings:
105105 def isMultivalue : Boolean = summon[ClassTag [T ]] == ListTag
106106
107107 def acceptsNoArg : Boolean = summon[ClassTag [T ]] == BooleanTag || summon[ClassTag [T ]] == OptionTag || choices.exists(_.contains(" " ))
108-
108+
109109 def legalChoices : String =
110110 choices match {
111111 case Some (xs) if xs.isEmpty => " "
@@ -168,17 +168,17 @@ object Settings:
168168 update(x, args)
169169 catch case _ : NumberFormatException =>
170170 fail(s " $argValue is not an integer argument for $name" , args)
171-
172- def setOutput (argValue : String , args : List [String ]) =
171+
172+ def setOutput (argValue : String , args : List [String ]) =
173173 val path = Directory (argValue)
174- val isJar = path.extension == " jar "
174+ val isJar = path.ext.isJar
175175 if (! isJar && ! path.isDirectory)
176176 fail(s " ' $argValue' does not exist or is not a directory or .jar file " , args)
177177 else {
178178 val output = if (isJar) JarArchive .create(path) else new PlainDirectory (path)
179179 update(output, args)
180180 }
181-
181+
182182 def setVersion (argValue : String , args : List [String ]) =
183183 ScalaVersion .parse(argValue) match {
184184 case Success (v) => update(v, args)
@@ -193,7 +193,7 @@ object Settings:
193193 case _ => update(strings, args)
194194
195195
196- def doSet (argRest : String ) =
196+ def doSet (argRest : String ) =
197197 ((summon[ClassTag [T ]], args): @ unchecked) match {
198198 case (BooleanTag , _) =>
199199 setBoolean(argRest, args)
@@ -224,16 +224,16 @@ object Settings:
224224 case _ =>
225225 missingArg
226226
227- def matches (argName : String ): Boolean =
227+ def matches (argName : String ): Boolean =
228228 (allFullNames).exists(_ == argName.takeWhile(_ != ':' )) || prefix.exists(arg.startsWith)
229229
230- def argValRest : String =
230+ def argValRest : String =
231231 if (prefix.isEmpty) arg.dropWhile(_ != ':' ).drop(1 ) else arg.drop(prefix.get.length)
232-
233- if matches(arg) then
232+
233+ if matches(arg) then
234234 if deprecationMsg.isDefined then
235235 warn(s " Option $name is deprecated: ${deprecationMsg.get}" , args)
236- else
236+ else
237237 doSet(argValRest)
238238 else
239239 state
@@ -375,7 +375,7 @@ object Settings:
375375
376376 def OptionSetting [T : ClassTag ](category : SettingCategory , name : String , descr : String , aliases : List [String ] = Nil ): Setting [Option [T ]] =
377377 publish(Setting (category, prependName(name), descr, None , propertyClass = Some (summon[ClassTag [T ]].runtimeClass), aliases = aliases))
378-
378+
379379 def DeprecatedSetting (category : SettingCategory , name : String , descr : String , deprecationMsg : String ): Setting [Boolean ] =
380380 publish(Setting (category, prependName(name), descr, false , deprecationMsg = Some (deprecationMsg)))
381381 }
0 commit comments