Merge pull request #10015 from som-snytt/issue/evidence-pos

SethTisue · web-flow · commit e623b156da1e · 2022-05-12T13:12:46.000+01:00
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
@@ -2600,8 +2600,10 @@ self =>
             contextBoundBuf += atPos(in.skipToken())(makeFunctionTypeTree(List(Ident(pname)), typ()))
           }
           while (in.token == COLON) {
-            contextBoundBuf += atPos(in.skipToken()) {
-              AppliedTypeTree(typ(), List(Ident(pname)))
+            in.nextToken()
+            val colonBound = typ()
+            contextBoundBuf += atPos(colonBound.pos) {
+              AppliedTypeTree(colonBound, List(Ident(pname)))
             }
           }
         }
diff --git a/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala b/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala
@@ -154,11 +154,11 @@ abstract class TreeBuilder {
     if (contextBounds.isEmpty) vparamss
     else {
       val mods = Modifiers(if (owner.isTypeName) PARAMACCESSOR | LOCAL | PRIVATE else PARAM)
-      def makeEvidenceParam(tpt: Tree) = ValDef(mods | IMPLICIT | SYNTHETIC, freshTermName(nme.EVIDENCE_PARAM_PREFIX), tpt, EmptyTree)
-      val evidenceParams = contextBounds map makeEvidenceParam
+      def makeEvidenceParam(tpt: Tree) = atPos(tpt.pos)(ValDef(mods | IMPLICIT | SYNTHETIC, freshTermName(nme.EVIDENCE_PARAM_PREFIX), tpt, EmptyTree))
+      val evidenceParams = contextBounds.map(makeEvidenceParam)
 
-      val vparamssLast = if(vparamss.nonEmpty) vparamss.last else Nil
-      if(vparamssLast.nonEmpty && vparamssLast.head.mods.hasFlag(IMPLICIT))
+      val vparamssLast = if (vparamss.nonEmpty) vparamss.last else Nil
+      if (vparamssLast.nonEmpty && vparamssLast.head.mods.hasFlag(IMPLICIT))
         vparamss.init ::: List(evidenceParams ::: vparamssLast)
       else
         vparamss ::: List(evidenceParams)
diff --git a/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala b/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala
@@ -751,8 +751,14 @@ trait TypeDiagnostics extends splain.SplainDiagnostics {
             && !isImplementation(s.owner)
             && !isConvention(s)
           )
-        for (s <- unusedPrivates.unusedParams if warnable(s))
-          emitUnusedWarning(s.pos, s"parameter $s in ${if (s.owner.isAnonymousFunction) "anonymous function" else s.owner} is never used", WarningCategory.UnusedParams, s)
+        for (s <- unusedPrivates.unusedParams if warnable(s)) {
+          val what =
+            if (s.name.startsWith(nme.EVIDENCE_PARAM_PREFIX)) s"evidence parameter ${s.name} of type ${s.tpe}"
+            else s"parameter ${s/*.name*/}"
+          val where =
+            if (s.owner.isAnonymousFunction) "anonymous function" else s.owner
+          emitUnusedWarning(s.pos, s"$what in $where is never used", WarningCategory.UnusedParams, s)
+        }
       }
     }
     def apply(unit: CompilationUnit): Unit = if (warningsEnabled && !unit.isJava && !typer.context.reporter.hasErrors) {
diff --git a/test/files/neg/classmanifests_new_deprecations.check b/test/files/neg/classmanifests_new_deprecations.check
@@ -1,6 +1,6 @@
 classmanifests_new_deprecations.scala:4: warning: type ClassManifest in package reflect is deprecated (since 2.10.0): use scala.reflect.ClassTag instead
   def rcm1[T: scala.reflect.ClassManifest] = ???
-            ^
+                            ^
 classmanifests_new_deprecations.scala:5: warning: type ClassManifest in package reflect is deprecated (since 2.10.0): use scala.reflect.ClassTag instead
   def rcm2[T](implicit evidence$1: scala.reflect.ClassManifest[T]) = ???
                                                  ^
diff --git a/test/files/neg/warn-unused-params.check b/test/files/neg/warn-unused-params.check
@@ -31,12 +31,12 @@ warn-unused-params.scala:97: warning: parameter value i in anonymous function is
 warn-unused-params.scala:101: warning: parameter value ctx in method f is never used
   def f[A](implicit ctx: Context[A]) = answer
                     ^
-warn-unused-params.scala:102: warning: parameter value evidence$1 in method g is never used
+warn-unused-params.scala:102: warning: evidence parameter evidence$1 of type Context[A] in method g is never used
   def g[A: Context] = answer
-      ^
-warn-unused-params.scala:104: warning: parameter value evidence$2 in class Bound is never used
+           ^
+warn-unused-params.scala:104: warning: evidence parameter evidence$2 of type Context[A] in class Bound is never used
 class Bound[A: Context]
-             ^
+               ^
 error: No warnings can be incurred under -Werror.
 13 warnings
 1 error

Original file line number	Diff line number	Diff line change
`@@ -2600,8 +2600,10 @@ self =>`
`2600`	`2600`	`contextBoundBuf += atPos(in.skipToken())(makeFunctionTypeTree(List(Ident(pname)), typ()))`
`2601`	`2601`	`}`
`2602`	`2602`	`while (in.token == COLON) {`
`2603`		`- contextBoundBuf += atPos(in.skipToken()) {`
`2604`		`- AppliedTypeTree(typ(), List(Ident(pname)))`
	`2603`	`+ in.nextToken()`
	`2604`	`+ val colonBound = typ()`
	`2605`	`+ contextBoundBuf += atPos(colonBound.pos) {`
	`2606`	`+ AppliedTypeTree(colonBound, List(Ident(pname)))`
`2605`	`2607`	`}`
`2606`	`2608`	`}`
`2607`	`2609`	`}`
Original file line number	Diff line number	Diff line change
`@@ -751,8 +751,14 @@ trait TypeDiagnostics extends splain.SplainDiagnostics {`
`751`	`751`	`&& !isImplementation(s.owner)`
`752`	`752`	`&& !isConvention(s)`
`753`	`753`	`)`
`754`		`- for (s <- unusedPrivates.unusedParams if warnable(s))`
`755`		`- emitUnusedWarning(s.pos, s"parameter $s in ${if (s.owner.isAnonymousFunction) "anonymous function" else s.owner} is never used", WarningCategory.UnusedParams, s)`
	`754`	`+ for (s <- unusedPrivates.unusedParams if warnable(s)) {`
	`755`	`+ val what =`
	`756`	`+ if (s.name.startsWith(nme.EVIDENCE_PARAM_PREFIX)) s"evidence parameter ${s.name} of type ${s.tpe}"`
	`757`	`+ else s"parameter ${s/.name/}"`
	`758`	`+ val where =`
	`759`	`+ if (s.owner.isAnonymousFunction) "anonymous function" else s.owner`
	`760`	`+ emitUnusedWarning(s.pos, s"$what in $where is never used", WarningCategory.UnusedParams, s)`
	`761`	`+ }`
`756`	`762`	`}`
`757`	`763`	`}`
`758`	`764`	`def apply(unit: CompilationUnit): Unit = if (warningsEnabled && !unit.isJava && !typer.context.reporter.hasErrors) {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`classmanifests_new_deprecations.scala:4: warning: type ClassManifest in package reflect is deprecated (since 2.10.0): use scala.reflect.ClassTag instead`
`2`	`2`	`def rcm1[T: scala.reflect.ClassManifest] = ???`
`3`		`- ^`
	`3`	`+ ^`
`4`	`4`	`classmanifests_new_deprecations.scala:5: warning: type ClassManifest in package reflect is deprecated (since 2.10.0): use scala.reflect.ClassTag instead`
`5`	`5`	`def rcm2[T](implicit evidence$1: scala.reflect.ClassManifest[T]) = ???`
`6`	`6`	`^`