Merge pull request #398 from scala/backport-lts-3.3-23052

Backport "Improve position of deprecation" to 3.3 LTS

Author: tgodzik

compiler/src/dotty/tools/dotc/report.scala

@@ -21,7 +21,7 @@ object report:
     ctx.reporter.report(warning)
 
   def deprecationWarning(msg: Message, pos: SrcPos, origin: String = "")(using Context): Unit =
-    issueWarning(new DeprecationWarning(msg, pos.sourcePos, origin))
+    issueWarning(DeprecationWarning(msg, addInlineds(pos), origin))
 
   def migrationWarning(msg: Message, pos: SrcPos)(using Context): Unit =
     issueWarning(new MigrationWarning(msg, pos.sourcePos))
@@ -126,7 +126,9 @@ object report:
 
   private def addInlineds(pos: SrcPos)(using Context): SourcePosition =
     def recur(pos: SourcePosition, inlineds: List[Trees.Tree[?]]): SourcePosition = inlineds match
-      case inlined :: inlineds1 => pos.withOuter(recur(inlined.sourcePos, inlineds1))
+      case inlined :: inlineds =>
+        val outer = recur(inlined.sourcePos, inlineds)
+        pos.withOuter(outer)
       case Nil => pos
     recur(pos.sourcePos, tpd.enclosingInlineds)
 

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

@@ -78,7 +78,8 @@ class CrossVersionChecks extends MiniPhase:
     do
       val msg = annot.argumentConstantString(0).map(msg => s": $msg").getOrElse("")
       val since = annot.argumentConstantString(1).map(version => s" (since: $version)").getOrElse("")
-      report.deprecationWarning(em"inheritance from $psym is deprecated$since$msg", parent.srcPos, origin=psym.showFullName)
+      val composed = em"inheritance from $psym is deprecated$since$msg"
+      report.deprecationWarning(composed, parent.srcPos, origin = psym.showFullName)
   }
 
   override def transformValDef(tree: ValDef)(using Context): ValDef =
@@ -166,16 +167,19 @@ object CrossVersionChecks:
    *  Also check for deprecation of the companion class for synthetic methods in the companion module.
    */
   private[CrossVersionChecks] def checkDeprecatedRef(sym: Symbol, pos: SrcPos)(using Context): Unit =
-    def maybeWarn(annotee: Symbol, annot: Annotation) = if !skipWarning(sym) then
+    def warn(annotee: Symbol, annot: Annotation) =
       val message = annot.argumentConstantString(0).filter(!_.isEmpty).map(": " + _).getOrElse("")
       val since = annot.argumentConstantString(1).filter(!_.isEmpty).map(" since " + _).getOrElse("")
-      report.deprecationWarning(em"${annotee.showLocated} is deprecated${since}${message}", pos, origin=annotee.showFullName)
+      val composed = em"${annotee.showLocated} is deprecated${since}${message}"
+      report.deprecationWarning(composed, pos, origin = annotee.showFullName)
     sym.getAnnotation(defn.DeprecatedAnnot) match
-      case Some(annot) => maybeWarn(sym, annot)
+      case Some(annot) => if !skipWarning(sym) then warn(sym, annot)
       case _ =>
         if sym.isAllOf(SyntheticMethod) then
           val companion = sym.owner.companionClass
-          if companion.is(CaseClass) then companion.getAnnotation(defn.DeprecatedAnnot).foreach(maybeWarn(companion, _))
+          if companion.is(CaseClass) then
+            for annot <- companion.getAnnotation(defn.DeprecatedAnnot) if !skipWarning(sym) do
+              warn(companion, annot)
 
   /** Decide whether the deprecation of `sym` should be ignored in this context.
    *

compiler/src/dotty/tools/dotc/util/Spans.scala

@@ -42,19 +42,19 @@ object Spans {
 
     /** The start of this span. */
     def start: Int = {
-      assert(exists)
+      assert(exists, "start of NoSpan")
       (coords & StartEndMask).toInt
     }
 
     /** The end of this span */
     def end: Int = {
-      assert(exists)
+      assert(exists, "end of NoSpan")
       ((coords >>> StartEndBits) & StartEndMask).toInt
     }
 
     /** The point of this span, returns start for synthetic spans */
     def point: Int = {
-      assert(exists)
+      assert(exists, "point of NoSpan")
       val poff = pointDelta
       if (poff == SyntheticPointDelta) start else start + poff
     }

tests/warn/i22795.check

@@ -0,0 +1,12 @@
+
+-- Deprecation Warning: tests/warn/i22795/test_1.scala:4:7 -------------------------------------------------------------
+4 |  lib.m() // warn
+  |  ^^^^^^^
+  |  object A is deprecated
+  |---------------------------------------------------------------------------------------------------------------------
+  |Inline stack trace
+  |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  |This location contains code that was inlined from test_1.scala:5
+5 |
+  | ^^^^^^^^
+   ---------------------------------------------------------------------------------------------------------------------

tests/warn/i22795/lib_0.scala

@@ -0,0 +1,11 @@
+
+import scala.quoted._
+
+@deprecated object A
+
+object lib:
+  inline def m() = ${mImpl}
+
+  def mImpl(using Quotes): Expr[Any] =
+    import quotes.reflect._
+    Ref(Symbol.classSymbol("A$").companionModule).asExpr

tests/warn/i22795/test_1.scala

@@ -0,0 +1,4 @@
+//> using options -deprecation
+
+@main def Test = println:
+  lib.m() // warn