Guard against extension suffix

scala · Apr 6, 2024 · bd9de74 · bd9de74
1 parent 2bc7faf
commit bd9de74
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
@@ -1754,7 +1754,7 @@ abstract class RefChecks extends Transform {
                     h.count {
                       case treeInfo.Applied(getter, _, _) if getter.symbol != null && getter.symbol.isDefaultGetter =>
                         val (_, i) = nme.splitDefaultGetterName(getter.symbol.name)
-                        isNameableBoolean(allParams(i-1))
+                        i > 0 && isNameableBoolean(allParams(i-1))
                       case _ => false
                     }
                   case _ => 0

diff --git a/src/reflect/scala/reflect/internal/StdNames.scala b/src/reflect/scala/reflect/internal/StdNames.scala
@@ -551,7 +551,12 @@ trait StdNames {
           case -1  => (name.toTermName, -1)
           case idx => (name.toTermName.take(idx), idx + DEFAULT_GETTER_STRING.length)
         }
-      if (i >= 0) (n, name.encoded.substring(i).toInt) else (n, -1)
+      if (i < 0) (n, -1)
+      else {
+        val j = name.indexOf('$', i) // f$default$7$extension
+        val idx = name.subSequence(i, if (j < 0) name.length else j)
+        (n, idx.toString.toInt)
+      }
     }
 
     def localDummyName(clazz: Symbol): TermName = newTermName(LOCALDUMMY_PREFIX + clazz.name + ">")

diff --git a/test/files/neg/named-booleans-relaxed.check b/test/files/neg/named-booleans-relaxed.check
@@ -46,6 +46,9 @@ named-booleans-relaxed.scala:92: warning: Boolean literals should be passed usin
 named-booleans-relaxed.scala:95: warning: Boolean literals should be passed using named argument syntax for parameter x. [quickfixable]
   def f = p.f(true, z=42) // warn
               ^
+named-booleans-relaxed.scala:106: warning: Boolean literals should be passed using named argument syntax for parameter y. [quickfixable]
+  def w = new V(true).combo(false)
+                            ^
 error: No warnings can be incurred under -Werror.
-16 warnings
+17 warnings
 1 error
diff --git a/test/files/neg/named-booleans-relaxed.scala b/test/files/neg/named-booleans-relaxed.scala
@@ -96,3 +96,12 @@ object TestPrinters {
   def g = p.f(x=true, b=true) // nowarn, no unnamed
   def h = p.f(true, b=true) // nowarn, one unnamed but other boolean is named; defaults are non-boolean
 }
+
+object Testy {
+  class V(val x: Boolean) extends AnyVal {
+    def combo(y: Boolean = true, z: Boolean = false) = x&&y&&z
+  }
+
+  def v = new V(true)
+  def w = new V(true).combo(false)
+}