diff --git a/admin/build.sh b/admin/build.sh index 52a555dd..6e47dfea 100755 --- a/admin/build.sh +++ b/admin/build.sh @@ -62,4 +62,4 @@ if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then fi fi -sbt -Dhttps.protocols=TLSv1.2 -sbt-dir=/home/travis/.sbt ";$crossScalaVersion ;$publishVersion ;$projectPrefix/clean ;$testProjectPrefix/test ;$projectPrefix/publishLocal ;$publishTask" +sbt -Dhttps.protocols=TLSv1.2 ";$crossScalaVersion ;$publishVersion ;$projectPrefix/clean ;$testProjectPrefix/test ;$projectPrefix/publishLocal ;$publishTask" diff --git a/scalafix/input/src/main/scala/fix/TraversableSrc.scala b/scalafix/input/src/main/scala/fix/TraversableSrc.scala index 05b17f06..f46eb9d6 100644 --- a/scalafix/input/src/main/scala/fix/TraversableSrc.scala +++ b/scalafix/input/src/main/scala/fix/TraversableSrc.scala @@ -10,4 +10,9 @@ object TraversableSrc { xs.toIterator ys.iterator } + + def m1(xs: Traversable[Int]): List[Int] = + xs.to + + def m2(xs: Traversable[Int]): List[Int] = xs.to } diff --git a/scalafix/output212/src/main/scala/fix/TraversableSrc.scala b/scalafix/output212/src/main/scala/fix/TraversableSrc.scala index 450c049f..bbb7bc0c 100644 --- a/scalafix/output212/src/main/scala/fix/TraversableSrc.scala +++ b/scalafix/output212/src/main/scala/fix/TraversableSrc.scala @@ -11,4 +11,9 @@ object TraversableSrc { xs.iterator ys.iterator } + + def m1(xs: Iterable[Int]): List[Int] = + xs.to + + def m2(xs: Iterable[Int]): List[Int] = xs.to } diff --git a/scalafix/rules/src/main/scala/fix/Stable212Base.scala b/scalafix/rules/src/main/scala/fix/Stable212Base.scala index a2993c41..f773f91d 100644 --- a/scalafix/rules/src/main/scala/fix/Stable212Base.scala +++ b/scalafix/rules/src/main/scala/fix/Stable212Base.scala @@ -190,7 +190,7 @@ trait Stable212Base extends CrossCompatibility { self: SemanticRule => case iterator(t: Name) => ctx.replaceTree(t, "iterator") - case t @ toTpe(n: Name) if !handledTo.contains(n) => + case Term.ApplyType(Term.Select(_, t @ toTpe(n: Name)), _) if !handledTo.contains(n) => trailingBrackets(n, ctx).map { case (open, close) => ctx.replaceToken(open, "(") + ctx.replaceToken(close, ")") }.asPatch