Suppression matches inlined positions

The inlined stack includes the nonInlined pos itself,
which is filtered by rendering.

Author: som-snytt

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

@@ -30,11 +30,6 @@ trait MessageRendering {
   def stripColor(str: String): String =
     str.replaceAll("\u001b\\[.*?m", "")
 
-  /** List of all the inline calls that surround the position */
-  def inlinePosStack(pos: SourcePosition): List[SourcePosition] =
-    if pos.outer != null && pos.outer.exists then pos :: inlinePosStack(pos.outer)
-    else Nil
-
   /** Get the sourcelines before and after the position, as well as the offset
     * for rendering line numbers
     *
@@ -240,7 +235,7 @@ trait MessageRendering {
   def messageAndPos(dia: Diagnostic)(using Context): String = {
     import dia.*
     val pos1 = pos.nonInlined
-    val inlineStack = inlinePosStack(pos).filter(_ != pos1)
+    val inlineStack = pos.inlinePosStack.filter(_ != pos1)
     val maxLineNumber =
       if pos.exists then (pos1 :: inlineStack).map(_.endLine).max + 1
       else 0

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

@@ -150,7 +150,10 @@ class Suppression(val annotPos: SourcePosition, val filters: List[MessageFilter]
     _used = supersededState
   def matches(dia: Diagnostic): Boolean =
     val pos = dia.pos
-    pos.exists && start <= pos.start && pos.end <= end && filters.forall(_.matches(dia))
+    def posMatches =
+         start <= pos.start && pos.end <= end
+      || pos.inlinePosStack.exists(p => start <= p.start && p.end <= end)
+    pos.exists && posMatches && filters.forall(_.matches(dia))
 
   override def toString = s"Suppress in ${annotPos.source} $start..$end [${filters.mkString(", ")}]"
 end Suppression

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

@@ -11,7 +11,7 @@ import scala.annotation.internal.sharable
 
 /** A source position is comprised of a span and a source file */
 case class SourcePosition(source: SourceFile, span: Span, outer: SourcePosition = NoSourcePosition)
-extends SrcPos, interfaces.SourcePosition, Showable {
+extends SrcPos, interfaces.SourcePosition, Showable:
 
   def sourcePos(using Context) = this
 
@@ -82,7 +82,14 @@ extends SrcPos, interfaces.SourcePosition, Showable {
     s"${if (source.exists) source.file.toString else "(no source)"}:$span"
 
   def toText(printer: Printer): Text = printer.toText(this)
-}
+
+object SourcePosition:
+  extension (pos: SourcePosition)
+    /** List of all the inline calls that surround the position. */
+    def inlinePosStack: List[SourcePosition] =
+      if pos.outer != null && pos.outer.exists then pos :: pos.outer.inlinePosStack
+      else pos :: Nil
+end SourcePosition
 
 /** A sentinel for a non-existing source position */
 @sharable object NoSourcePosition extends SourcePosition(NoSource, NoSpan) {

tests/warn/i24082.scala

@@ -0,0 +1,13 @@
+//> using options -deprecation -Werror
+
+import annotation.*
+
+@deprecated
+case object A {
+  inline def use: Any = A
+}
+
+@nowarn
+object test {
+  A.use
+}