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

Fix an NPE in VirtualFileKotlinClassFinder#findKotlinClass(JavaClass)

Browse Source 
Happens for nonphysical PsiClass
This commit is contained in:
Pavel V. Talanov
2014-07-10 14:08:14 +04:00
parent f0e91182da
commit ab07aea82f
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClassFinder.java
+2
View File
@@ -36,6 +36,8 @@ public abstract class VirtualFileKotlinClassFinder implements VirtualFileFinder
@Nullable @Nullable
public KotlinJvmBinaryClass findKotlinClass(@NotNull JavaClass javaClass) { public KotlinJvmBinaryClass findKotlinClass(@NotNull JavaClass javaClass) {
VirtualFile file = ((JavaClassImpl) javaClass).getPsi().getContainingFile().getVirtualFile(); VirtualFile file = ((JavaClassImpl) javaClass).getPsi().getContainingFile().getVirtualFile();
if (file == null) return null;
if (javaClass.getOuterClass() != null) { if (javaClass.getOuterClass() != null) {
// For nested classes we get a file of the containing class, to get the actual class file for A.B.C, // For nested classes we get a file of the containing class, to get the actual class file for A.B.C,
// we take the file for A, take its parent directory, then in this directory we look for A$B$C.class // we take the file for A, take its parent directory, then in this directory we look for A$B$C.class