From 96ae881c163467c0ef1d7521dbc6b0534e0b1889 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Fri, 25 Nov 2016 11:40:58 +0300
Subject: [PATCH] Cleanup: join declaration & assignment applied

---
 .../rendering/diagnosticsWithParameterRenderers.kt   |  6 +-----
 .../debugger/stepping/KotlinBasicStepMethodFilter.kt | 12 ++++--------
 .../kotlin/idea/quickfix/LetImplementInterfaceFix.kt | 11 +++++------
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/diagnosticsWithParameterRenderers.kt b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/diagnosticsWithParameterRenderers.kt
index 7aeccb37281..b897d8e5956 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/diagnosticsWithParameterRenderers.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/diagnosticsWithParameterRenderers.kt
@@ -21,11 +21,7 @@ import java.text.MessageFormat
 
 
 abstract class AbstractDiagnosticWithParametersRenderer<D : Diagnostic> protected constructor(message: String) : DiagnosticRenderer<D> {
-    private val messageFormat: MessageFormat
-
-    init {
-        messageFormat = MessageFormat(message)
-    }
+    private val messageFormat = MessageFormat(message)
 
     override fun render(obj: D): String {
         return messageFormat.format(renderParameters(obj))
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinBasicStepMethodFilter.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinBasicStepMethodFilter.kt
index a3e620178d2..e00cdbfbd72 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinBasicStepMethodFilter.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinBasicStepMethodFilter.kt
@@ -34,14 +34,10 @@ class KotlinBasicStepMethodFilter(
         val descriptor: CallableDescriptor,
         val myCallingExpressionLines: Range<Int>
 ) : NamedMethodFilter {
-    private val myTargetMethodName: String
-
-    init {
-        myTargetMethodName = when (descriptor) {
-            is ClassDescriptor, is ConstructorDescriptor -> "<init>"
-            is PropertyAccessorDescriptor -> JvmAbi.getterName(descriptor.correspondingProperty.name.asString())
-            else -> descriptor.name.asString()
-        }
+    private val myTargetMethodName = when (descriptor) {
+        is ClassDescriptor, is ConstructorDescriptor -> "<init>"
+        is PropertyAccessorDescriptor -> JvmAbi.getterName(descriptor.correspondingProperty.name.asString())
+        else -> descriptor.name.asString()
     }
 
     override fun getCallingExpressionLines() = myCallingExpressionLines
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/LetImplementInterfaceFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/LetImplementInterfaceFix.kt
index 67ff73107c6..b9a44159259 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/LetImplementInterfaceFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/LetImplementInterfaceFix.kt
@@ -47,7 +47,11 @@ class LetImplementInterfaceFix(
 
     private val prefix: String
 
-    private val validExpectedType: Boolean
+    private val validExpectedType = with (expectedType) {
+        isInterface() &&
+        !containsStarProjections() &&
+        constructor !in TypeUtils.getAllSupertypes(expressionType).map(KotlinType::constructor)
+    }
 
     init {
         val expectedTypeNotNullable = TypeUtils.makeNotNullable(expectedType)
@@ -58,11 +62,6 @@ class LetImplementInterfaceFix(
         val typeDescription = if (element.isObjectLiteral()) "the anonymous object" else "'${expressionType.renderShort()}'"
         prefix = "Let $typeDescription $verb"
 
-        validExpectedType = with (expectedType) {
-            isInterface() &&
-            !containsStarProjections() &&
-            constructor !in TypeUtils.getAllSupertypes(expressionType).map(KotlinType::constructor)
-        }
     }
 
     override fun getFamilyName() = "Let type implement interface"