Minor changes after code review

(cherry picked from commit 12bf8a4)
JetBrains · Mar 20, 2020 · a5ef38a · a5ef38a
1 parent 1c7a952
commit a5ef38a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringAvailability.kt.201 b/...jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringAvailability.kt.201
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.psi.psiUtil.hasBody
 import org.jetbrains.kotlin.renderer.DescriptorRenderer
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.isError
+import kotlin.contracts.contract
 
 class KotlinSuggestedRefactoringAvailability(refactoringSupport: SuggestedRefactoringSupport) :
     SuggestedRefactoringAvailability(refactoringSupport)
@@ -51,6 +52,7 @@ class KotlinSuggestedRefactoringAvailability(refactoringSupport: SuggestedRefact
                 descriptorWithOldSignature.valueParameters[oldIndex].type,
                 descriptorWithNewSignature.valueParameters[newIndex].type
             )
+            // oldType and newType may not be null because arguments of refineType call were all non-null
             improvedOldParameterTypesById[id] = oldType!!
             improvedNewParameterTypesById[id] = newType!!
         }

diff --git a/...rg/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringExecution.kt.201 b/...rg/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringExecution.kt.201
@@ -34,7 +34,10 @@ class KotlinSuggestedRefactoringExecution(
             KotlinTypeInfo(text = newSignature.type, isCovariant = true)
         }
 
-        require(descriptorWithNewSignature.valueParameters.size == newSignature.parameters.size)
+        require(descriptorWithNewSignature.valueParameters.size == newSignature.parameters.size) {
+            "Number of parameters of newSignature is ${newSignature.parameters.size} and of the descriptor is ${descriptorWithNewSignature.valueParameters.size}"
+        }
+
         val parameterTypeInfos = descriptorWithNewSignature.valueParameters.zip(newSignature.parameters)
             .map { (parameterDescriptor, parameterData) ->
                 val type = parameterDescriptor.varargElementType ?: parameterDescriptor.type