Skip to content

Commit 464ca50

Browse files
committed
enable -Xfatal-warnings
1 parent d1278fb commit 464ca50

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

build.sbt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ lazy val `genjavadoc-plugin` = (project in file("plugin"))
4242
else default
4343
},
4444
crossVersion := CrossVersion.full,
45-
exportJars := true
45+
exportJars := true,
46+
scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked", "-Xfatal-warnings")
4647
)
4748

4849
lazy val defaults = Seq(

plugin/src/main/scala/com/typesafe/genjavadoc/AST.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ trait AST { this: TransformCake ⇒
7777

7878
def fabricateParams: Boolean
7979

80-
final case class DeprecationInfo(msg: String, since: String) {
80+
case class DeprecationInfo(msg: String, since: String) {
8181
def maybeDot = if (msg.endsWith(".")) " " else ". "
8282
def maybeSinceDot = if (since.endsWith(".")) " " else ". "
8383
def render = s" * @deprecated ${msg}${maybeDot}Since $since${maybeSinceDot}"

plugin/src/main/scala/com/typesafe/genjavadoc/BaseComments.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ trait BaseComments { this: TransformCake ⇒
7373

7474
implicit val positionOrdering: Ordering[Position] = new Ordering[Position] {
7575
def compare(a: Position, b: Position) =
76-
if (a.endOrPoint < b.startOrPoint) -1
77-
else if (a.startOrPoint > b.endOrPoint) 1
76+
if (a.end < b.start) -1
77+
else if (a.start > b.end) 1
7878
else 0
7979
}
8080
var comments = TreeMap[Position, Comment]()
@@ -86,7 +86,7 @@ trait BaseComments { this: TransformCake ⇒
8686

8787
val positions = comments.keySet
8888

89-
def between(p1: Position, p2: Position) = unit.source.content.slice(p1.startOrPoint, p2.startOrPoint).filterNot(_ == '\n').mkString
89+
def between(p1: Position, p2: Position) = unit.source.content.slice(p1.start, p2.start).filterNot(_ == '\n').mkString
9090

9191
object ScalaDoc extends (Comment Boolean) {
9292
def apply(c: Comment): Boolean = c.text.head.startsWith("/**")

plugin/src/main/scala/com/typesafe/genjavadoc/BasicTransform.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ trait BasicTransform { this: TransformCake ⇒
5252
val old = pos
5353
pos = max(tp, prevTemplateMaxPos)
5454
if (old.precedes(pos)) {
55-
(positions.from(old) intersect positions.to(pos)).toSeq map comments filter ScalaDoc lastOption match {
55+
(positions.from(old) intersect positions.to(pos)).toSeq.map(comments).filter(ScalaDoc).lastOption match {
5656
case Some(c) c.text // :+ s"// found in '${between(old, pos)}'"
5757
case None
5858
// s"// empty '${between(old, pos)}' (${pos.lineContent}:${pos.column})" ::

plugin/src/main/scala/com/typesafe/genjavadoc/JavaSig.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ trait JavaSig { this: TransformCake ⇒
1212
def removeThis(in: Type): Type = {
1313
// println("transforming " + in)
1414
in match {
15-
case ThisType(parent) if !parent.isPackage removeThis(parent.tpe)
16-
case SingleType(parent, name) typeRef(removeThis(parent), name, Nil)
17-
case TypeRef(pre, sym, args) typeRef(removeThis(pre), sym, args)
18-
case x x
15+
case ThisType(parent) if !parent.hasPackageFlag removeThis(parent.tpe)
16+
case SingleType(parent, name) typeRef(removeThis(parent), name, Nil)
17+
case TypeRef(pre, sym, args) typeRef(removeThis(pre), sym, args)
18+
case x x
1919
}
2020
}
2121

0 commit comments

Comments
 (0)