Skip to content

Commit 5893025

Browse files
committed
Warn if implicit default shadows given
-Wrecurse-with-default warns on self-recursion with default arg. [Cherry-picked 6dac167][modified]
1 parent d6bd65e commit 5893025

File tree

11 files changed

+65
-8
lines changed

11 files changed

+65
-8
lines changed

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ private sealed trait WarningSettings:
175175
private val WNonUnitStatement = BooleanSetting("-Wnonunit-statement", "Warn when block statements are non-Unit expressions.")
176176
private val WenumCommentDiscard = BooleanSetting("-Wenum-comment-discard", "Warn when a comment ambiguously assigned to multiple enum cases is discarded.")
177177
private val WtoStringInterpolated = BooleanSetting("-Wtostring-interpolated", "Warn a standard interpolator used toString on a reference type.")
178+
private val WrecurseWithDefault = BooleanSetting("-Wrecurse-with-default", "Warn when a method calls itself with a default argument.")
178179
private val Wunused: Setting[List[ChoiceWithHelp[String]]] = MultiChoiceHelpSetting(
179180
name = "-Wunused",
180181
helpArg = "warning",
@@ -292,6 +293,7 @@ private sealed trait WarningSettings:
292293
def nonUnitStatement(using Context): Boolean = allOr(WNonUnitStatement)
293294
def enumCommentDiscard(using Context): Boolean = allOr(WenumCommentDiscard)
294295
def toStringInterpolated(using Context): Boolean = allOr(WtoStringInterpolated)
296+
def recurseWithDefault(using Context): Boolean = allOr(WrecurseWithDefault)
295297
def checkInit(using Context): Boolean = allOr(YcheckInit)
296298

297299
/** -X "Extended" or "Advanced" settings */

compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,8 @@ enum ErrorMessageID(val isActive: Boolean = true) extends java.lang.Enum[ErrorMe
233233
case ErasedNotPureID // errorNumber: 217
234234
case IllegalErasedDefID // errorNumber: 218
235235
case CannotInstantiateQuotedTypeVarID // errorNumber: 219
236+
case DefaultShadowsGivenID // errorNumber: 220
237+
case RecurseWithDefaultID // errorNumber: 221
236238

237239
def errorNumber = ordinal - 1
238240

compiler/src/dotty/tools/dotc/reporting/messages.scala

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3307,3 +3307,15 @@ final class NamedPatternNotApplicable(selectorType: Type)(using Context) extends
33073307
i"Named patterns cannot be used with $selectorType, because it is not a named tuple or case class"
33083308

33093309
override protected def explain(using Context): String = ""
3310+
3311+
final class DefaultShadowsGiven(name: Name)(using Context) extends TypeMsg(DefaultShadowsGivenID):
3312+
override protected def msg(using Context): String =
3313+
i"Argument for implicit parameter $name was supplied using a default argument."
3314+
override protected def explain(using Context): String =
3315+
"Usually the given in scope is intended, but you must specify it after explicit `using`."
3316+
3317+
final class RecurseWithDefault(name: Name)(using Context) extends TypeMsg(RecurseWithDefaultID):
3318+
override protected def msg(using Context): String =
3319+
i"Recursive call used a default argument for parameter $name."
3320+
override protected def explain(using Context): String =
3321+
"It's more explicit to pass current or modified arguments in a recursion."

compiler/src/dotty/tools/dotc/transform/TailRec.scala

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ package transform
44
import ast.{TreeTypeMap, tpd}
55
import config.Printers.tailrec
66
import core.*
7-
import Contexts.*, Flags.*, Symbols.*, Decorators.em
7+
import Contexts.*, Flags.*, Symbols.*, Decorators.*
88
import Constants.Constant
9-
import NameKinds.{TailLabelName, TailLocalName, TailTempName}
9+
import NameKinds.{DefaultGetterName, TailLabelName, TailLocalName, TailTempName}
1010
import StdNames.nme
1111
import reporting.*
1212
import transform.MegaPhase.MiniPhase
@@ -323,7 +323,11 @@ class TailRec extends MiniPhase {
323323
method.matches(calledMethod) &&
324324
enclosingClass.appliedRef.widen <:< prefix.tpe.widenDealias
325325

326-
if (isRecursiveCall)
326+
if isRecursiveCall then
327+
if ctx.settings.Whas.recurseWithDefault then
328+
if tree.args.exists(_.symbol.name.is(DefaultGetterName)) then
329+
report.warning(RecurseWithDefault(), tree.srcPos)
330+
327331
if (inTailPosition) {
328332
tailrec.println("Rewriting tail recursive call: " + tree.span)
329333
rewrote = true

compiler/src/dotty/tools/dotc/typer/Applications.scala

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -674,6 +674,11 @@ trait Applications extends Compatibility {
674674
def implicitArg = implicitArgTree(formal, appPos.span)
675675

676676
if !defaultArg.isEmpty then
677+
if methodType.isImplicitMethod && ctx.mode.is(Mode.ImplicitsEnabled)
678+
&& !inferImplicitArg(formal, appPos.span).tpe.isError
679+
then
680+
report.warning(DefaultShadowsGiven(methodType.paramNames(n)), appPos)
681+
677682
defaultArg.tpe.widen match
678683
case _: MethodOrPoly if testOnly => matchArgs(args1, formals1, n + 1)
679684
case _ => matchArgs(args1, addTyped(treeToArg(defaultArg)), n + 1)

scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ package tasty
44
import scala.jdk.CollectionConverters._
55

66
import scala.quoted._
7+
import scala.annotation.*
78

8-
import NameNormalizer._
9-
import SyntheticsSupport._
9+
import NameNormalizer.*
10+
import SyntheticsSupport.*
1011

1112
trait TypesSupport:
1213
self: TastyParser =>
@@ -76,6 +77,7 @@ trait TypesSupport:
7677
case tpe => inner(tpe)
7778

7879
// TODO #23 add support for all types signatures that make sense
80+
@nowarn("id=E219")
7981
private def inner(
8082
using Quotes,
8183
)(

tests/neg/19414-desugared.check renamed to tests/neg/i19414-desugared.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-- [E172] Type Error: tests/neg/19414-desugared.scala:22:34 ------------------------------------------------------------
1+
-- [E172] Type Error: tests/neg/i19414-desugared.scala:22:34 -----------------------------------------------------------
22
22 | summon[BodySerializer[JsObject]] // error: Ambiguous given instances
33
| ^
44
|No best given instance of type BodySerializer[JsObject] was found for parameter x of method summon in object Predef.
File renamed without changes.

tests/neg/19414.check renamed to tests/neg/i19414.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-- [E172] Type Error: tests/neg/19414.scala:15:34 ----------------------------------------------------------------------
1+
-- [E172] Type Error: tests/neg/i19414.scala:15:34 ---------------------------------------------------------------------
22
15 | summon[BodySerializer[JsObject]] // error: Ambiguous given instances
33
| ^
44
|No best given instance of type BodySerializer[JsObject] was found for parameter x of method summon in object Predef.

tests/neg/19414.scala renamed to tests/neg/i19414.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class Printer
99
given Writer[JsValue] = ???
1010
given Writer[JsObject] = ???
1111

12-
given [B: Writer](using printer: Printer = new Printer): BodySerializer[B] = ???
12+
given [B: Writer] => (printer: Printer = new Printer) => BodySerializer[B] = ???
1313

1414
def f: Unit =
1515
summon[BodySerializer[JsObject]] // error: Ambiguous given instances

0 commit comments

Comments
 (0)