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

Rename ONLY_CLASSES -> ONLY_CLASSES_AND_PACKAGES

Browse Source
This commit is contained in:
Andrey Breslav
2014-12-22 16:29:51 +03:00
parent e86b412a61
commit 0880c20614
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java
+2 -2
View File
@@ -67,7 +67,7 @@ public class ImportsResolver {
} }
public void processTypeImports(@NotNull TopDownAnalysisContext c) { public void processTypeImports(@NotNull TopDownAnalysisContext c) {
processImports(c, LookupMode.ONLY_CLASSES); processImports(c, LookupMode.ONLY_CLASSES_AND_PACKAGES);
} }
public void processMembersImports(@NotNull TopDownAnalysisContext c) { public void processMembersImports(@NotNull TopDownAnalysisContext c) {
@@ -129,7 +129,7 @@ public class ImportsResolver {
resolvedDirectives.put(importDirective, descriptors); resolvedDirectives.put(importDirective, descriptors);
} }
if (lookupMode != LookupMode.ONLY_CLASSES) { if (lookupMode != LookupMode.ONLY_CLASSES_AND_PACKAGES) {
checkPlatformTypesMappedToKotlin(module, trace, importDirective, descriptors); checkPlatformTypesMappedToKotlin(module, trace, importDirective, descriptors);
} }
} }
compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java
+6 -6
View File
@@ -46,7 +46,7 @@ public class QualifiedExpressionResolver {
public enum LookupMode { public enum LookupMode {
// Only classifier and packages are resolved // Only classifier and packages are resolved
ONLY_CLASSES, ONLY_CLASSES_AND_PACKAGES,
// Resolve all descriptors // Resolve all descriptors
EVERYTHING EVERYTHING
@@ -115,7 +115,7 @@ public class QualifiedExpressionResolver {
@NotNull BindingTrace trace, @NotNull BindingTrace trace,
@NotNull LookupMode lookupMode @NotNull LookupMode lookupMode
) { ) {
if (lookupMode == LookupMode.ONLY_CLASSES) { if (lookupMode == LookupMode.ONLY_CLASSES_AND_PACKAGES) {
return true; return true;
} }
@@ -169,11 +169,11 @@ public class QualifiedExpressionResolver {
} }
JetUserType qualifier = userType.getQualifier(); JetUserType qualifier = userType.getQualifier();
if (qualifier == null) { 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); false, true);
} }
Collection<DeclarationDescriptor> declarationDescriptors = lookupDescriptorsForUserType(qualifier, outerScope, trace); 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 @NotNull
@@ -241,7 +241,7 @@ public class QualifiedExpressionResolver {
@NotNull LookupMode lookupMode, @NotNull LookupMode lookupMode,
@NotNull ClassDescriptor descriptor @NotNull ClassDescriptor descriptor
) { ) {
JetScope scope = lookupMode == LookupMode.ONLY_CLASSES JetScope scope = lookupMode == LookupMode.ONLY_CLASSES_AND_PACKAGES
? descriptor.getUnsubstitutedInnerClassesScope() ? descriptor.getUnsubstitutedInnerClassesScope()
: descriptor.getDefaultType().getMemberScope(); : descriptor.getDefaultType().getMemberScope();
results.add(lookupSimpleNameReference(selector, scope, lookupMode, false)); results.add(lookupSimpleNameReference(selector, scope, lookupMode, false));
@@ -335,7 +335,7 @@ public class QualifiedExpressionResolver {
} }
Collection<DeclarationDescriptor> filteredDescriptors; Collection<DeclarationDescriptor> filteredDescriptors;
if (lookupMode == LookupMode.ONLY_CLASSES) { if (lookupMode == LookupMode.ONLY_CLASSES_AND_PACKAGES) {
filteredDescriptors = Collections2.filter(descriptors, CLASSIFIERS_AND_PACKAGE_VIEWS); filteredDescriptors = Collections2.filter(descriptors, CLASSIFIERS_AND_PACKAGE_VIEWS);
} }
else { else {
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.kt
+2 -2
View File
@@ -146,9 +146,9 @@ public class LazyImportScope(private val resolveSession: ResolveSession,
private fun getImportScope(directive: JetImportDirective, lookupMode: LookupMode) = importedScopesProvider(directive).scopeForMode(lookupMode) 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) override fun getProperties(name: Name) = collectFromImports(name, LookupMode.EVERYTHING, JetScopeSelectorUtil.NAMED_PROPERTIES_SCOPE_SELECTOR)