From a04f6ee2635252fc41c5a9a14e0e21897b725000 Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Wed, 29 Aug 2012 12:15:25 +0400
Subject: [PATCH] extracted method reportHasKotlinAnalog

---
 .../jet/lang/resolve/ImportsResolver.java     | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java
index 952355b0bd1..bac75d02b4f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java
@@ -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,