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

extracted method reportHasKotlinAnalog

Browse Source
This commit is contained in:
Svetlana Isakova
2012-08-29 12:15:25 +04:00
parent fb6e1e5dc3
commit a04f6ee263
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java
+17 -8
View File
@@ -122,14 +122,7 @@ public class ImportsResolver {
resolvedDirectives.put(importDirective, descriptors.iterator().next());
}
for (DeclarationDescriptor descriptor : descriptors) {
if (descriptor instanceof ClassDescriptor && !onlyClasses) {
FqNameUnsafe fqName = DescriptorUtils.getFQName(descriptor);
Collection<ClassDescriptor> kotlinAnalogs = configuration.getKotlinAnalogs(fqName);
JetExpression importedReference = importDirective.getImportedReference();
if (importedReference != null && !kotlinAnalogs.isEmpty()) {
trace.report(CLASS_HAS_KOTLIN_ANALOG.on(importedReference, kotlinAnalogs));
}
}
reportHasKotlinAnalog(onlyClasses, configuration, trace, importDirective, descriptor);
}
}
delayedImporter.processImports();
@@ -141,6 +134,22 @@ public class ImportsResolver {
}
}
private static void reportHasKotlinAnalog(
boolean onlyClasses,
@NotNull ModuleConfiguration configuration,
@NotNull BindingTrace trace,
@NotNull JetImportDirective importDirective,
@NotNull DeclarationDescriptor descriptor
) {
if (!(descriptor instanceof ClassDescriptor) || onlyClasses) return;
FqNameUnsafe fqName = DescriptorUtils.getFQName(descriptor);
Collection<ClassDescriptor> kotlinAnalogs = configuration.getKotlinAnalogs(fqName);
JetExpression importedReference = importDirective.getImportedReference();
if (importedReference != null && !kotlinAnalogs.isEmpty()) {
trace.report(CLASS_HAS_KOTLIN_ANALOG.on(importedReference, kotlinAnalogs));
}
}
private static void reportUselessImport(
@NotNull JetImportDirective importDirective,
@NotNull WritableScope namespaceScope,