From 31cdc917d798fe091ab647b8eb06288d8024c495 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 31 May 2016 10:39:19 +0300 Subject: [PATCH] Source code cleanup: leaking this quick fixes applied --- .../descriptors/impl/LocalVariableAccessorDescriptor.kt | 2 +- .../frontend/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt | 2 +- .../src/org/jetbrains/kotlin/load/java/lazy/context.kt | 2 +- .../kotlin/resolve/scopes/receivers/ImplicitClassReceiver.kt | 2 +- .../src/org/jetbrains/kotlin/types/KotlinTypeImpl.kt | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/LocalVariableAccessorDescriptor.kt b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/LocalVariableAccessorDescriptor.kt index a8f411693fd..26c41901a12 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/LocalVariableAccessorDescriptor.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/LocalVariableAccessorDescriptor.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.utils.addToStdlib.singletonList sealed class LocalVariableAccessorDescriptor( - override val correspondingVariable: LocalVariableDescriptor, + final override val correspondingVariable: LocalVariableDescriptor, isGetter: Boolean ) : SimpleFunctionDescriptorImpl( correspondingVariable.containingDeclaration, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt index 4273c39bdb2..14fc562d0f1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt @@ -81,7 +81,7 @@ abstract class KtCodeFragment( return clone } - override fun getViewProvider() = viewProvider + final override fun getViewProvider() = viewProvider override fun getThisType() = thisType diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt index a2d086360a0..b9872814f94 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt @@ -60,7 +60,7 @@ class JavaResolverComponents( moduleClassResolver, packageMapper, supertypeLoopChecker, lookupTracker, module, reflectionTypes) } -open class LazyJavaResolverContext( +class LazyJavaResolverContext( val components: JavaResolverComponents, val typeParameterResolver: TypeParameterResolver ) { diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/ImplicitClassReceiver.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/ImplicitClassReceiver.kt index 69296eadd93..457ccb36aa1 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/ImplicitClassReceiver.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/ImplicitClassReceiver.kt @@ -28,7 +28,7 @@ interface ThisClassReceiver : ReceiverValue { /** * Same but implicit only */ -open class ImplicitClassReceiver(override val classDescriptor: ClassDescriptor) : ThisClassReceiver, ImplicitReceiver { +open class ImplicitClassReceiver(final override val classDescriptor: ClassDescriptor) : ThisClassReceiver, ImplicitReceiver { override fun getType() = classDescriptor.defaultType diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/KotlinTypeImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/types/KotlinTypeImpl.kt index 81e7104016c..83e638e7322 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/KotlinTypeImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/types/KotlinTypeImpl.kt @@ -23,10 +23,10 @@ import org.jetbrains.kotlin.resolve.scopes.MemberScope open class KotlinTypeImpl private constructor( override val annotations: Annotations, - override val constructor: TypeConstructor, + final override val constructor: TypeConstructor, override val isMarkedNullable: Boolean, override val arguments: List, - override val memberScope: MemberScope + final override val memberScope: MemberScope ) : AbstractKotlinType() { companion object {