From 0a2403476e8da90362214d58a3e48551b877c413 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Wed, 22 Oct 2014 19:46:55 +0400 Subject: [PATCH] Converted method to property --- .../resolve/scopes/ClassObjectMixinScope.kt | 4 ++-- .../scopes/WritableScopeWithImports.kt | 6 ++--- .../resolve/scopes/AbstractScopeAdapter.kt | 24 +++++++++---------- .../scopes/InnerClassesScopeWrapper.kt | 4 +--- .../lang/resolve/scopes/LazyScopeAdapter.kt | 3 ++- 5 files changed, 19 insertions(+), 22 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/ClassObjectMixinScope.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/ClassObjectMixinScope.kt index ae6efb92e8e..2ce77f5cb91 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/ClassObjectMixinScope.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/ClassObjectMixinScope.kt @@ -26,8 +26,8 @@ import java.util.Collections * Scope lazily delegates requests to class object scope. */ public class ClassObjectMixinScope(private val classObjectDescriptor: ClassDescriptor) : AbstractScopeAdapter() { - - override fun getWorkerScope() = classObjectDescriptor.getDefaultType().getMemberScope() + override val workerScope: JetScope + get() = classObjectDescriptor.getDefaultType().getMemberScope() override fun getImplicitReceiversHierarchy() = listOf(classObjectDescriptor.getThisAsReceiverParameter()) } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.kt index 7f8543f9d62..25e1e816e41 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.kt @@ -27,7 +27,7 @@ import kotlin.List import kotlin.Set import kotlin.Collection -public abstract class WritableScopeWithImports(private val workerScope: JetScope, +public abstract class WritableScopeWithImports(override val workerScope: JetScope, protected val redeclarationHandler: RedeclarationHandler, private val debugName: String) : AbstractScopeAdapter(), WritableScope { @@ -38,8 +38,6 @@ public abstract class WritableScopeWithImports(private val workerScope: JetScope private var lockLevel: WritableScope.LockLevel = WritableScope.LockLevel.WRITING - override fun getWorkerScope() = workerScope - override fun changeLockLevel(lockLevel: WritableScope.LockLevel): WritableScope { if (lockLevel.ordinal() < this.lockLevel.ordinal()) { throw IllegalStateException("cannot lower lock level from " + this.lockLevel + " to " + lockLevel + " at " + toString()) @@ -217,7 +215,7 @@ public abstract class WritableScopeWithImports(private val workerScope: JetScope printAdditionalScopeStructure(p) p.print("worker = ") - getWorkerScope().printScopeStructure(p.withholdIndentOnce()) + workerScope.printScopeStructure(p.withholdIndentOnce()) if (getImports().isEmpty()) { p.println("imports = {}") diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.kt index da5d2400cb8..a55ac8c03be 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.kt @@ -24,46 +24,46 @@ import org.jetbrains.jet.utils.Printer * Introduces a simple wrapper for internal scope. */ public abstract class AbstractScopeAdapter : JetScope { - protected abstract fun getWorkerScope(): JetScope + protected abstract val workerScope: JetScope override fun getImplicitReceiversHierarchy(): List { - return getWorkerScope().getImplicitReceiversHierarchy() + return workerScope.getImplicitReceiversHierarchy() } override fun getFunctions(name: Name): Collection { - return getWorkerScope().getFunctions(name) + return workerScope.getFunctions(name) } override fun getPackage(name: Name): PackageViewDescriptor? { - return getWorkerScope().getPackage(name) + return workerScope.getPackage(name) } override fun getClassifier(name: Name): ClassifierDescriptor? { - return getWorkerScope().getClassifier(name) + return workerScope.getClassifier(name) } override fun getProperties(name: Name): Collection { - return getWorkerScope().getProperties(name) + return workerScope.getProperties(name) } override fun getLocalVariable(name: Name): VariableDescriptor? { - return getWorkerScope().getLocalVariable(name) + return workerScope.getLocalVariable(name) } override fun getContainingDeclaration(): DeclarationDescriptor { - return getWorkerScope().getContainingDeclaration() + return workerScope.getContainingDeclaration() } override fun getDeclarationsByLabel(labelName: Name): Collection { - return getWorkerScope().getDeclarationsByLabel(labelName) + return workerScope.getDeclarationsByLabel(labelName) } override fun getAllDescriptors(): Collection { - return getWorkerScope().getAllDescriptors() + return workerScope.getAllDescriptors() } override fun getOwnDeclaredDescriptors(): Collection { - return getWorkerScope().getOwnDeclaredDescriptors() + return workerScope.getOwnDeclaredDescriptors() } override fun printScopeStructure(p: Printer) { @@ -71,7 +71,7 @@ public abstract class AbstractScopeAdapter : JetScope { p.pushIndent() p.print("worker =") - getWorkerScope().printScopeStructure(p.withholdIndentOnce()) + workerScope.printScopeStructure(p.withholdIndentOnce()) p.popIndent() p.println("}") diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.kt index 842a7f855e8..4d061d048a7 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.kt @@ -23,9 +23,7 @@ import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor import org.jetbrains.jet.lang.resolve.name.Name import java.util.Collections -public class InnerClassesScopeWrapper(private val workerScope: JetScope) : AbstractScopeAdapter() { - - override fun getWorkerScope() = workerScope +public class InnerClassesScopeWrapper(override val workerScope: JetScope) : AbstractScopeAdapter() { override fun getClassifier(name: Name) = workerScope.getClassifier(name) as? ClassDescriptor diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.kt index fbcdb500a11..bb30e5d6e1a 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.kt @@ -19,5 +19,6 @@ package org.jetbrains.jet.lang.resolve.scopes import org.jetbrains.jet.storage.NotNullLazyValue public class LazyScopeAdapter(private val scope: NotNullLazyValue) : AbstractScopeAdapter() { - override fun getWorkerScope() = scope() + override val workerScope: JetScope + get() = scope() }