Skip to content

Commit 8c9097f

Browse files
Fix broken scalafix tests
1 parent f059ccb commit 8c9097f

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
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 => _, genericArrayOps => _, genericWrapArray => _, intArrayOps => _, wrapIntArray => _, wrapString => _, _ }
3+
import scala.Predef.{ augmentString => _, genericArrayOps => _, intArrayOps => _, wrapString => _, _ }
44
import strawman.collection.{ 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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ case class Collectionstrawman_v0(sctx: SemanticCtx)
2323

2424
val additionalUnimports = Map(
2525
"augmentString" -> "wrapString",
26-
"wrapString" -> "augmentString"
26+
"wrapString" -> "augmentString",
27+
"intArrayOps" -> "genericArrayOps"
2728
)
2829

2930
def replaceExtensionMethods(ctx: RewriteCtx): Patch = {
@@ -33,8 +34,7 @@ case class Collectionstrawman_v0(sctx: SemanticCtx)
3334
out <- unimports.get(in).toList
3435
} yield {
3536
val name = in.name
36-
val names = name :: additionalUnimports
37-
.get(name)
37+
val names = name :: additionalUnimports.get(name)
3838
.fold(List.empty[String])(_ :: Nil)
3939
ctx.addGlobalImport(out) +
4040
ctx.addGlobalImport(
@@ -94,7 +94,6 @@ case class Collectionstrawman_v0(sctx: SemanticCtx)
9494
s("Traversable", Some("Iterable")),
9595
"scala.Iterable" -> "strawman.collection.Iterable",
9696
"scala.Traversable" -> "strawman.collection.Iterable",
97-
"scala.collection.TraversableLike.toIterator" -> "iterator",
9897
"scala.`#::`" -> "strawman.collection.immutable.LazyList.`#::`",
9998
s("Vector"),
10099
i("Vector"),
@@ -126,13 +125,14 @@ case class Collectionstrawman_v0(sctx: SemanticCtx)
126125
Symbol("_root_.scala.collection.TraversableLike.to.")
127126
)
128127
val iterator = SymbolMatcher(
129-
Symbol("_root_.scala.collection.LinearSeqLike.iterator.")
128+
Symbol("_root_.scala.collection.LinearSeqLike.iterator."),
129+
Symbol("_root_.scala.collection.TraversableLike.toIterator.")
130130
)
131131

132132
def replaceToList(ctx: RewriteCtx) =
133133
ctx.tree.collect {
134134
case iterator(n: Name, _) =>
135-
ctx.addRight(n.tokens.last, "()")
135+
ctx.replaceTree(n, "iterator()")
136136
case toImmutableX(n: Name, s) =>
137137
ctx.replaceTree(n, s"to(strawman.collection.immutable.${s.name.stripPrefix("to")})")
138138
case toGenericX(n: Name, s) =>

0 commit comments

Comments
 (0)