Skip to content

Commit 6f1256e

Browse files
olafurpgjulienrf
authored andcommitted
Move replaceSymbol from config to rewrite
1 parent e7d3944 commit 6f1256e

File tree

3 files changed

+25
-36
lines changed

3 files changed

+25
-36
lines changed

input/src/main/scala/fix/Collectionstrawman_v0.scala

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,6 @@
11
/* ONLY
22
rewrite = "scala:fix.Collectionstrawman_v0"
33
patches.replaceSymbols = [
4-
{ from = "scala.collection.immutable.HashMap",
5-
to = "strawman.collection.immutable.HashMap" }
6-
{ from = "scala.collection.immutable.Map",
7-
to = "strawman.collection.immutable.Map" }
8-
{ from = "scala.Predef.Map",
9-
to = "strawman.collection.immutable.Map" }
10-
{ from = "scala.collection.immutable.List",
11-
to = "strawman.collection.immutable.List" }
12-
{ from = "scala.collection.immutable.Nil",
13-
to = "strawman.collection.immutable.Nil" }
14-
{ from = "scala.package.Stream",
15-
to = "strawman.collection.immutable.LazyList" }
16-
{ from = "scala.package.`#::`",
17-
to = "strawman.collection.immutable.LazyList.`#::`" }
18-
{ from = "scala.package.Vector",
19-
to = "strawman.collection.immutable.Vector" }
20-
{ from = "scala.collection.mutable.ArrayBuffer",
21-
to = "strawman.collection.mutable.ArrayBuffer" }
224
]
235
*/
246
package fix

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.{ Vector => _, #:: => _, :: => _, Seq => _, List => _ }
3+
import scala.{ #:: => _, :: => _, List => _, Seq => _, Vector => _ }
44
import scala.Predef.{ Map => _ }
55
import strawman.collection.immutable.{ HashMap, LazyList, List, Map, Nil, Vector }
66
import strawman.collection.immutable.LazyList.#::

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

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import scalafix.syntax._
66
import scalafix.internal.util.SymbolOps
77
import scala.meta._
88

9-
case class Collectionstrawman_v0(mirror: Mirror) extends SemanticRewrite(mirror) {
9+
case class Collectionstrawman_v0(mirror: SemanticCtx) extends SemanticRewrite(mirror) {
1010
val immutableListSymbol = Symbol("_root_.scala.collection.immutable.List.")
1111
val unimports = Set(
1212
Symbol("_root_.scala.List."),
@@ -31,9 +31,9 @@ case class Collectionstrawman_v0(mirror: Mirror) extends SemanticRewrite(mirror)
3131

3232
def ifSymbolFound(ctx: RewriteCtx): Patch = {
3333
val toUnimport = ctx.mirror.database.names.flatMap { r =>
34-
val norm = normalize(r.sym)
35-
if (unimports.contains(norm)) norm :: Nil
36-
else Nil
34+
val norm = normalize(r.sym)
35+
if (unimports.contains(norm)) norm :: Nil
36+
else Nil
3737
}
3838
val unimportss = toUnimport.toList.distinct.flatMap { sym =>
3939
SymbolOps.toImporter(sym).toList.collect {
@@ -49,19 +49,26 @@ case class Collectionstrawman_v0(mirror: Mirror) extends SemanticRewrite(mirror)
4949
grouped.map(ctx.addGlobalImport(_)).asPatch
5050
}
5151

52-
// def isSymbol(tree: Tree, symbol: Symbol): Boolean = {
53-
// mirror.database.names.get(tree.pos).exists(normalize(_) == symbol)
54-
// }
55-
56-
def rangePatch(ctx: RewriteCtx): Patch = {
57-
// ctx.tree.collect {
58-
// case q"$lhs $op $rhs" if isSymbol(op, Symbol()) =>
59-
// op
60-
// }
61-
Patch.empty
62-
}
63-
6452
def rewrite(ctx: RewriteCtx): Patch = {
65-
ifSymbolFound(ctx)
53+
ifSymbolFound(ctx) + ctx.replaceSymbols(
54+
"scala.collection.immutable.HashMap" ->
55+
"strawman.collection.immutable.HashMap",
56+
"scala.collection.immutable.Map" ->
57+
"strawman.collection.immutable.Map",
58+
"scala.Predef.Map" ->
59+
"strawman.collection.immutable.Map",
60+
"scala.collection.immutable.List" ->
61+
"strawman.collection.immutable.List",
62+
"scala.collection.immutable.Nil" ->
63+
"strawman.collection.immutable.Nil",
64+
"scala.package.Stream" ->
65+
"strawman.collection.immutable.LazyList",
66+
"scala.package.`#::`" ->
67+
"strawman.collection.immutable.LazyList.`#::`",
68+
"scala.package.Vector" ->
69+
"strawman.collection.immutable.Vector",
70+
"scala.collection.mutable.ArrayBuffer" ->
71+
"strawman.collection.mutable.ArrayBuffer"
72+
)
6673
}
6774
}

0 commit comments

Comments
 (0)