Support nested classes in KotlinCliJavaFileManagerImpl.findClass

findClass(String, GlobalSearchScope) is invoked for example when we're resolving supertypes of classes in Java libraries. Previously, it never found nested classes and falled back to CoreJavaFileManager's implementation, which lacks a fix for the original issue (KT-12664, which was fixed in JvmDependenciesIndex in ff783f1f and 2c344635) #KT-16931 Fixed Original commit: c67eb84369
2017-03-24 18:33:32 +03:00
parent bf01fa4729
commit 2208b46941
5 changed files with 2 additions and 5 deletions
@@ -277,12 +277,9 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
        assertEquals("Invalid package prefix name is ignored: invalid-prefix.test", warnings.first().messageText)
    }

-    fun testSourcePackagePrefixKnownIssueWithInnerClasses() {
+    fun testSourcePackagePrefixWithInnerClasses() {
        initProject()
-        val buildResult = buildAllModules()
-        buildResult.assertFailed()
-        val errors = buildResult.getMessages(BuildMessage.Kind.ERROR).map { it.messageText }
-        assertTrue("Message wasn't found. $errors", errors.first().contains("class xxx.JavaWithInner.TextRenderer, unresolved supertypes: TableRow"))
+        buildAllModules().assertSuccessful()
    }

    fun testKotlinJavaScriptProject() {