SI-9084 Add `since` (if available) to deprecation warnings

7 files changed, 37 insertions, 28 deletions

diff --git a/src/compiler/scala/tools/nsc/Reporting.scala b/src/compiler/scala/tools/nsc/Reporting.scala
index 8d0aedc76d..325537a5a8 100644
--- a/src/compiler/scala/tools/nsc/Reporting.scala
+++ b/src/compiler/scala/tools/nsc/Reporting.scala
@@ -68,8 +68,9 @@ trait Reporting extends scala.reflect.internal.Reporting { self: ast.Positions w
     // behold! the symbol that caused the deprecation warning (may not be deprecated itself)
     def deprecationWarning(pos: Position, sym: Symbol, msg: String): Unit = _deprecationWarnings.warn(pos, msg)
     def deprecationWarning(pos: Position, sym: Symbol): Unit = {
-      val suffix = sym.deprecationMessage match { case Some(msg) => ": "+ msg case _ => "" }
-      deprecationWarning(pos, sym, s"$sym${sym.locationString} is deprecated$suffix")
+      val version = sym.deprecationVersion match { case Some(ver) => s" (since $ver)" case _ => "" }
+      val message = sym.deprecationMessage match { case Some(msg) => s": $msg"        case _ => "" }
+      deprecationWarning(pos, sym, s"$sym${sym.locationString} is deprecated$version$message")
     }
 
     private[this] var reportedFeature = Set[Symbol]()
diff --git a/src/compiler/scala/tools/nsc/typechecker/Adaptations.scala b/src/compiler/scala/tools/nsc/typechecker/Adaptations.scala
index 2f4d228347..46561de78f 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Adaptations.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Adaptations.scala
@@ -74,7 +74,7 @@ trait Adaptations {
         if (settings.future)
           context.error(t.pos, adaptWarningMessage("Adaptation of argument list by inserting () has been removed.", showAdaptation = false))
         else {
-          val msg = "Adaptation of argument list by inserting () has been deprecated: " + (
+          val msg = "Adaptation of argument list by inserting () is deprecated: " + (
           if (isLeakyTarget) "leaky (Object-receiving) target makes this especially dangerous."
           else "this is unlikely to be what you want.")
           context.deprecationWarning(t.pos, t.symbol, adaptWarningMessage(msg))
diff --git a/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala b/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala
index 5062289ed1..063cfd3805 100644
--- a/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala
@@ -565,14 +565,15 @@ trait NamesDefaults { self: Analyzer =>
           case Some(`name`)      => true
           case Some(nme.NO_NAME) => anonOK
         }
+      def since = param.deprecatedParamVersion.map(ver => s" (since $ver)").getOrElse("")
       def checkName = {
         val res = param.name == name
-        if (res && checkDeprecation(true)) warn(s"naming parameter $name has been deprecated.")
+        if (res && checkDeprecation(true)) warn(s"naming parameter $name is deprecated$since.")
         res
       }
       def checkAltName = {
         val res = checkDeprecation(false)
-        if (res) warn(s"the parameter name $name has been deprecated. Use ${param.name} instead.")
+        if (res) warn(s"the parameter name $name is deprecated$since: Use ${param.name} instead")
         res
       }
       !param.isSynthetic && (checkName || checkAltName)
diff --git a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
index da269168ec..3aea64a1f2 100644
--- a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
@@ -548,9 +548,10 @@ abstract class RefChecks extends InfoTransform with scala.reflect.internal.trans
 
         def checkOverrideDeprecated() {
           if (other.hasDeprecatedOverridingAnnotation && !member.ownerChain.exists(x => x.isDeprecated || x.hasBridgeAnnotation)) {
-            val suffix = other.deprecatedOverridingMessage map (": " + _) getOrElse ""
-            val msg = s"overriding ${other.fullLocationString} is deprecated$suffix"
-            currentRun.reporting.deprecationWarning(member.pos, other, msg)
+            val version = other.deprecatedOverridingVersion map (ver => s" (since $ver)") getOrElse ""
+            val message = other.deprecatedOverridingMessage map (msg => s": $msg")        getOrElse ""
+            val report = s"overriding ${other.fullLocationString} is deprecated$version$message"
+            currentRun.reporting.deprecationWarning(member.pos, other, report)
           }
         }
       }
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index 1aed9c3a64..d44a0eaf59 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -1704,9 +1704,10 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
 
           if (!isPastTyper && psym.hasDeprecatedInheritanceAnnotation &&
             !sameSourceFile && !context.owner.ownerChain.exists(x => x.isDeprecated || x.hasBridgeAnnotation)) {
-            val suffix = psym.deprecatedInheritanceMessage map (": " + _) getOrElse ""
-            val msg = s"inheritance from ${psym.fullLocationString} is deprecated$suffix"
-            context.deprecationWarning(parent.pos, psym, msg)
+            val version = psym.deprecatedInheritanceVersion map (ver => s" (since $ver)") getOrElse ""
+            val message = psym.deprecatedInheritanceMessage map (msg => s": $msg")        getOrElse ""
+            val report = s"inheritance from ${psym.fullLocationString} is deprecated$version$message"
+            context.deprecationWarning(parent.pos, psym, report)
           }
 
           if (psym.isSealed && !phase.erasedTypes)
diff --git a/src/library/scala/collection/convert/package.scala b/src/library/scala/collection/convert/package.scala
index 7f48023b58..fe1951b6cf 100644
--- a/src/library/scala/collection/convert/package.scala
+++ b/src/library/scala/collection/convert/package.scala
@@ -10,17 +10,17 @@ package scala
 package collection
 
 package object convert {
-  @deprecated("Use JavaConverters", since="2.12")
+  @deprecated("use JavaConverters", since="2.12")
   val decorateAsJava  = new DecorateAsJava { }
-  @deprecated("Use JavaConverters", since="2.12")
+  @deprecated("use JavaConverters", since="2.12")
   val decorateAsScala = new DecorateAsScala { }
-  @deprecated("Use JavaConverters", since="2.12")
+  @deprecated("use JavaConverters", since="2.12")
   val decorateAll     = JavaConverters
 
-  @deprecated("Use JavaConverters or consider ImplicitConversionsToJava", since="2.12")
+  @deprecated("use JavaConverters or consider ImplicitConversionsToJava", since="2.12")
   val wrapAsJava      = new WrapAsJava { }
-  @deprecated("Use JavaConverters or consider ImplicitConversionsToScala", since="2.12")
+  @deprecated("use JavaConverters or consider ImplicitConversionsToScala", since="2.12")
   val wrapAsScala     = new WrapAsScala { }
-  @deprecated("Use JavaConverters or consider ImplicitConversions", since="2.12")
+  @deprecated("use JavaConverters or consider ImplicitConversions", since="2.12")
   val wrapAll         = new WrapAsJava with WrapAsScala { }
 }
diff --git a/src/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala
index ed51414382..8f24b435b3 100644
--- a/src/reflect/scala/reflect/internal/Symbols.scala
+++ b/src/reflect/scala/reflect/internal/Symbols.scala
@@ -871,21 +871,26 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
         )
       }
 
-    def isStrictFP          = hasAnnotation(ScalaStrictFPAttr) || (enclClass hasAnnotation ScalaStrictFPAttr)
-    def isSerializable      = info.baseClasses.exists(p => p == SerializableClass || p == JavaSerializableClass)
-    def hasBridgeAnnotation = hasAnnotation(BridgeClass)
-    def isDeprecated        = hasAnnotation(DeprecatedAttr)
-    def deprecationMessage  = getAnnotation(DeprecatedAttr) flatMap (_ stringArg 0)
-    def deprecationVersion  = getAnnotation(DeprecatedAttr) flatMap (_ stringArg 1)
-    def deprecatedParamName = getAnnotation(DeprecatedNameAttr) flatMap (_ symbolArg 0 orElse Some(nme.NO_NAME))
+    def isStrictFP             = hasAnnotation(ScalaStrictFPAttr) || (enclClass hasAnnotation ScalaStrictFPAttr)
+    def isSerializable         = info.baseClasses.exists(p => p == SerializableClass || p == JavaSerializableClass)
+    def hasBridgeAnnotation    = hasAnnotation(BridgeClass)
+    def isDeprecated           = hasAnnotation(DeprecatedAttr)
+    def deprecationMessage     = getAnnotation(DeprecatedAttr) flatMap (_ stringArg 0)
+    def deprecationVersion     = getAnnotation(DeprecatedAttr) flatMap (_ stringArg 1)
+    def deprecatedParamName    = getAnnotation(DeprecatedNameAttr) flatMap (_ symbolArg 0 orElse Some(nme.NO_NAME))
+    def deprecatedParamVersion = getAnnotation(DeprecatedNameAttr) flatMap (_ stringArg 1)
     def hasDeprecatedInheritanceAnnotation
-                            = hasAnnotation(DeprecatedInheritanceAttr)
+                               = hasAnnotation(DeprecatedInheritanceAttr)
     def deprecatedInheritanceMessage
-                            = getAnnotation(DeprecatedInheritanceAttr) flatMap (_ stringArg 0)
+                               = getAnnotation(DeprecatedInheritanceAttr) flatMap (_ stringArg 0)
+    def deprecatedInheritanceVersion
+                               = getAnnotation(DeprecatedInheritanceAttr) flatMap (_ stringArg 1)
     def hasDeprecatedOverridingAnnotation
-                            = hasAnnotation(DeprecatedOverridingAttr)
+                               = hasAnnotation(DeprecatedOverridingAttr)
     def deprecatedOverridingMessage
-                            = getAnnotation(DeprecatedOverridingAttr) flatMap (_ stringArg 0)
+                               = getAnnotation(DeprecatedOverridingAttr) flatMap (_ stringArg 0)
+    def deprecatedOverridingVersion
+                               = getAnnotation(DeprecatedOverridingAttr) flatMap (_ stringArg 1)
 
     // !!! when annotation arguments are not literal strings, but any sort of
     // assembly of strings, there is a fair chance they will turn up here not as