From 2472966749d7ca9c3e220883df199fb756cd1bbf Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Mon, 22 Jan 2018 11:13:38 +0300
Subject: [PATCH] Remove unused function parameter: minor improvement

---
 .../kotlin/idea/quickfix/RemoveUnusedFunctionParameterFix.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveUnusedFunctionParameterFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveUnusedFunctionParameterFix.kt
index d6f4c4a12c3..f839fffe9a2 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveUnusedFunctionParameterFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveUnusedFunctionParameterFix.kt
@@ -38,15 +38,15 @@ class RemoveUnusedFunctionParameterFix(parameter: KtParameter) : KotlinQuickFixA
 
     override fun invoke(project: Project, editor: Editor?, file: KtFile) {
         val element = element ?: return
-        val primaryConstructor = element.parent?.parent as? KtPrimaryConstructor
-        val parameterList = element.parent as? KtParameterList
         val context = element.analyze()
         val parameterDescriptor = context[BindingContext.VALUE_PARAMETER, element] as? ValueParameterDescriptor ?: return
         ChangeFunctionSignatureFix.runRemoveParameter(parameterDescriptor, element)
+        val parameterList = element.parent as? KtParameterList
         val nextParameter = parameterList?.parameters?.getOrNull(parameterDescriptor.index)
         if (nextParameter != null) {
             editor?.caretModel?.moveToOffset(nextParameter.startOffset)
         }
+        val primaryConstructor = element.parent?.parent as? KtPrimaryConstructor
         if (primaryConstructor != null) {
             val removeConstructorIntention = RemoveEmptyPrimaryConstructorIntention()
             if (removeConstructorIntention.isApplicableTo(primaryConstructor)) {