Skip to content

Commit 8641796

Browse files
authored
Merge pull request #190 from olafurpg/189
Handle Importee.Rename in RemoveUnusedImports, fixes #189
2 parents d387560 + a256002 commit 8641796

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

scalafix-core/src/main/scala/scalafix/rewrite/RemoveUnusedImports.scala

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@ case class RemoveUnusedImports(mirror: Mirror)
1111
case Message(pos, _, "Unused import") =>
1212
pos
1313
}.toSet
14-
private def isUnused(importee: Importee) = importee match {
15-
// NOTE: workaround for https://github.com/scalameta/scalameta/issues/899
16-
case Importee.Wildcard() =>
17-
val lookupPos =
14+
private def isUnused(importee: Importee) = {
15+
val pos = importee match {
16+
// NOTE: workaround for https://github.com/scalameta/scalameta/issues/899
17+
case Importee.Wildcard() =>
1818
importee.parents
1919
.collectFirst { case x: Import => x.pos }
2020
.getOrElse(importee.pos)
21-
unusedImports.contains(lookupPos)
22-
case _ => unusedImports.contains(importee.pos)
21+
case Importee.Rename(name, _) => name.pos
22+
case _ => importee.pos
23+
}
24+
unusedImports.contains(pos)
2325
}
2426
override def rewrite(ctx: RewriteCtx): Patch =
2527
ctx.tree.collect {

scalafix-tests/input/src/main/scala/test/RemoveUnusedImports.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import scala.util.control.{NonFatal, Breaks}
88
import scala.concurrent.{Await, Future}
99
import scala.util.{Properties, DynamicVariable, Try}
1010
import scala.util.{Success => Successful, Random}
11+
import scala.collection.mutable.{Set MutableSet, Map MutableMap}
12+
import scala.collection.mutable.{Seq => MutableSeq}
1113
import scala.sys.process._
1214
import scala.concurrent.{CancellationException, ExecutionException, ExecutionContext}
1315
import scala.runtime.{RichBoolean}

0 commit comments

Comments
 (0)