Remove last tweaking use of global.isScala3Migration

som-snytt · som-snytt · commit 93ac15395e9b · 2023-07-01T18:20:59.000-07:00
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala
@@ -1184,7 +1184,6 @@ class Global(var currentSettings: Settings, reporter0: Reporter)
     @nowarn("cat=deprecation")
     val isScala3: Boolean = settings.isScala3.value
     val isScala3ImplicitResolution: Boolean = settings.Yscala3ImplicitResolution.value
-    val isScala3Migration = settings.Xmigration.value != NoScalaVersion
 
     // used in sbt
     def uncheckedWarnings: List[(Position, String)]   = reporting.uncheckedWarnings
diff --git a/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala b/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala
@@ -554,8 +554,7 @@ trait NamesDefaults { self: Analyzer =>
         val NamedArg(Ident(name), rhs) = arg: @unchecked
         params.indexWhere(p => matchesName(p, name, argIndex)) match {
           case -1 =>
-            val warnVariableInScope = (!currentRun.isScala3 || currentRun.isScala3Migration) && context0.lookupSymbol(name, _.isVariable).isSuccess
-            UnknownParameterNameNamesDefaultError(arg, name, warnVariableInScope)
+            UnknownParameterNameNamesDefaultError(arg, name, warnVariableInScope = context0.lookupSymbol(name, _.isVariable).isSuccess)
           case paramPos if argPos contains paramPos =>
             val existingArgIndex = argPos.indexWhere(_ == paramPos)
             val otherName = Some(args(paramPos)) collect {
diff --git a/test/files/neg/t12798.check b/test/files/neg/t12798.check
@@ -1,4 +1,6 @@
 t12798.scala:11: error: unknown parameter name: z
+Note that assignments in argument position are no longer allowed since Scala 2.13.
+To express the assignment expression, wrap it in brackets, e.g., `{ z = ... }`.
     f(42, z = 27)
             ^
 t12798.scala:25: error: unary prefix operator definition with empty parameter list is unsupported: instead, remove () to declare as `def unary_- = -42`

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`t12798.scala:11: error: unknown parameter name: z`
	`2`	`+Note that assignments in argument position are no longer allowed since Scala 2.13.`
	`3`	+To express the assignment expression, wrap it in brackets, e.g., `{ z = ... }`.
`2`	`4`	`f(42, z = 27)`
`3`	`5`	`^`
`4`	`6`	t12798.scala:25: error: unary prefix operator definition with empty parameter list is unsupported: instead, remove () to declare as `def unary_- = -42`