Ylint to warn strict else warn multiple boolean lits

scala · Feb 28, 2024 · 5b7820d · 5b7820d
1 parent fa3b77b
commit 5b7820d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala
@@ -216,6 +216,7 @@ trait ScalaSettings extends StandardScalaSettings with Warnings { _: MutableSett
    * -Y "Private" settings
    */
   val Yhelp           = BooleanSetting    ("-Y", "Print a synopsis of private options.")
+  val Ylint           = BooleanSetting    ("-Ylint", "Use strict 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/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
@@ -1724,7 +1724,7 @@ abstract class RefChecks extends Transform {
       def applyDepth: Int = {
         def loop(t: Tree, d: Int): Int =
           t match {
-            case Apply(f, _) => loop(f, d+1)
+            case Apply(t, _) => loop(t, d+1)
             case _ => d
           }
         loop(fn, 0)
@@ -1736,13 +1736,20 @@ abstract class RefChecks extends Transform {
         }
       if (settings.lintNamedBooleans && !sym.isJavaDefined && !args.isEmpty) {
         val params = sym.paramLists(applyDepth)
-        if (!isAssertParadigm(params))
-          foreach2(args, params)((arg, param) => arg match {
-            case Literal(Constant(_: Boolean))
-            if arg.hasAttachment[UnnamedArg.type] && param.tpe.typeSymbol == BooleanClass && !param.deprecatedParamName.contains(nme.NO_NAME) =>
+        if (!settings.Ylint.value || !isAssertParadigm(params)) {
+          val suspicious = args.lazyZip(params).iterator
+            .filter {
+              case (arg @ Literal(Constant(_: Boolean)) , param) =>
+                arg.hasAttachment[UnnamedArg.type] && param.tpe.typeSymbol == BooleanClass && !param.deprecatedParamName.contains(nme.NO_NAME)
+              case _ => false
+            }
+            .toList
+          val warn = if (settings.Ylint.value) suspicious.nonEmpty else suspicious.lengthCompare(2) >= 0
+          if (warn)
+            suspicious.foreach { case (arg, param) =>
               runReporting.warning(arg.pos, s"Boolean literals should be passed using named argument syntax for parameter ${param.name}.", WarningCategory.LintNamedBooleans, sym)
-            case _ =>
-          })
+            }
+        }
       }
     }
 

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