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

Renamed class + inherited NoSubpackagesInPackageScope from adapter class to get printScopeStructure implementation

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-12-26 14:40:39 +03:00
parent a383a82ddd
commit b61b45f794
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/Importer.java
+1 -1
View File
@@ -86,7 +86,7 @@ public interface Importer {
protected void importAllUnderDeclaration(@NotNull DeclarationDescriptor descriptor, @NotNull PlatformToKotlinClassMap platformToKotlinClassMap) { protected void importAllUnderDeclaration(@NotNull DeclarationDescriptor descriptor, @NotNull PlatformToKotlinClassMap platformToKotlinClassMap) {
List<JetScope> scopesToImport = new ArrayList<JetScope>(3); List<JetScope> scopesToImport = new ArrayList<JetScope>(3);
if (descriptor instanceof PackageViewDescriptor) { if (descriptor instanceof PackageViewDescriptor) {
scopesToImport.add(new ClassesInPackageScope((PackageViewDescriptor) descriptor)); scopesToImport.add(new NoSubpackagesInPackageScope((PackageViewDescriptor) descriptor));
} }
else if (descriptor instanceof ClassDescriptor && ((ClassDescriptor) descriptor).getKind() != ClassKind.OBJECT) { else if (descriptor instanceof ClassDescriptor && ((ClassDescriptor) descriptor).getKind() != ClassKind.OBJECT) {
ClassDescriptor classDescriptor = (ClassDescriptor) descriptor; ClassDescriptor classDescriptor = (ClassDescriptor) descriptor;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/ClassesInPackageScope.kt → compiler/frontend/src/org/jetbrains/jet/lang/resolve/NoSubpackagesInPackageScope.kt
+6 -5
View File
@@ -16,24 +16,25 @@
package org.jetbrains.jet.lang.resolve package org.jetbrains.jet.lang.resolve
import org.jetbrains.jet.lang.resolve.scopes.JetScope
import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor
import org.jetbrains.jet.lang.resolve.name.Name import org.jetbrains.jet.lang.resolve.name.Name
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter
import org.jetbrains.jet.lang.resolve.scopes.AbstractScopeAdapter
import org.jetbrains.jet.lang.resolve.scopes.JetScope
class ClassesInPackageScope(packageDescriptor: PackageViewDescriptor) : JetScope by packageDescriptor.getMemberScope() { class NoSubpackagesInPackageScope(packageDescriptor: PackageViewDescriptor) : AbstractScopeAdapter() {
private val memberScope = packageDescriptor.getMemberScope() override val workerScope: JetScope = packageDescriptor.getMemberScope()
override fun getPackage(name: Name): PackageViewDescriptor? = null override fun getPackage(name: Name): PackageViewDescriptor? = null
override fun getDescriptors(kindFilter: DescriptorKindFilter, nameFilter: (Name) -> Boolean): Collection<DeclarationDescriptor> { override fun getDescriptors(kindFilter: DescriptorKindFilter, nameFilter: (Name) -> Boolean): Collection<DeclarationDescriptor> {
val modifiedFilter = kindFilter.withoutKinds(DescriptorKindFilter.PACKAGES_MASK) val modifiedFilter = kindFilter.withoutKinds(DescriptorKindFilter.PACKAGES_MASK)
if (modifiedFilter.kindMask == 0) return listOf() if (modifiedFilter.kindMask == 0) return listOf()
return memberScope.getDescriptors(modifiedFilter, nameFilter).filter { it !is PackageViewDescriptor } return workerScope.getDescriptors(modifiedFilter, nameFilter).filter { it !is PackageViewDescriptor }
} }
override fun getOwnDeclaredDescriptors(): Collection<DeclarationDescriptor> { override fun getOwnDeclaredDescriptors(): Collection<DeclarationDescriptor> {
return memberScope.getOwnDeclaredDescriptors().filter { it !is PackageViewDescriptor } return workerScope.getOwnDeclaredDescriptors().filter { it !is PackageViewDescriptor }
} }
} }
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java
+2 -2
View File
@@ -23,7 +23,7 @@ import kotlin.Function1;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor;
import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.ClassesInPackageScope; import org.jetbrains.jet.lang.resolve.NoSubpackagesInPackageScope;
import org.jetbrains.jet.lang.resolve.ImportPath; import org.jetbrains.jet.lang.resolve.ImportPath;
import org.jetbrains.jet.lang.resolve.JetModuleUtil; import org.jetbrains.jet.lang.resolve.JetModuleUtil;
import org.jetbrains.jet.lang.resolve.TemporaryBindingTrace; import org.jetbrains.jet.lang.resolve.TemporaryBindingTrace;
@@ -98,7 +98,7 @@ public class ScopeProvider {
public JetScope[] collectFileScopes(@NotNull JetFile file) { public JetScope[] collectFileScopes(@NotNull JetFile file) {
List<JetScope> list = new ArrayList<JetScope>(); List<JetScope> list = new ArrayList<JetScope>();
list.add(new ClassesInPackageScope(getFilePackageDescriptor(file))); list.add(new NoSubpackagesInPackageScope(getFilePackageDescriptor(file)));
list.add(JetModuleUtil.getSubpackagesOfRootScope(resolveSession.getModuleDescriptor())); list.add(JetModuleUtil.getSubpackagesOfRootScope(resolveSession.getModuleDescriptor()));
list.add(explicitImportScopes.invoke(file)); list.add(explicitImportScopes.invoke(file));
list.addAll(additionalFileScopeProvider.scopes(file)); list.addAll(additionalFileScopeProvider.scopes(file));