From 7c0bebe6310cbbb3c8cc6e2070065499d841d34b Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Fri, 7 Sep 2012 18:22:02 +0400
Subject: [PATCH] make parameter moduleConfiguration @NotNull  (in
 'processImportReference')

---
 .../jet/lang/resolve/QualifiedExpressionResolver.java    | 7 ++++---
 .../lang/types/expressions/ExpressionTypingUtils.java    | 9 ++++++---
 .../jetbrains/jet/plugin/caches/JetShortNamesCache.java  | 4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java
index 292b6991ab7..0e2809f067b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java
@@ -44,9 +44,10 @@ public class QualifiedExpressionResolver {
     public Collection<? extends DeclarationDescriptor> analyseImportReference(
             @NotNull JetImportDirective importDirective,
             @NotNull JetScope scope,
-            @NotNull BindingTrace trace
+            @NotNull BindingTrace trace,
+            @NotNull ModuleConfiguration moduleConfiguration
     ) {
-        return processImportReference(importDirective, scope, scope, Importer.DO_NOTHING, trace, null, false);
+        return processImportReference(importDirective, scope, scope, Importer.DO_NOTHING, trace, moduleConfiguration, false);
     }
 
     @NotNull
@@ -56,7 +57,7 @@ public class QualifiedExpressionResolver {
             @NotNull JetScope scopeToCheckVisibility,
             @NotNull Importer importer,
             @NotNull BindingTrace trace,
-            @Nullable ModuleConfiguration moduleConfiguration,
+            @NotNull ModuleConfiguration moduleConfiguration,
             boolean onlyClasses
     ) {
         if (importDirective.isAbsoluteInRootNamespace()) {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java
index 271b264cd85..dca80964cc0 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java
@@ -23,6 +23,7 @@ import com.intellij.psi.tree.TokenSet;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.JetNodeTypes;
+import org.jetbrains.jet.lang.ModuleConfiguration;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.*;
@@ -181,11 +182,13 @@ public class ExpressionTypingUtils {
             @NotNull Project project,
             @NotNull JetExpression receiverExpression,
             @NotNull JetType receiverType,
-            @NotNull JetScope scope) {
-
+            @NotNull JetScope scope,
+            @NotNull ModuleConfiguration moduleConfiguration
+    ) {
         JetImportDirective importDirective = JetPsiFactory.createImportDirective(project, callableFQN.getFqName());
 
-        Collection<? extends DeclarationDescriptor> declarationDescriptors = new QualifiedExpressionResolver().analyseImportReference(importDirective, scope, new BindingTraceContext());
+        Collection<? extends DeclarationDescriptor> declarationDescriptors = new QualifiedExpressionResolver()
+                .analyseImportReference(importDirective, scope, new BindingTraceContext(), moduleConfiguration);
 
         List<CallableDescriptor> callableExtensionDescriptors = new ArrayList<CallableDescriptor>();
         ReceiverDescriptor receiverDescriptor = new ExpressionReceiver(receiverExpression, receiverType);
diff --git a/idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java b/idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java
index 16c7211c65c..baa8969242e 100644
--- a/idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java
+++ b/idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java
@@ -178,7 +178,7 @@ public class JetShortNamesCache extends PsiShortNamesCache {
             if (functionFQN != null) {
                 JetImportDirective importDirective = JetPsiFactory.createImportDirective(project, new ImportPath(functionFQN, false));
                 Collection<? extends DeclarationDescriptor> declarationDescriptors = new QualifiedExpressionResolver().analyseImportReference(
-                        importDirective, jetScope, new BindingTraceContext());
+                        importDirective, jetScope, new BindingTraceContext(), resolveSession.getModuleConfiguration());
                 for (DeclarationDescriptor declarationDescriptor : declarationDescriptors) {
                     if (declarationDescriptor instanceof FunctionDescriptor) {
                         result.add((FunctionDescriptor) declarationDescriptor);
@@ -277,7 +277,7 @@ public class JetShortNamesCache extends PsiShortNamesCache {
                 // Iterate through the function with attempt to resolve found functions
                 for (FqName functionFQN : functionFQNs) {
                     for (CallableDescriptor functionDescriptor : ExpressionTypingUtils.canFindSuitableCall(
-                            functionFQN, project, receiverExpression, expressionType, scope)) {
+                            functionFQN, project, receiverExpression, expressionType, scope, resolveSession.getModuleConfiguration())) {
 
                         resultDescriptors.add(functionDescriptor);
                     }