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

Minor. remove usage of WritableScope

Browse Source
This commit is contained in:
Stanislav Erokhin
2015-10-31 05:27:42 +03:00
parent 71620d2ed1
commit c1fa973324
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutablePackageFragmentDescriptor.java
+3 -4
View File
@@ -22,18 +22,17 @@ import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.resolve.scopes.*; import org.jetbrains.kotlin.resolve.scopes.*;
public class MutablePackageFragmentDescriptor extends PackageFragmentDescriptorImpl { public class MutablePackageFragmentDescriptor extends PackageFragmentDescriptorImpl {
private final WritableScope scope; private final KtScope scope;
public MutablePackageFragmentDescriptor(@NotNull ModuleDescriptor module, @NotNull FqName fqName) { public MutablePackageFragmentDescriptor(@NotNull ModuleDescriptor module, @NotNull FqName fqName) {
super(module, fqName); super(module, fqName);
scope = new WritableScopeImpl(KtScope.Empty.INSTANCE$, this, RedeclarationHandler.DO_NOTHING, "Members of " + fqName + " in " + module); scope = new SimpleKtScope(this, "Members of " + fqName + " in " + module);
scope.changeLockLevel(LexicalWritableScope.LockLevel.BOTH);
} }
@NotNull @NotNull
@Override @Override
public WritableScope getMemberScope() { public KtScope getMemberScope() {
return scope; return scope;
} }
} }
core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/KtScopeImpl.kt
+9 -1
View File
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.utils.Printer import org.jetbrains.kotlin.utils.Printer
public abstract class KtScopeImpl : KtScope { abstract class KtScopeImpl : KtScope {
override fun getClassifier(name: Name, location: LookupLocation): ClassifierDescriptor? = null override fun getClassifier(name: Name, location: LookupLocation): ClassifierDescriptor? = null
override fun getProperties(name: Name, location: LookupLocation): Collection<VariableDescriptor> = emptyList() override fun getProperties(name: Name, location: LookupLocation): Collection<VariableDescriptor> = emptyList()
@@ -51,3 +51,11 @@ public abstract class KtScopeImpl : KtScope {
// This method should not be implemented here by default: every scope class has its unique structure pattern // This method should not be implemented here by default: every scope class has its unique structure pattern
abstract override fun printScopeStructure(p: Printer) abstract override fun printScopeStructure(p: Printer)
} }
class SimpleKtScope(val ownerDescriptor: DeclarationDescriptor, val debugName: String): KtScopeImpl() {
override fun printScopeStructure(p: Printer) {
p.println(javaClass.getSimpleName(), ": ", debugName, " for ", ownerDescriptor, " {")
}
override fun getContainingDeclaration() = ownerDescriptor
}