static modifier supported for interface members

This commit is contained in:
Sergey Ignatov
2011-11-03 16:16:15 +04:00
parent e3575eb73c
commit 2debe4fe15
3 changed files with 12 additions and 7 deletions
-6
View File
@@ -19,12 +19,6 @@ public class Trait extends Class {
return false; return false;
} }
String bodyToKotlin() {
return AstUtil.joinNodes(myFields, N) + N +
AstUtil.joinNodes(methodsExceptConstructors(), N) + N +
AstUtil.joinNodes(myInnerClasses, N) + N;
}
@NotNull @NotNull
@Override @Override
public Kind getKind() { public Kind getKind() {
@@ -142,4 +142,11 @@ public class ClassTest extends JetTestCaseBase {
"class S { class object { var myI : Int = 10 } fun sB() : Boolean { return true } }" "class S { class object { var myI : Int = 10 } fun sB() : Boolean { return true } }"
); );
} }
public void testInnerStaticClass() throws Exception {
Assert.assertEquals(
classToSingleLineKotlin("final class S { static class Inner {} }"),
"class S { class object { open class Inner { } } }"
);
}
} }
@@ -36,9 +36,11 @@ public class TraitTest extends JetTestCaseBase {
"}" "}"
), ),
"trait INode {\n" + "trait INode {\n" +
"class object {\n" +
"public val IN : String? = \"in\"\n" + "public val IN : String? = \"in\"\n" +
"public val AT : String? = \"@\"\n" + "public val AT : String? = \"@\"\n" +
"public val COMMA_WITH_SPACE : String? = (COMMA + SPACE)\n" + "public val COMMA_WITH_SPACE : String? = (COMMA + SPACE)\n" +
"}\n" +
"}" "}"
); );
} }
@@ -82,9 +84,11 @@ public class TraitTest extends JetTestCaseBase {
"}" "}"
), ),
"public trait INode {\n" + "public trait INode {\n" +
"class object {\n" +
"public val IN : String? = \"in\"\n" + "public val IN : String? = \"in\"\n" +
"public val AT : String? = \"@\"\n" + "public val AT : String? = \"@\"\n" +
"public val COMMA_WITH_SPACE : String? = (COMMA + SPACE)\n" + "public val COMMA_WITH_SPACE : String? = (COMMA + SPACE)\n" +
"}\n" +
"}" "}"
); );
} }