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

Support nested classes in KotlinCliJavaFileManagerImpl.findClass

Browse Source 
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
This commit is contained in:
Alexander Udalov
2017-03-24 18:33:32 +03:00
parent bf01fa4729
commit 2208b46941
5 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/testData/general/SourcePackagePrefixWithInnerClasses/kotlinProject.iml
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="xxx"/>
</content>
<orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="kotlinProject" />
</component>
</module>
jps/jps-plugin/testData/general/SourcePackagePrefixWithInnerClasses/kotlinProject.ipr
+14
View File
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
</component>
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
jps/jps-plugin/testData/general/SourcePackagePrefixWithInnerClasses/src/JavaWithInner.java
+14
View File
@@ -0,0 +1,14 @@
package xxx;
import xxx.JavaWithInner.TableRenderer.TableRow;
public class JavaWithInner {
public static class TableRenderer{
public interface TableRow {
}
}
public static class TextRenderer implements TableRow {
public void method() {}
}
}
jps/jps-plugin/testData/general/SourcePackagePrefixWithInnerClasses/src/test.kt
+3
View File
@@ -0,0 +1,3 @@
package xxx
val test = JavaWithInner.TextRenderer().method()