From 0880c206141fefd050a1c81d1f480885bfa1456c Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Mon, 22 Dec 2014 16:29:51 +0300
Subject: [PATCH] Rename ONLY_CLASSES -> ONLY_CLASSES_AND_PACKAGES

---
 .../jetbrains/jet/lang/resolve/ImportsResolver.java  |  4 ++--
 .../lang/resolve/QualifiedExpressionResolver.java    | 12 ++++++------
 .../jet/lang/resolve/lazy/LazyImportScope.kt         |  4 ++--
 3 files changed, 10 insertions(+), 10 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 9399c591bdf..cdc0fb38382 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java
@@ -67,7 +67,7 @@ public class ImportsResolver {
     }
 
     public void processTypeImports(@NotNull TopDownAnalysisContext c) {
-        processImports(c, LookupMode.ONLY_CLASSES);
+        processImports(c, LookupMode.ONLY_CLASSES_AND_PACKAGES);
     }
 
     public void processMembersImports(@NotNull TopDownAnalysisContext c) {
@@ -129,7 +129,7 @@ public class ImportsResolver {
                 resolvedDirectives.put(importDirective, descriptors);
             }
 
-            if (lookupMode != LookupMode.ONLY_CLASSES) {
+            if (lookupMode != LookupMode.ONLY_CLASSES_AND_PACKAGES) {
                 checkPlatformTypesMappedToKotlin(module, trace, importDirective, descriptors);
             }
         }
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 742e62656d2..a8fbad82831 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java
@@ -46,7 +46,7 @@ public class QualifiedExpressionResolver {
 
     public enum LookupMode {
         // Only classifier and packages are resolved
-        ONLY_CLASSES,
+        ONLY_CLASSES_AND_PACKAGES,
 
         // Resolve all descriptors
         EVERYTHING
@@ -115,7 +115,7 @@ public class QualifiedExpressionResolver {
             @NotNull BindingTrace trace,
             @NotNull LookupMode lookupMode
     ) {
-        if (lookupMode == LookupMode.ONLY_CLASSES) {
+        if (lookupMode == LookupMode.ONLY_CLASSES_AND_PACKAGES) {
             return true;
         }
 
@@ -169,11 +169,11 @@ public class QualifiedExpressionResolver {
         }
         JetUserType qualifier = userType.getQualifier();
         if (qualifier == null) {
-            return lookupDescriptorsForSimpleNameReference(referenceExpression, outerScope, outerScope, trace, LookupMode.ONLY_CLASSES,
+            return lookupDescriptorsForSimpleNameReference(referenceExpression, outerScope, outerScope, trace, LookupMode.ONLY_CLASSES_AND_PACKAGES,
                                                            false, true);
         }
         Collection<DeclarationDescriptor> declarationDescriptors = lookupDescriptorsForUserType(qualifier, outerScope, trace);
-        return lookupSelectorDescriptors(referenceExpression, declarationDescriptors, trace, outerScope, LookupMode.ONLY_CLASSES, true);
+        return lookupSelectorDescriptors(referenceExpression, declarationDescriptors, trace, outerScope, LookupMode.ONLY_CLASSES_AND_PACKAGES, true);
     }
 
     @NotNull
@@ -241,7 +241,7 @@ public class QualifiedExpressionResolver {
             @NotNull LookupMode lookupMode,
             @NotNull ClassDescriptor descriptor
     ) {
-        JetScope scope = lookupMode == LookupMode.ONLY_CLASSES
+        JetScope scope = lookupMode == LookupMode.ONLY_CLASSES_AND_PACKAGES
                          ? descriptor.getUnsubstitutedInnerClassesScope()
                          : descriptor.getDefaultType().getMemberScope();
         results.add(lookupSimpleNameReference(selector, scope, lookupMode, false));
@@ -335,7 +335,7 @@ public class QualifiedExpressionResolver {
         }
 
         Collection<DeclarationDescriptor> filteredDescriptors;
-        if (lookupMode == LookupMode.ONLY_CLASSES) {
+        if (lookupMode == LookupMode.ONLY_CLASSES_AND_PACKAGES) {
             filteredDescriptors = Collections2.filter(descriptors, CLASSIFIERS_AND_PACKAGE_VIEWS);
         }
         else {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.kt
index 53177730f0c..ed6734bc683 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.kt
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.kt
@@ -146,9 +146,9 @@ public class LazyImportScope(private val resolveSession: ResolveSession,
 
     private fun getImportScope(directive: JetImportDirective, lookupMode: LookupMode) = importedScopesProvider(directive).scopeForMode(lookupMode)
 
-    override fun getClassifier(name: Name) = selectFirstFromImports(name, LookupMode.ONLY_CLASSES, JetScopeSelectorUtil.CLASSIFIER_DESCRIPTOR_SCOPE_SELECTOR)
+    override fun getClassifier(name: Name) = selectFirstFromImports(name, LookupMode.ONLY_CLASSES_AND_PACKAGES, JetScopeSelectorUtil.CLASSIFIER_DESCRIPTOR_SCOPE_SELECTOR)
 
-    override fun getPackage(name: Name) = selectFirstFromImports(name, LookupMode.ONLY_CLASSES, JetScopeSelectorUtil.PACKAGE_SCOPE_SELECTOR)
+    override fun getPackage(name: Name) = selectFirstFromImports(name, LookupMode.ONLY_CLASSES_AND_PACKAGES, JetScopeSelectorUtil.PACKAGE_SCOPE_SELECTOR)
 
     override fun getProperties(name: Name) = collectFromImports(name, LookupMode.EVERYTHING, JetScopeSelectorUtil.NAMED_PROPERTIES_SCOPE_SELECTOR)