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

KT-6026 Exception on instantiating a nested class in an anonymous object

Browse Source 
#KT-6026 Fixed
This commit is contained in:
Svetlana Isakova
2014-10-15 20:42:28 +04:00
parent c0c9552f4c
commit 595b3ffe23
5 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/DecompiledNavigationUtils.java
+3 -2
View File
@@ -29,10 +29,10 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqNameSafe;
public final class DecompiledNavigationUtils {
@@ -117,7 +117,8 @@ public final class DecompiledNavigationUtils {
|| ExpressionTypingUtils.isLocal(containerDescriptor.getContainingDeclaration(), containerDescriptor)) {
return getContainerFqName(containerDescriptor.getContainingDeclaration());
}
return getFqNameSafe(containerDescriptor);
FqNameUnsafe fqNameUnsafe = getFqName(containerDescriptor);
return fqNameUnsafe.isSafe() ? fqNameUnsafe.toSafe() : null;
}
return null;
}