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

Find usages: only collect those descriptors which resolve to callables

Browse Source 
Fix failing test on the buildserver
This commit is contained in:
Alexander Udalov
2014-09-19 14:50:34 +04:00
parent 5a0b786cb9
commit 90c09762e3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java
+4 -4
View File
@@ -136,10 +136,10 @@ public class JetRefactoringUtil {
Project project = declaration.getProject(); Project project = declaration.getProject();
Map<PsiElement, CallableDescriptor> overriddenElementsToDescriptor = new HashMap<PsiElement, CallableDescriptor>(); Map<PsiElement, CallableDescriptor> overriddenElementsToDescriptor = new HashMap<PsiElement, CallableDescriptor>();
for (CallableDescriptor overridenDescriptor : OverrideResolver.getAllOverriddenDescriptors(declarationDescriptor)) { for (CallableDescriptor overriddenDescriptor : OverrideResolver.getAllOverriddenDescriptors(declarationDescriptor)) {
PsiElement overridenDeclaration = DescriptorToDeclarationUtil.getDeclaration(project, overridenDescriptor); PsiElement overriddenDeclaration = DescriptorToDeclarationUtil.getDeclaration(project, overriddenDescriptor);
if (overridenDeclaration != null) { if (PsiTreeUtil.instanceOf(overriddenDeclaration, JetNamedFunction.class, JetProperty.class, PsiMethod.class)) {
overriddenElementsToDescriptor.put(overridenDeclaration, overridenDescriptor); overriddenElementsToDescriptor.put(overriddenDeclaration, overriddenDescriptor);
} }
} }
if (ignore != null) { if (ignore != null) {