Skip to content

Commit 507bbff

Browse files
committed
Fix for top-level Status object
1 parent 59212c6 commit 507bbff

File tree

7 files changed

+21
-16
lines changed

7 files changed

+21
-16
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ trait BasicTransform { this: TransformCake ⇒
1818

1919
def newTransformUnit(unit: CompilationUnit): Unit = {
2020
superTransformUnit(unit)
21-
for (c flatten(classes).flatMap(liftInterface)) {
21+
for (c flatten(classes.flatMap(liftInterface))) {
2222
val out = file(c.file)
2323
try {
2424
if (c.pckg != "<empty>") out.println(s"package ${c.pckg};")

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,10 @@ trait Output { this: TransformCake ⇒
6969
case Some(nestedInterface: ClassInfo) =>
7070
Seq(
7171
c.copy(members = c.classMembers.filterNot(_ == nestedInterface).flatMap(liftInterface) ++ c.methodMembers),
72-
nestedInterface.copy(name = s"${nestedInterface.name}$$${nestedInterface.name}")
72+
nestedInterface.copy(
73+
name = s"${nestedInterface.name}$$${nestedInterface.name}",
74+
static = false
75+
)
7376
)
7477
case _ =>
7578
Seq(c.copy(members = c.classMembers.flatMap(liftInterface) ++ c.methodMembers))

plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/Actor.java

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package akka.rk.buh.is.it;
2+
public class Status$ {
3+
/**
4+
* Static reference to the singleton instance of this Scala object.
5+
*/
6+
public static final Status$ MODULE$ = null;
7+
public Status$ () { throw new RuntimeException(); }
8+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package akka.rk.buh.is.it;
2+
public interface Status$Status extends scala.Serializable {
3+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package akka.rk.buh.is.it;
2+
public class Status {
3+
}

plugin/src/test/resources/input/basic/test.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@ package buh.is.it
88
import scala.annotation.varargs
99
import scala.concurrent.duration.FiniteDuration
1010

11-
class Actor {
12-
object Status {
13-
sealed trait Status extends Serializable
14-
}
11+
object Status {
12+
sealed trait Status extends Serializable
1513
}
1614

1715
/**

0 commit comments

Comments
 (0)