From ebd57fafd7aa21d707262b45392fccf7d6bea88d Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Wed, 18 May 2016 18:21:14 +0300
Subject: [PATCH] Cleanup: val can be parameter

---
 .../src/org/jetbrains/kotlin/codegen/BranchedValue.kt       | 2 +-
 .../jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt   | 2 +-
 .../backend/src/org/jetbrains/kotlin/codegen/StackValue.kt  | 2 +-
 .../resolve/lazy/descriptors/LazyScriptClassMemberScope.kt  | 2 +-
 .../kotlin/resolve/lazy/descriptors/LazyScriptDescriptor.kt | 2 +-
 .../kotlin/resolve/calls/tower/InvokeProcessors.kt          | 2 +-
 .../org/jetbrains/kotlin/resolve/calls/tower/TowerLevels.kt | 2 +-
 .../kotlin/load/java/lazy/descriptors/JvmPackageScope.kt    | 2 +-
 .../load/java/lazy/descriptors/LazyJavaClassDescriptor.kt   | 2 +-
 .../kotlin/builtins/functions/FunctionInvokeDescriptor.kt   | 6 +++---
 .../idea/decompiler/stubBuilder/ClassClsStubBuilder.kt      | 2 +-
 .../debugger/render/DelegatedPropertyFieldDescriptor.kt     | 2 +-
 .../idea/quickfix/MakeConstructorParameterPropertyFix.kt    | 2 +-
 .../usages/KotlinWrapperForJavaUsageInfos.kt                | 2 +-
 .../introduceVariable/KotlinVariableInplaceIntroducer.kt    | 4 ++--
 .../ui/KotlinSelectNestedClassRefactoringDialog.kt          | 2 +-
 .../kotlin/idea/refactoring/pullUp/KotlinPullUpDialog.kt    | 2 +-
 17 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/BranchedValue.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/BranchedValue.kt
index 12b57a3a838..5855be28cbd 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/BranchedValue.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/BranchedValue.kt
@@ -249,7 +249,7 @@ class NumberCompare(
 }
 
 class ObjectCompare(
-        val opToken: IElementType,
+        opToken: IElementType,
         operandType: Type,
         left: StackValue,
         right: StackValue
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt
index 16b823d2b6f..d199919bb21 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt
@@ -46,7 +46,7 @@ class MultifileClassPartCodegen(
         private val packageFragment: PackageFragmentDescriptor,
         private val superClassInternalName: String,
         private val shouldGeneratePartHierarchy: Boolean,
-        private val partContext: MultifileClassPartContext,
+        partContext: MultifileClassPartContext,
         state: GenerationState
 ) : MemberCodegen<KtFile>(state, null, partContext, file, v) {
     private val partType = partContext.filePartType
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.kt
index 01bb24a56bc..df4b15e872b 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.kt
@@ -59,7 +59,7 @@ class StackValueWithLeaveTask(
     }
 }
 
-open class OperationStackValue(val resultType: Type, val lambda: (v: InstructionAdapter) -> Unit) : StackValue(resultType) {
+open class OperationStackValue(resultType: Type, val lambda: (v: InstructionAdapter) -> Unit) : StackValue(resultType) {
 
     override fun putSelector(type: Type, v: InstructionAdapter) {
         lambda(v)
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt
index 89c549c1a3e..39a6aab0d8b 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider
 import org.jetbrains.kotlin.utils.toReadOnlyList
 
 class LazyScriptClassMemberScope(
-        private val resolveSession: ResolveSession,
+        resolveSession: ResolveSession,
         declarationProvider: ClassMemberDeclarationProvider,
         private val scriptDescriptor: LazyScriptDescriptor,
         trace: BindingTrace)
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptDescriptor.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptDescriptor.kt
index a85ec5143d6..46fd5cda803 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptDescriptor.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptDescriptor.kt
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.script.ScriptPriorities
 import org.jetbrains.kotlin.types.TypeSubstitutor
 
 class LazyScriptDescriptor(
-        private val resolveSession: ResolveSession,
+        resolveSession: ResolveSession,
         containingDeclaration: DeclarationDescriptor,
         name: Name,
         internal val scriptInfo: KtScriptInfo
diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/InvokeProcessors.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/InvokeProcessors.kt
index c9278dbfec4..b4495940391 100644
--- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/InvokeProcessors.kt
+++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/InvokeProcessors.kt
@@ -87,7 +87,7 @@ abstract class AbstractInvokeTowerProcessor<F : Candidate<FunctionDescriptor>, V
 // todo KT-9522 Allow invoke convention for synthetic property
 class InvokeTowerProcessor<F : Candidate<FunctionDescriptor>, V : Candidate<VariableDescriptor>>(
         invokeContext: InvokeTowerContext<F, V>,
-        private val explicitReceiver: Receiver?
+        explicitReceiver: Receiver?
 ) : AbstractInvokeTowerProcessor<F, V>(
         invokeContext,
         createVariableProcessor(invokeContext.contextForVariable(stripExplicitReceiver = false), explicitReceiver)
diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerLevels.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerLevels.kt
index 6c6a7d8ba3d..2752cef6a94 100644
--- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerLevels.kt
+++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerLevels.kt
@@ -166,7 +166,7 @@ internal open class ScopeBasedTowerLevel protected constructor(
 }
 internal class ImportingScopeBasedTowerLevel(
         scopeTower: ScopeTower,
-        private val importingScope: ImportingScope
+        importingScope: ImportingScope
 ): ScopeBasedTowerLevel(scopeTower, importingScope)
 
 internal class SyntheticScopeBasedTowerLevel(
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/JvmPackageScope.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/JvmPackageScope.kt
index 9c1405f4998..167bbc148f5 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/JvmPackageScope.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/JvmPackageScope.kt
@@ -35,7 +35,7 @@ import org.jetbrains.kotlin.utils.toReadOnlyList
 
 class JvmPackageScope(
         private val c: LazyJavaResolverContext,
-        private val jPackage: JavaPackage,
+        jPackage: JavaPackage,
         private val packageFragment: LazyJavaPackageFragment
 ): MemberScope {
     internal val javaScope = LazyJavaPackageScope(c, jPackage, packageFragment)
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt
index 0b6dff8e7d3..8657114765c 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt
@@ -50,7 +50,7 @@ import org.jetbrains.kotlin.utils.toReadOnlyList
 import java.util.*
 
 class LazyJavaClassDescriptor(
-        private val outerContext: LazyJavaResolverContext,
+        outerContext: LazyJavaResolverContext,
         containingDeclaration: DeclarationDescriptor,
         private val jClass: JavaClass,
         private val additionalSupertypeClassDescriptor: ClassDescriptor? = null
diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionInvokeDescriptor.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionInvokeDescriptor.kt
index cfff308a952..49aae57fd61 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionInvokeDescriptor.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionInvokeDescriptor.kt
@@ -25,9 +25,9 @@ import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.types.Variance
 
 class FunctionInvokeDescriptor private constructor(
-        private val container: DeclarationDescriptor,
-        private val original: FunctionInvokeDescriptor?,
-        private val callableKind: CallableMemberDescriptor.Kind
+        container: DeclarationDescriptor,
+        original: FunctionInvokeDescriptor?,
+        callableKind: CallableMemberDescriptor.Kind
 ) : SimpleFunctionDescriptorImpl(
         container,
         original,
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt
index 1d8a5b71e12..76717292bc1 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt
@@ -56,7 +56,7 @@ fun createClassStub(
 private class ClassClsStubBuilder(
         private val parentStub: StubElement<out PsiElement>,
         private val classProto: ProtoBuf.Class,
-        private val nameResolver: NameResolver,
+        nameResolver: NameResolver,
         private val classId: ClassId,
         source: SourceElement?,
         outerContext: ClsStubBuilderContext
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/render/DelegatedPropertyFieldDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/render/DelegatedPropertyFieldDescriptor.kt
index 0dbbb331c5b..81d8d86863e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/render/DelegatedPropertyFieldDescriptor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/render/DelegatedPropertyFieldDescriptor.kt
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.name.Name
 
 class DelegatedPropertyFieldDescriptor(
         project: Project,
-        val objectRef: ObjectReference,
+        objectRef: ObjectReference,
         val delegate: Field,
         val renderDelegatedProperty: Boolean
 ) : FieldDescriptorImpl(project, objectRef, delegate) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeConstructorParameterPropertyFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeConstructorParameterPropertyFix.kt
index 0f8a30f5956..2f022719d0b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeConstructorParameterPropertyFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeConstructorParameterPropertyFix.kt
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getAssignmentByLHS
 import org.jetbrains.kotlin.psi.psiUtil.nonStaticOuterClasses
 
 class MakeConstructorParameterPropertyFix(
-        element: KtParameter, private val kotlinValVar: KotlinValVar, private val className: String?
+        element: KtParameter, private val kotlinValVar: KotlinValVar, className: String?
 ) : KotlinQuickFixAction<KtParameter>(element) {
     override fun getFamilyName() = "Make primary constructor parameter a property"
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinWrapperForJavaUsageInfos.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinWrapperForJavaUsageInfos.kt
index 809de2dc9f7..d73bf071bbe 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinWrapperForJavaUsageInfos.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinWrapperForJavaUsageInfos.kt
@@ -23,7 +23,7 @@ import com.intellij.usageView.UsageInfo
 class KotlinWrapperForJavaUsageInfos(
         val javaChangeInfo: JavaChangeInfo,
         val javaUsageInfos: Array<UsageInfo>,
-        val primaryMethod: PsiElement
+        primaryMethod: PsiElement
 ): UsageInfo(primaryMethod) {
     override fun hashCode() = javaChangeInfo.method.hashCode()
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinVariableInplaceIntroducer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinVariableInplaceIntroducer.kt
index 05c3f845578..5a42f6e7a21 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinVariableInplaceIntroducer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinVariableInplaceIntroducer.kt
@@ -42,8 +42,8 @@ import org.jetbrains.kotlin.types.KotlinType
 
 class KotlinVariableInplaceIntroducer(
         val addedVariable: KtProperty,
-        val originalExpression: KtExpression?,
-        val occurrencesToReplace: Array<KtExpression>,
+        originalExpression: KtExpression?,
+        occurrencesToReplace: Array<KtExpression>,
         suggestedNames: Collection<String>,
         val isVar: Boolean,
         val doNotChangeVar: Boolean,
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/KotlinSelectNestedClassRefactoringDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/KotlinSelectNestedClassRefactoringDialog.kt
index 8bd3d2d6036..62664ac85f9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/KotlinSelectNestedClassRefactoringDialog.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/KotlinSelectNestedClassRefactoringDialog.kt
@@ -29,7 +29,7 @@ import java.awt.BorderLayout
 import javax.swing.*
 
 internal class KotlinSelectNestedClassRefactoringDialog private constructor (
-        private val project: Project,
+        project: Project,
         private val nestedClass: KtClassOrObject,
         private val targetContainer: PsiElement?
 ) : DialogWrapper(project, true) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpDialog.kt
index 085338221eb..e4fd07c0e1a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpDialog.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpDialog.kt
@@ -34,7 +34,7 @@ import org.jetbrains.kotlin.psi.*
 
 class KotlinPullUpDialog(
         project: Project,
-        private val classOrObject: KtClassOrObject,
+        classOrObject: KtClassOrObject,
         superClasses: List<PsiNamedElement>,
         memberInfoStorage: KotlinMemberInfoStorage
 ) : KotlinPullUpDialogBase(