@@ -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 }
@@ -555,29 +555,15 @@ object CheckUnused:
555555
556556 def reportUnused ()(using Context ): Unit = if ! refInfos.isNullified then
557557 for (msg, pos, origin) <- warnings do
558- if origin.isEmpty then report.warning(msg, pos)
559- else report.warning(msg, pos, origin)
560- // avoid rewrite if warning will be suppressed (would be nice if reporter knew how to apply actions)
561- msg.actions.headOption match
562- case Some (action) if ctx.run != null =>
563- val dia =
564- if origin.isEmpty then Diagnostic .Warning (msg, pos.sourcePos)
565- else Diagnostic .LintWarning (msg, pos.sourcePos, origin)
566- ctx.run.nn.suppressions.nowarnAction(dia) match
567- case Action .Warning =>
568- WConf .parsed.action(dia) match
569- case Action .Error | Action .Warning =>
570- Rewrites .applyAction(action)
571- case _ =>
572- case _ =>
573- case _ =>
558+ report.warning(msg, pos, origin)
574559
575560 type MessageInfo = (UnusedSymbol , SrcPos , String ) // string is origin or empty
576561
577562 def warnings (using Context ): Array [MessageInfo ] =
578563 val actionable = ctx.settings.rewrite.value.nonEmpty
579564 val warnings = ArrayBuilder .make[MessageInfo ]
580- def warnAt (pos : SrcPos )(msg : UnusedSymbol , origin : String = " " ): Unit = warnings.addOne((msg, pos, origin))
565+ def warnAt (pos : SrcPos )(msg : UnusedSymbol , origin : String = Diagnostic .OriginWarning .NoOrigin ): Unit =
566+ warnings.addOne((msg, pos, origin))
581567 val infos = refInfos
582568
583569 // non-local sym was target of assignment or has a sibling setter that was referenced
@@ -740,7 +726,6 @@ object CheckUnused:
740726
741727 def checkImports () =
742728 import scala .jdk .CollectionConverters .given
743- import Rewrites .ActionPatch
744729 type ImpSel = (Import , ImportSelector )
745730 def isUsed (sel : ImportSelector ): Boolean = infos.sels.containsKey(sel)
746731 def warnImport (warnable : ImpSel , actions : List [CodeAction ] = Nil ): Unit =
0 commit comments