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

Fixed deprecated symbol usage fix for functions with optional parameters from libraries

Browse Source 
#KT-8525 Fixed
This commit is contained in:
Valentin Kipyatkov
2015-08-11 13:01:47 +03:00
parent d53b990655
commit 1fd0578b9e
6 changed files with 44 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/DecompiledNavigationUtils.java
+12 -5
View File
@@ -23,10 +23,7 @@ import com.intellij.psi.PsiManager;
import com.intellij.psi.search.GlobalSearchScope;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.descriptors.ClassDescriptor;
import org.jetbrains.kotlin.descriptors.ClassOrPackageFragmentDescriptor;
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor;
import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.idea.decompiler.DecompilerPackage;
import org.jetbrains.kotlin.idea.decompiler.KotlinClsFileBase;
import org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope;
@@ -51,7 +48,8 @@ public final class DecompiledNavigationUtils {
@NotNull Project project,
@NotNull DeclarationDescriptor referencedDescriptor
) {
if (DescriptorUtils.isLocal(referencedDescriptor)) return null;
if (isLocal(referencedDescriptor)) return null;
VirtualFile virtualFile = findVirtualFileContainingDescriptor(project, referencedDescriptor);
if (virtualFile == null ||
@@ -66,6 +64,15 @@ public final class DecompiledNavigationUtils {
return ((KotlinClsFileBase) psiFile).getDeclarationForDescriptor(referencedDescriptor);
}
private static boolean isLocal(DeclarationDescriptor descriptor) {
if (descriptor instanceof ParameterDescriptor) {
return isLocal(descriptor.getContainingDeclaration());
}
else {
return DescriptorUtils.isLocal(descriptor);
}
}
/*
Find virtual file which contains the declaration of descriptor we're navigating to.
*/