diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java index 86ad3bf3573..37922456ca2 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java @@ -305,12 +305,10 @@ public class KotlinLightClassForExplicitDeclaration extends AbstractLightClass i psiModifiers.add(PsiModifier.FINAL); } - // STATIC - if (nestedClass - //TODO: && !jetModifierList.hasModifier(INNER_KEYWORD) - ) { - psiModifiers.add(PsiModifier.STATIC); - } + // TODO: STATIC + //if (nestedClass && jetModifierList.hasModifier(INNER_KEYWORD)) { + // psiModifiers.add(PsiModifier.STATIC); + //} return psiModifiers.toArray(new String[psiModifiers.size()]); } diff --git a/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassTest.java b/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassTest.java index 701758d3c53..9e495aefddb 100644 --- a/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassTest.java +++ b/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassTest.java @@ -77,6 +77,7 @@ public abstract class KotlinLightClassTest extends KotlinAsJavaTestBase { public void testEnum() { checkModifiers("test.Enum", PUBLIC, FINAL, ENUM); } + public void testTrait() { checkModifiers("test.Trait", PUBLIC, ABSTRACT, INTERFACE); }