From f21603daf250b8824047f0bf482499e10a624615 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Fri, 13 Nov 2015 15:13:01 +0300
Subject: [PATCH] Source code fix according to KT-4475

---
 .../createFromUsage/callableBuilder/CallableBuilder.kt |  8 ++++----
 .../createFromUsage/callableBuilder/typeUtils.kt       | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
index 4110ab49b2d..415287dd5e5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
@@ -143,16 +143,16 @@ class CallableBuilder(val config: CallableBuilderConfiguration) {
     val currentFileContext: BindingContext
     val currentFileModule: ModuleDescriptor
 
-    val pseudocode: Pseudocode? by lazy { config.originalElement.getContainingPseudocode(currentFileContext) }
-
-    private val typeCandidates = HashMap<TypeInfo, List<TypeCandidate>>()
-
     init {
         val result = config.currentFile.analyzeFullyAndGetResult()
         currentFileContext = result.bindingContext
         currentFileModule = result.moduleDescriptor
     }
 
+    val pseudocode: Pseudocode? by lazy { config.originalElement.getContainingPseudocode(currentFileContext) }
+
+    private val typeCandidates = HashMap<TypeInfo, List<TypeCandidate>>()
+
     public var placement: CallablePlacement by Delegates.notNull()
 
     private val elementsToShorten = ArrayList<KtElement>()
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt
index 85bb6effe00..1e9ec2891fa 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt
@@ -53,18 +53,18 @@ private fun KotlinType.render(typeParameterNameMap: Map<TypeParameterDescriptor,
 
                 val typeParameter = it.key
 
-                var wrappingTypeParameter: TypeParameterDescriptor
+                var wrappingTypeParameter: TypeParameterDescriptor? = null
                 var wrappingTypeConstructor: TypeConstructor
 
+                wrappingTypeConstructor = object : TypeConstructor by typeParameter.typeConstructor {
+                    override fun getDeclarationDescriptor() = wrappingTypeParameter
+                }
+
                 wrappingTypeParameter = object : TypeParameterDescriptor by typeParameter {
                     override fun getName() = name
                     override fun getTypeConstructor() = wrappingTypeConstructor
                 }
 
-                wrappingTypeConstructor = object : TypeConstructor by typeParameter.typeConstructor {
-                    override fun getDeclarationDescriptor() = wrappingTypeParameter
-                }
-
                 val wrappingType = object : KotlinType by typeParameter.defaultType {
                     override fun getConstructor() = wrappingTypeConstructor
                 }