azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kotlin does not support static nested classes so far

Browse Source
This commit is contained in:
Andrey Breslav
2013-01-15 18:20:33 +04:00
parent a23a255ec1
commit 4549ad0a5e
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java
+4 -6
View File
@@ -305,12 +305,10 @@ public class KotlinLightClassForExplicitDeclaration extends AbstractLightClass i
psiModifiers.add(PsiModifier.FINAL); psiModifiers.add(PsiModifier.FINAL);
} }
// STATIC // TODO: STATIC
if (nestedClass //if (nestedClass && jetModifierList.hasModifier(INNER_KEYWORD)) {
//TODO: && !jetModifierList.hasModifier(INNER_KEYWORD) // psiModifiers.add(PsiModifier.STATIC);
) { //}
psiModifiers.add(PsiModifier.STATIC);
}
return psiModifiers.toArray(new String[psiModifiers.size()]); return psiModifiers.toArray(new String[psiModifiers.size()]);
} }
compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassTest.java
+1
View File
@@ -77,6 +77,7 @@ public abstract class KotlinLightClassTest extends KotlinAsJavaTestBase {
public void testEnum() { public void testEnum() {
checkModifiers("test.Enum", PUBLIC, FINAL, ENUM); checkModifiers("test.Enum", PUBLIC, FINAL, ENUM);
} }
public void testTrait() { public void testTrait() {
checkModifiers("test.Trait", PUBLIC, ABSTRACT, INTERFACE); checkModifiers("test.Trait", PUBLIC, ABSTRACT, INTERFACE);
} }