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

Fix navigation to compiled overridden descriptors

Browse Source
This commit is contained in:
Pavel V. Talanov
2013-09-02 20:29:50 +04:00
parent 1874942cd2
commit e2cbfd8055
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/libraries/DecompiledNavigationUtils.java
+12
View File
@@ -29,6 +29,8 @@ import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
import org.jetbrains.jet.lang.resolve.java.vfilefinder.VirtualFileFinder; import org.jetbrains.jet.lang.resolve.java.vfilefinder.VirtualFileFinder;
import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqName;
import java.util.Set;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFQName; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFQName;
public final class DecompiledNavigationUtils { public final class DecompiledNavigationUtils {
@@ -71,6 +73,16 @@ public final class DecompiledNavigationUtils {
//TODO: should be done via some generic mechanism //TODO: should be done via some generic mechanism
@NotNull @NotNull
private static DeclarationDescriptor getEffectiveReferencedDescriptor(@NotNull DeclarationDescriptor referencedDescriptor) { private static DeclarationDescriptor getEffectiveReferencedDescriptor(@NotNull DeclarationDescriptor referencedDescriptor) {
if (referencedDescriptor instanceof CallableMemberDescriptor) {
CallableMemberDescriptor callableMemberDescriptor = (CallableMemberDescriptor) referencedDescriptor;
CallableMemberDescriptor.Kind kind = callableMemberDescriptor.getKind();
if (kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE) {
Set<? extends CallableMemberDescriptor> overriddenDescriptors =
callableMemberDescriptor.getOverriddenDescriptors();
//TODO: several descriptors
return getEffectiveReferencedDescriptor(overriddenDescriptors.iterator().next());
}
}
if (referencedDescriptor instanceof VariableDescriptorForObject) { if (referencedDescriptor instanceof VariableDescriptorForObject) {
ClassDescriptor objectClass = ((VariableDescriptorForObject) referencedDescriptor).getObjectClass(); ClassDescriptor objectClass = ((VariableDescriptorForObject) referencedDescriptor).getObjectClass();
if (objectClass.getKind() == ClassKind.OBJECT) { if (objectClass.getKind() == ClassKind.OBJECT) {