Skip to content

Commit 31ef32e

Browse files
committed
Tidy up
1 parent 84ff47e commit 31ef32e

File tree

3 files changed

+11
-18
lines changed

3 files changed

+11
-18
lines changed

build.sbt

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
1+
import _root_.scalafix.sbt.BuildInfo.scalafixVersion
12
import scalatex.ScalatexReadme
23

34
ThisBuild / shellPrompt := ((s: State) => Project.extract(s).currentRef.project + "> ")
45

6+
lazy val scalafixRules = project
7+
.in(file("scalafix"))
8+
.settings(
9+
libraryDependencies += "ch.epfl.scala" %% "scalafix-core" % scalafixVersion,
10+
)
11+
512
lazy val root = project
613
.in(file("."))
714
.enablePlugins(ScalaJSPlugin)
@@ -15,8 +22,7 @@ ThisBuild / crossScalaVersions := {
1522
if (scalaJSVersion.startsWith("1.")) Seq("2.12.10", "2.11.12", "2.13.1")
1623
else Seq("2.12.10", "2.11.12", "2.10.7", "2.13.1")
1724
}
18-
// ThisBuild / scalaVersion := crossScalaVersions.value.head
19-
ThisBuild / scalaVersion := "2.13.1"
25+
ThisBuild / scalaVersion := crossScalaVersions.value.head
2026

2127
val commonSettings = Seq(
2228
organization := "org.scala-js",
@@ -117,13 +123,3 @@ lazy val example = project.
117123
settings(commonSettings: _*).
118124
settings(noPublishSettings: _*).
119125
dependsOn(root)
120-
121-
122-
import _root_.scalafix.sbt.BuildInfo.scalafixVersion
123-
124-
lazy val scalafixRules = project
125-
.in(file("scalafix"))
126-
.enablePlugins(ScalaJSPlugin)
127-
.settings(
128-
libraryDependencies += "ch.epfl.scala" %% "scalafix-core" % scalafixVersion,
129-
)

scalafix.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ThisBuild / semanticdbEnabled := true
2-
ThisBuild / semanticdbVersion := "4.4.26"
2+
ThisBuild / semanticdbVersion := "4.4.27"
33
ThisBuild / scalafixScalaBinaryVersion := CrossVersion.binaryScalaVersion(scalaVersion.value)
44

55
ThisBuild / scalacOptions ++= {

scalafix/src/main/scala/org/scalajs/dom/scalafix/GenerateApiReport.scala

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ class GenerateApiReport extends SemanticRule("GenerateApiReport") {
1515
override def fix(implicit doc: SemanticDocument): Patch = {
1616

1717
doc.tree.traverse {
18-
// case a: Defn.Object if a.name.value.contains("AesCbcParams") => process(a.symbol, a.templ, ScopeType.Object)
19-
2018
case a: Defn.Class => process(a.symbol, a.templ, ScopeType.Class)
2119
case a: Defn.Object => process(a.symbol, a.templ, ScopeType.Object)
2220
case a: Defn.Trait => process(a.symbol, a.templ, ScopeType.Trait)
@@ -28,7 +26,7 @@ class GenerateApiReport extends SemanticRule("GenerateApiReport") {
2826
}
2927

3028
private def process(sym: Symbol, body: Template, typ: ScopeType)(implicit doc: SemanticDocument): Unit = {
31-
// Skip non-public API
29+
// Skip non-public scopes
3230
if (!sym.info.get.isPublic)
3331
return
3432

@@ -38,8 +36,7 @@ class GenerateApiReport extends SemanticRule("GenerateApiReport") {
3836
val s = state.register(sym, isJsType, typ, domParents)
3937

4038
def letsSeeHowLazyWeCanBeLol(t: Tree): Unit = {
41-
42-
// Skip non-public API
39+
// Skip non-public members
4340
if (!t.symbol.info.get.isPublic)
4441
return
4542

0 commit comments

Comments
 (0)