Rename option -Wnamed-boolean

scala · Mar 11, 2024 · b89ad0c · b89ad0c
1 parent 729badb
commit b89ad0c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala
@@ -216,7 +216,6 @@ trait ScalaSettings extends StandardScalaSettings with Warnings { _: MutableSett
    * -Y "Private" settings
    */
   val Yhelp           = BooleanSetting    ("-Y", "Print a synopsis of private options.")
-  val Ylint           = BooleanSetting    ("-Ylinternal", "Use strict internal lints.")
   val breakCycles     = BooleanSetting    ("-Ybreak-cycles", "Attempt to break cycles encountered during typing")
   val check           = PhasesSetting     ("-Ycheck", "Check the tree at the end of")
   val Ycompacttrees   = BooleanSetting    ("-Ycompact-trees", "Use compact tree printer when displaying trees.")

diff --git a/src/compiler/scala/tools/nsc/settings/Warnings.scala b/src/compiler/scala/tools/nsc/settings/Warnings.scala
@@ -122,6 +122,7 @@ trait Warnings {
   val warnNumericWiden     = BooleanSetting("-Wnumeric-widen", "Warn when numerics are widened.") withAbbreviation "-Ywarn-numeric-widen"
   val warnOctalLiteral     = BooleanSetting("-Woctal-literal", "Warn on obsolete octal syntax.") withAbbreviation "-Ywarn-octal-literal"
   val warnNamedLiteral     = BooleanSetting("-Wnamed-literal", "Warn when unnamed literal arguments may be swapped, unless parameter has @deprecatedName.")
+  val warnNamedBoolean     = BooleanSetting("-Wnamed-boolean", "Boolean literal arguments should be named.").enabling(warnNamedLiteral :: Nil)
 
   object PerformanceWarnings extends MultiChoiceEnumeration {
     val Captured       = Choice("captured",        "Modification of var in closure causes boxing.")

diff --git a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
@@ -1747,7 +1747,7 @@ abstract class RefChecks extends Transform {
         val params = sym.paramLists(applyDepth)
         val numBools = params.count(_.tpe == BooleanTpe)
         def onlyLeadingBool = numBools == 1 && params.head.tpe == BooleanTpe
-        val checkable = if (settings.Ylint.value) numBools > 0 && !onlyLeadingBool else numBools >= 2
+        val checkable = if (settings.warnNamedBoolean.value) numBools > 0 && !onlyLeadingBool else numBools >= 2
         if (checkable) {
           val (unnamed, numSuspicious) = args.lazyZip(params).iterator
             .foldLeft((List.empty[(Tree, Symbol)], 0)) { (acc, ap) =>
@@ -1762,7 +1762,7 @@ abstract class RefChecks extends Transform {
                 case _ => acc
               }
             }
-          val warn = !unnamed.isEmpty && (settings.Ylint.value || numSuspicious >= 2)
+          val warn = !unnamed.isEmpty && (settings.warnNamedBoolean.value || numSuspicious >= 2)
           if (warn)
             unnamed.reverse.foreach {
               case (arg, param) =>

diff --git a/test/files/neg/named-booleans.scala b/test/files/neg/named-booleans.scala
@@ -1,4 +1,4 @@
-//> using options -Werror -Wnamed-literal -Ylinternal
+//> using options -Werror -Wnamed-boolean
 
 class C {
   def f(n: Int = 42, x: Boolean, y: Boolean) = if (x && y) n else 0