Skip to content

Commit

Permalink
Squashed commits: scalafix-cli3 cross compiled for scala3
Browse files Browse the repository at this point in the history
This is the commit message scalacenter#2:

build dbt cli
  • Loading branch information
rvacaru committed Aug 12, 2022
1 parent b32bb67 commit ca100b1
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 4 deletions.
11 changes: 8 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,18 @@ lazy val cli = projectMatrix
moduleName := "scalafix-cli",
isFullCrossVersion,
libraryDependencies ++= Seq(
java8Compat,
nailgunServer,
jgit,
commonText
),
libraryDependencies ++= {
if (isScala211.value) Seq()
if (!isScala3.value)
Seq(java8Compat)
else
Seq()
},
libraryDependencies ++= {
if (isScala211.value || isScala3.value) Seq()
else
Seq(
// metaconfig 0.10.0 shaded pprint but rules built with an old
Expand All @@ -158,7 +163,7 @@ lazy val cli = projectMatrix
}.value
)
.defaultAxes(VirtualAxis.jvm)
.jvmPlatform(buildScalaVersions)
.jvmPlatform(buildScalaVersions :+ scala3)
.dependsOn(reflect, interfaces, rules)

lazy val testsShared = projectMatrix
Expand Down
1 change: 1 addition & 0 deletions project/ScalafixBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
"core3/compile" ::
"rules3/compile" ::
"reflect3/compile" ::
"cli3/compile" :: // TODO replace core rules and reflect with unit3 in the end
s
},
commands += Command.command("ci-213") { s =>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package scalafix.internal.v1

import java.nio.file.PathMatcher

import scala.meta.io.AbsolutePath

import metaconfig.Conf
import metaconfig.pprint._
import scalafix.internal.config.ScalafixConfig

class TPrintImplicits {
implicit val absolutePathPrint: TPrint[AbsolutePath] =
new TPrint[AbsolutePath] {
def render(implicit tpc: TPrintColors): fansi.Str = fansi.Str("<path>")
}

implicit val pathMatcherPrint: TPrint[PathMatcher] =
new TPrint[PathMatcher] {
def render(implicit tpc: TPrintColors): fansi.Str = fansi.Str("<glob>")
}

implicit val confPrint: TPrint[Conf] =
new TPrint[Conf] {
def render(implicit tpc: TPrintColors): fansi.Str =
TPrint.implicitly[ScalafixConfig].render
}

implicit def optionPrint[T](implicit ev: TPrint[T]): TPrint[Option[T]] =
new TPrint[Option[T]] {
def render(implicit tpc: TPrintColors): fansi.Str = ev.render
}

implicit def iterablePrint[C[x] <: Iterable[x], T](implicit
ev: TPrint[T]
): TPrint[C[T]] =
new TPrint[C[T]] {
def render(implicit tpc: TPrintColors): fansi.Str = s"[${ev.render} ...]"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ object ScalafixFileEvaluationImpl {
ctx: RuleCtx,
index: Option[v0.SemanticdbIndex]
): ScalafixFileEvaluationImpl = {
val scalafixPatches = patches.map(ScalafixPatchImpl)
val scalafixPatches = patches.map(ScalafixPatchImpl.apply)
ScalafixFileEvaluationImpl(
originalPath = originalPath,
fixedOpt = fixed,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import java.util.Optional
import scala.{meta => m}

import scala.meta.inputs.Input
import scala.meta.internal.inputs.XtensionInputSyntaxStructure

import scalafix.interfaces.ScalafixInput

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import scala.util.control.NoStackTrace
import scala.util.control.NonFatal

import scala.meta.inputs.Input
import scala.meta.internal.inputs.XtensionInputSyntaxStructure
import scala.meta.internal.semanticdb.TextDocument
import scala.meta.io.AbsolutePath
import scala.meta.parsers.ParseException
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package scalafix.internal.v1
import scala.meta.AbsolutePath
import scala.meta.Input
import scala.meta.Source
import scala.meta.internal.inputs.XtensionInputSyntaxStructure
import scala.meta.internal.io.FileIO
import scala.meta.internal.symtab.SymbolTable
import scala.meta.io.RelativePath
Expand Down

0 comments on commit ca100b1

Please sign in to comment.