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

Supported multi-reference in imports (SAM interfaces are resolved as both functions and classes).

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-03-27 18:21:03 +04:00
parent 8130c813e9
commit cadb9bcb8f
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java
+23 -5
View File
@@ -87,14 +87,15 @@ public class MapPlatformClassToKotlinFix extends JetIntentionAction<JetReference
if (diagnostic.getFactory() != Errors.PLATFORM_CLASS_MAPPED_TO_KOTLIN) continue; if (diagnostic.getFactory() != Errors.PLATFORM_CLASS_MAPPED_TO_KOTLIN) continue;
JetReferenceExpression refExpr = getImportOrUsageFromDiagnostic(diagnostic); JetReferenceExpression refExpr = getImportOrUsageFromDiagnostic(diagnostic);
if (refExpr == null) continue; if (refExpr == null) continue;
DeclarationDescriptor descriptor = context.get(BindingContext.REFERENCE_TARGET, refExpr); ClassDescriptor descriptor = resolveToClass(refExpr, context);
if (descriptor == null || !(descriptor.equals(platformClass))) continue; if (descriptor == null || !(descriptor.equals(platformClass))) continue;
JetImportDirective imp = PsiTreeUtil.getParentOfType(refExpr, JetImportDirective.class); JetImportDirective imp = PsiTreeUtil.getParentOfType(refExpr, JetImportDirective.class);
if (imp == null) { if (imp == null) {
JetUserType type = PsiTreeUtil.getParentOfType(refExpr, JetUserType.class); JetUserType type = PsiTreeUtil.getParentOfType(refExpr, JetUserType.class);
if (type == null) continue; if (type == null) continue;
usages.add(type); usages.add(type);
} else { }
else {
imports.add(imp); imports.add(imp);
} }
} }
@@ -193,9 +194,8 @@ public class MapPlatformClassToKotlinFix extends JetIntentionAction<JetReference
Project project = diagnostic.getPsiFile().getProject(); Project project = diagnostic.getPsiFile().getProject();
BindingContext context = KotlinCacheManager.getInstance(project).getDeclarationsFromProject().getBindingContext(); BindingContext context = KotlinCacheManager.getInstance(project).getDeclarationsFromProject().getBindingContext();
DeclarationDescriptor descriptor = context.get(BindingContext.REFERENCE_TARGET, typeExpr); ClassDescriptor platformClass = resolveToClass(typeExpr, context);
if (descriptor == null || !(descriptor instanceof ClassDescriptor)) return null; if (platformClass == null) return null;
ClassDescriptor platformClass = (ClassDescriptor) descriptor;
assert diagnostic.getFactory() == Errors.PLATFORM_CLASS_MAPPED_TO_KOTLIN; assert diagnostic.getFactory() == Errors.PLATFORM_CLASS_MAPPED_TO_KOTLIN;
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@@ -206,4 +206,22 @@ public class MapPlatformClassToKotlinFix extends JetIntentionAction<JetReference
} }
}; };
} }
@Nullable
private static ClassDescriptor resolveToClass(@NotNull JetReferenceExpression referenceExpression, @NotNull BindingContext context) {
DeclarationDescriptor descriptor = context.get(BindingContext.REFERENCE_TARGET, referenceExpression);
Collection<? extends DeclarationDescriptor> ambiguousTargets =
context.get(BindingContext.AMBIGUOUS_REFERENCE_TARGET, referenceExpression);
if (descriptor instanceof ClassDescriptor) {
return (ClassDescriptor) descriptor;
}
else if (ambiguousTargets != null) {
for (DeclarationDescriptor target : ambiguousTargets) {
if (target instanceof ClassDescriptor) {
return (ClassDescriptor) target;
}
}
}
return null;
}
} }