Light classes: getOwnInnerClasses() filters out inner classes with null names

#KT-13927 Fixed
This commit is contained in:
Pavel V. Talanov
2016-09-26 19:24:00 +03:00
parent 827b56e277
commit b275dacad8
4 changed files with 22 additions and 1 deletions
@@ -317,7 +317,12 @@ abstract class KtLightClassForSourceDeclaration(protected val classOrObject: KtC
override fun getOwnInnerClasses(): List<PsiClass> {
val result = ArrayList<PsiClass>()
classOrObject.declarations.filterIsInstance<KtClassOrObject>().mapNotNullTo(result) { create(it) }
classOrObject.declarations.filterIsInstance<KtClassOrObject>()
// workaround for ClassInnerStuffCache not supporting classes with null names, see KT-13927
// inner classes with null names can't be searched for and can't be used from java anyway
// we can't prohibit creating light classes with null names either since they can contain members
.filter { it.name != null }
.mapNotNullTo(result) { create(it) }
if (classOrObject.hasInterfaceDefaultImpls) {
result.add(KtLightClassForInterfaceDefaultImpls(classOrObject))
@@ -0,0 +1,6 @@
public class InnerClassWithoutName {
public void uses() {
Test5 test5 = new Test5();
Test5.In1 in1 = test5.new In1();
}
}
@@ -0,0 +1,4 @@
class Test5 {
inner class In1 {}
inner class
}
@@ -148,6 +148,12 @@ public class JavaAgainstKotlinSourceCheckerTestGenerated extends AbstractJavaAga
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kotlinAndJavaChecker/javaWithKotlin"), Pattern.compile("^(.+)\\.kt$"), true);
}
@TestMetadata("InnerClassWithoutName.kt")
public void testInnerClassWithoutName() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaWithKotlin/InnerClassWithoutName.kt");
doTest(fileName);
}
@TestMetadata("NoNotNullOnParameterInOverride.kt")
public void testNoNotNullOnParameterInOverride() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaWithKotlin/NoNotNullOnParameterInOverride.kt");