From 8d2389d15cd4b1488de300a0b347128356a1de24 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Fri, 17 Jun 2016 16:39:13 +0300
Subject: [PATCH] Code cleanup: "can be constructor property" applied (cherry
 picked from commit 6967711)

---
 .../resolve/diagnostics/SuppressDiagnosticsByAnnotations.kt   | 1 -
 .../introduceProperty/KotlinInplacePropertyIntroducer.kt      | 4 +---
 .../kotlin/js/inline/clean/removeUnusedFunctionDefinitions.kt | 3 +--
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/SuppressDiagnosticsByAnnotations.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/SuppressDiagnosticsByAnnotations.kt
index fa44680dd44..951f0fb7506 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/SuppressDiagnosticsByAnnotations.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/SuppressDiagnosticsByAnnotations.kt
@@ -39,7 +39,6 @@ abstract class SuppressDiagnosticsByAnnotations(
         vararg annotationsFqName: FqName
 ) : SuppressStringProvider {
 
-    private val annotationsFqName = annotationsFqName
     private val stringsToSuppress = diagnosticsToSuppress.map { it.name.toLowerCase() }
     private val expectedFqNames = annotationsFqName.map { it.toString() }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt
index 5cc9a5b294b..a7a65b0cf6b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt
@@ -46,7 +46,7 @@ class KotlinInplacePropertyIntroducer(
         title: String,
         doNotChangeVar: Boolean,
         exprType: KotlinType?,
-        extractionResult: ExtractionResult,
+        private var extractionResult: ExtractionResult,
         private val availableTargets: List<ExtractionTarget>
 ): KotlinInplaceVariableIntroducer<KtProperty>(
         property, editor, project, title, KtExpression.EMPTY_ARRAY, null, false, property, false, doNotChangeVar, exprType, false
@@ -55,8 +55,6 @@ class KotlinInplacePropertyIntroducer(
         assert(availableTargets.isNotEmpty()) { "No targets available: ${property.getElementTextWithContext()}" }
     }
 
-    private var extractionResult = extractionResult
-
     private var currentTarget: ExtractionTarget = extractionResult.config.generatorOptions.target
         set(value: ExtractionTarget) {
             if (value == currentTarget) return
diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/removeUnusedFunctionDefinitions.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/removeUnusedFunctionDefinitions.kt
index b1991a4f06c..49c0a1c5148 100644
--- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/removeUnusedFunctionDefinitions.kt
+++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/removeUnusedFunctionDefinitions.kt
@@ -43,9 +43,8 @@ fun removeUnusedFunctionDefinitions(root: JsNode, functions: Map<JsName, JsFunct
     }.accept(root)
 }
 
-private class UnusedLocalFunctionsCollector(functions: Map<JsName, JsFunction>) : JsVisitorWithContextImpl() {
+private class UnusedLocalFunctionsCollector(private val functions: Map<JsName, JsFunction>) : JsVisitorWithContextImpl() {
     private val tracker = ReferenceTracker<JsName, JsFunction>()
-    private val functions = functions
     private val processed = IdentitySet<JsFunction>()
 
     val removableFunctions: List<JsFunction>