@@ -26,8 +26,8 @@ class CrossVersionChecks extends MiniPhase:
26
26
// I assume that's a consequence of some code trying to avoid noise by suppressing
27
27
// warnings after the first, but I think it'd be better if we didn't have to
28
28
// arbitrarily choose one as more important than the other.
29
- private def checkUndesiredProperties (sym : Symbol , pos : SrcPos )(using Context ): Unit =
30
- checkDeprecated(sym, pos)
29
+ private def checkUndesiredProperties (sym : Symbol , pos : SrcPos , site : String )(using Context ): Unit =
30
+ checkDeprecated(sym, pos, site )
31
31
checkExperimentalRef(sym, pos)
32
32
33
33
val xMigrationValue = ctx.settings.Xmigration .value
@@ -38,7 +38,7 @@ class CrossVersionChecks extends MiniPhase:
38
38
/** If @deprecated is present, and the point of reference is not enclosed
39
39
* in either a deprecated member or a scala bridge method, issue a warning.
40
40
*/
41
- private def checkDeprecated (sym : Symbol , pos : SrcPos )(using Context ): Unit =
41
+ private def checkDeprecated (sym : Symbol , pos : SrcPos , site : String )(using Context ): Unit =
42
42
43
43
/** is the owner an enum or its companion and also the owner of sym */
44
44
def isEnumOwner (owner : Symbol )(using Context ) =
@@ -63,11 +63,11 @@ class CrossVersionChecks extends MiniPhase:
63
63
def skipWarning (using Context ): Boolean = {
64
64
val owners = ctx.owner.ownersIterator.toList
65
65
val result = // (sym.isConstructor && sym.owner.is(Flags.CaseClass) && ctx.owner.is(Flags.Synthetic)) &&
66
- owners.exists( owner => if sym.isEnumCase then isDeprecatedOrEnum(owner) else ctx.owner. is(Flags .Synthetic ) || owner.isDeprecated)
67
- if ( ! result )
68
- println(i " sym: $sym flags: ${sym.flagsString}" )
69
- println(i " owner: ${ctx.owner} deprecated: ${ctx.owner.isDeprecated} constructor: ${ctx.owner.isConstructor} flags: ${ctx.owner.flagsString}" )
70
- println(i " tree : ${ctx.tree} " )
66
+ (ctx. owner.is( Flags . Synthetic ) && sym. is(Flags .CaseClass )) ||
67
+ owners.exists(owner => if sym.isEnumCase then isDeprecatedOrEnum(owner) else owner.isDeprecated )
68
+ println(i " sym: $sym flags: ${sym.flagsString} owner: ${sym.owner} constructor: ${sym.isConstructor }" )
69
+ println(i " owner: ${ctx.owner} deprecated: ${ctx.owner.isDeprecated} constructor: ${ctx.owner.isConstructor} flags: ${ctx.owner.flagsString}" )
70
+ println(i " site : $site " )
71
71
result
72
72
}
73
73
@@ -137,28 +137,28 @@ class CrossVersionChecks extends MiniPhase:
137
137
tree
138
138
139
139
override def transformIdent (tree : Ident )(using Context ): Ident = {
140
- checkUndesiredProperties(tree.symbol, tree.srcPos)
140
+ checkUndesiredProperties(tree.symbol, tree.srcPos, " ident " )
141
141
tree
142
142
}
143
143
144
144
override def transformSelect (tree : Select )(using Context ): Select = {
145
- checkUndesiredProperties(tree.symbol, tree.srcPos)
145
+ checkUndesiredProperties(tree.symbol, tree.srcPos, " select " )
146
146
tree
147
147
}
148
148
149
149
override def transformNew (tree : New )(using Context ): New = {
150
- checkUndesiredProperties(tree.tpe.typeSymbol, tree.srcPos)
150
+ checkUndesiredProperties(tree.tpe.typeSymbol, tree.srcPos, " new " )
151
151
tree
152
152
}
153
153
154
154
override def transformTypeTree (tree : TypeTree )(using Context ): TypeTree = {
155
155
val tpe = tree.tpe
156
156
tpe.foreachPart {
157
157
case TypeRef (_, sym : Symbol ) =>
158
- checkDeprecated(sym, tree.srcPos)
158
+ checkDeprecated(sym, tree.srcPos, " typeTree.typeRef " )
159
159
checkExperimentalRef(sym, tree.srcPos)
160
160
case TermRef (_, sym : Symbol ) =>
161
- checkDeprecated(sym, tree.srcPos)
161
+ checkDeprecated(sym, tree.srcPos, " typeTree.termRef " )
162
162
checkExperimentalRef(sym, tree.srcPos)
163
163
case _ =>
164
164
}
@@ -173,7 +173,7 @@ class CrossVersionChecks extends MiniPhase:
173
173
override def transformOther (tree : Tree )(using Context ): Tree = tree match
174
174
case tree : Import =>
175
175
tree.foreachSubTree {
176
- case t : RefTree => checkUndesiredProperties(t.symbol, t.srcPos)
176
+ case t : RefTree => checkUndesiredProperties(t.symbol, t.srcPos, " other " )
177
177
case _ =>
178
178
}
179
179
tree
0 commit comments