@@ -11,8 +11,8 @@ import Scopes.newScope
1111import StdNames .nme
1212import Symbols .{ClassSymbol , NoSymbol , Symbol , defn , isDeprecated , requiredClass , requiredModule }
1313import Types .*
14- import reporting .{Action , CodeAction , Diagnostic , UnusedSymbol , WConf }
15- import rewrites .Rewrites
14+ import reporting .{CodeAction , Diagnostic , UnusedSymbol }
15+ import rewrites .Rewrites . ActionPatch
1616
1717import MegaPhase .MiniPhase
1818import typer .{ImportInfo , Typer }
@@ -549,29 +549,15 @@ object CheckUnused:
549549
550550 def reportUnused ()(using Context ): Unit =
551551 for (msg, pos, origin) <- warnings do
552- if origin.isEmpty then report.warning(msg, pos)
553- else report.warning(msg, pos, origin)
554- // avoid rewrite if warning will be suppressed (would be nice if reporter knew how to apply actions)
555- msg.actions.headOption match
556- case Some (action) if ctx.run != null =>
557- val dia =
558- if origin.isEmpty then Diagnostic .Warning (msg, pos.sourcePos)
559- else Diagnostic .LintWarning (msg, pos.sourcePos, origin)
560- ctx.run.nn.suppressions.nowarnAction(dia) match
561- case Action .Warning =>
562- WConf .parsed.action(dia) match
563- case Action .Error | Action .Warning =>
564- Rewrites .applyAction(action)
565- case _ =>
566- case _ =>
567- case _ =>
552+ report.warning(msg, pos, origin)
568553
569554 type MessageInfo = (UnusedSymbol , SrcPos , String ) // string is origin or empty
570555
571556 def warnings (using Context ): Array [MessageInfo ] =
572557 val actionable = ctx.settings.rewrite.value.nonEmpty
573558 val warnings = ArrayBuilder .make[MessageInfo ]
574- def warnAt (pos : SrcPos )(msg : UnusedSymbol , origin : String = " " ): Unit = warnings.addOne((msg, pos, origin))
559+ def warnAt (pos : SrcPos )(msg : UnusedSymbol , origin : String = Diagnostic .OriginWarning .NoOrigin ): Unit =
560+ warnings.addOne((msg, pos, origin))
575561 val infos = refInfos
576562
577563 // non-local sym was target of assignment or has a sibling setter that was referenced
@@ -734,7 +720,6 @@ object CheckUnused:
734720
735721 def checkImports () =
736722 import scala .jdk .CollectionConverters .given
737- import Rewrites .ActionPatch
738723 type ImpSel = (Import , ImportSelector )
739724 def isUsed (sel : ImportSelector ): Boolean = infos.sels.containsKey(sel)
740725 def warnImport (warnable : ImpSel , actions : List [CodeAction ] = Nil ): Unit =
0 commit comments