Skip to content

Commit e7d3944

Browse files
olafurpgjulienrf
authored andcommitted
Upgrade to scalafix 0.5.0-M3.
1 parent e2f2425 commit e7d3944

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

build.sbt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
def scalafixVersion = _root_.scalafix.Versions.version
2-
// Use a scala version supported by scalafix.
3-
scalaVersion in ThisBuild := org.scalameta.BuildInfo.supportedScalaVersions.last
2+
inScope(Global)(
3+
List(
4+
scalaVersion := _root_.scalafix.Versions.scala212
5+
)
6+
)
47

58
lazy val root = project
69
.in(file("."))
@@ -11,7 +14,7 @@ lazy val rewrites = project.settings(
1114
)
1215

1316
lazy val input = project.settings(
14-
scalametaSourceroot := sourceDirectory.in(Compile).value
17+
scalafixSourceroot := sourceDirectory.in(Compile).value
1518
)
1619

1720
val collections = ProjectRef(file(".."), "collections")
@@ -24,7 +27,6 @@ lazy val output = project
2427
scalaBinaryVersion := scalaBinaryVersion.in(collections).value
2528
)
2629
.dependsOn(collections) // collections/publishLocal is still necessary.
27-
.disablePlugins(ScalahostSbtPlugin)
2830

2931
lazy val tests = project
3032
.settings(

input/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
/* ONLY
22
rewrite = "scala:fix.Collectionstrawman_v0"
3-
patches.moveSymbols = [
3+
patches.replaceSymbols = [
44
{ from = "scala.collection.immutable.HashMap",
55
to = "strawman.collection.immutable.HashMap" }
66
{ from = "scala.collection.immutable.Map",

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package fix
22

3-
import scala.{ List => _, Nil => _, Seq => _, Vector => _, :: => _, #:: => _ }
4-
import scala.Predef.{ Map => _, augmentString => _, intArrayOps => _, ArrowAssoc, charWrapper}
5-
import strawman.collection.{ stringToStringOps, arrayToArrayOps }
6-
import strawman.collection.immutable.{ LazyList, List, Map, Nil, Range, Seq, :: }
3+
import scala.{ Vector => _, #:: => _, :: => _, Seq => _, List => _ }
4+
import scala.Predef.{ Map => _ }
5+
import strawman.collection.immutable.{ HashMap, LazyList, List, Map, Nil, Vector }
76
import strawman.collection.immutable.LazyList.#::
8-
7+
import strawman.collection.mutable.ArrayBuffer
98
object Collectionstrawman_v0_List {
109
List(1, 2, 3)
1110
1 :: 2 :: 3 :: Nil

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.5.0-M1")
2-
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC6")
1+
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.5-SNAPSHOT")
2+
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC9")
33
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.6.1")
44

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@ case class Collectionstrawman_v0(mirror: Mirror) extends SemanticRewrite(mirror)
3030
}
3131

3232
def ifSymbolFound(ctx: RewriteCtx): Patch = {
33-
val toUnimport = ctx.mirror.database.names.flatMap {
34-
case (_, sym) =>
35-
val norm = normalize(sym)
33+
val toUnimport = ctx.mirror.database.names.flatMap { r =>
34+
val norm = normalize(r.sym)
3635
if (unimports.contains(norm)) norm :: Nil
3736
else Nil
3837
}
@@ -63,7 +62,6 @@ case class Collectionstrawman_v0(mirror: Mirror) extends SemanticRewrite(mirror)
6362
}
6463

6564
def rewrite(ctx: RewriteCtx): Patch = {
66-
ctx.debugMirror()
6765
ifSymbolFound(ctx)
6866
}
6967
}

tests/src/test/scala/fix/Collectionstrawman_Tests.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ package fix
22

33
import scala.meta._
44
import scalafix.testkit._
5+
import scalafix._
56

67
class Collectionstrawman_Tests
78
extends SemanticRewriteSuite(
8-
Database.load(Classpath(AbsolutePath(BuildInfo.inputClassdirectory))),
9+
SemanticCtx.load(Classpath(AbsolutePath(BuildInfo.inputClassdirectory))),
910
AbsolutePath(BuildInfo.inputSourceroot),
1011
Seq(AbsolutePath(BuildInfo.outputSourceroot))
1112
) {

0 commit comments

Comments
 (0)