Skip to content

Commit efa85ee

Browse files
authored
Merge pull request #809 from olafurpg/apis
Second steps towards scalafix.v1
2 parents 1d9d610 + 87c3276 commit efa85ee

File tree

124 files changed

+2011
-1846
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+2011
-1846
lines changed

build.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ lazy val core = project
3838
libraryDependencies ++= List(
3939
scalameta,
4040
symtab,
41+
metap,
4142
googleDiff,
4243
"com.geirsson" %% "metaconfig-typesafe-config" % metaconfigV,
4344
"org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided

docs/rule-authors/setup.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ scalafix-testkit features include:
5656

5757
- Assert that a linter error is expected at a particular line by suffixing the
5858
line with the comment `// assert: <LintCategory>`. For an example, see the
59-
NoInfer test suite:
59+
Disable test suite:
6060

6161
```scala
62-
val x = List(1, "")// assert: NoInfer.any
62+
val x = List(1, "")// assert: Disable.Any
6363
```
6464

6565
It's also possible to assert the offset position and the message contents with a

docs/rules/DisableUnless.md

Lines changed: 0 additions & 49 deletions
This file was deleted.

docs/rules/ExplicitUnit.md

Lines changed: 0 additions & 23 deletions
This file was deleted.

docs/rules/NoFinalize.md

Lines changed: 0 additions & 20 deletions
This file was deleted.

docs/rules/NoInfer.md

Lines changed: 0 additions & 38 deletions
This file was deleted.

docs/rules/RemoveXmlLiterals.md

Lines changed: 0 additions & 30 deletions
This file was deleted.

docs/users/configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ foo(null)
174174
```
175175

176176
```scala
177-
List(1, "") // scalafix:ok NoInfer.any
177+
List(1, "") // scalafix:ok Disable.Any
178178
```
179179

180180
Optionally, you can include an arbitrary description at the end of any

project/Dependencies.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import sbt._
22
/* scalafmt: { maxColumn = 120 }*/
33

44
object Dependencies {
5-
val scalametaV = "4.0.0-M8"
5+
val scalametaV = "4.0.0-M10"
66
val metaconfigV = "0.8.3"
77
def dotty = "0.9.0-RC1"
88
def scala210 = "2.10.6"
@@ -25,13 +25,14 @@ object Dependencies {
2525
def semanticdbPluginLibrary = "org.scalameta" % "semanticdb-scalac-core" % scalametaV cross CrossVersion.full
2626
def scalameta = "org.scalameta" %% "contrib" % scalametaV
2727
def symtab = "org.scalameta" %% "symtab" % scalametaV
28+
def metap = "org.scalameta" %% "metap" % scalametaV
2829
def scalatest = "org.scalatest" %% "scalatest" % "3.2.0-SNAP10"
2930
def scalacheck = "org.scalacheck" %% "scalacheck" % "1.14.0"
3031

3132
def testsDeps = List(
3233
// integration property tests
3334
"com.geirsson" %% "coursier-small" % "1.0.0-M4",
34-
"org.renucci" %% "scala-xml-quote" % "0.1.4",
35+
"org.scala-lang.modules" %% "scala-xml" % "1.1.0",
3536
"org.typelevel" %% "catalysts-platform" % "0.0.5",
3637
"org.typelevel" %% "cats-core" % "0.9.0",
3738
"com.typesafe.slick" %% "slick" % "3.2.0-M2",

project/ScalafixBuild.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
6161
)
6262

6363
lazy val testsInputOutputSetting = Seq(
64-
// TODO: Remove once scala-xml-quote is merged into scala-xml
65-
resolvers += Resolver.bintrayRepo("allanrenucci", "maven"),
6664
libraryDependencies ++= testsDeps
6765
)
6866

0 commit comments

Comments
 (0)