Skip to content

Commit 3311594

Browse files
committed
Unimport both augmentString+wrapString if either appears.
1 parent e2fa336 commit 3311594

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

output/src/main/scala/fix/Collectionstrawman_v0.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package fix
22

3-
import scala.Predef.{augmentString => _, intArrayOps => _, wrapString => _, _}
3+
import scala.Predef.{ augmentString => _, intArrayOps => _, wrapString => _, _ }
44
import strawman.collection.{ Iterable, Set, arrayToArrayOps, stringToStringOps }
55
import strawman.collection.immutable.{ ::, HashMap, LazyList, List, Map, Nil, Range, Vector }
66
import strawman.collection.immutable.LazyList.#::

rewrites/src/main/scala/fix/Collectionstrawman_v0.scala

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,24 @@ case class Collectionstrawman_v0(sctx: SemanticCtx)
2121
Symbol("_root_.strawman.collection.arrayToArrayOps.")
2222
)
2323

24+
val additionalUnimports = Map(
25+
"augmentString" -> "wrapString",
26+
"wrapString" -> "augmentString"
27+
)
28+
2429
def ifSymbolFound(ctx: RewriteCtx): Patch = {
2530
val toImport = for {
2631
r <- ctx.semanticCtx.names
2732
in = r.sym.normalized
2833
out <- unimports.get(in).toList
2934
} yield {
35+
val name = in.name
36+
val names = name :: additionalUnimports
37+
.get(name)
38+
.fold(List.empty[String])(_ :: Nil)
3039
ctx.addGlobalImport(out) +
3140
ctx.addGlobalImport(
32-
Importer(q"scala.Predef", Importee.Unimport(Name(in.name)) :: Nil))
41+
Importer(q"scala.Predef", names.map(n => Importee.Unimport(Name(n)))))
3342
}
3443
val predefUnderscore =
3544
if (toImport.isEmpty) Patch.empty

0 commit comments

Comments
 (0)