From e63951c38c8b356a0c2a2f7729be1cd6c0f00742 Mon Sep 17 00:00:00 2001
From: Andrei Klunnyi <andrei.klunnyi@jetbrains.com>
Date: Tue, 21 Jul 2020 13:42:51 +0200
Subject: [PATCH] EA-235765 // NPE at refactoring suggestion

Fixed exception:
java.lang.NullPointerException: null cannot be cast to non-null type
org.jetbrains.kotlin.descriptors.CallableDescriptor

More info: https://ea.jetbrains.com/browser/ea_problems/235765
---
 .../KotlinSuggestedRefactoringAvailability.kt   | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringAvailability.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringAvailability.kt
index 288bb7f2f25..c6c3929509f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringAvailability.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringAvailability.kt
@@ -4,7 +4,6 @@ import com.intellij.openapi.util.Key
 import com.intellij.psi.PsiNamedElement
 import com.intellij.psi.search.LocalSearchScope
 import com.intellij.psi.search.searches.ReferencesSearch
-import com.intellij.psi.util.parents
 import com.intellij.refactoring.suggested.*
 import com.intellij.refactoring.suggested.SuggestedRefactoringSupport.Parameter
 import com.intellij.refactoring.suggested.SuggestedRefactoringSupport.Signature
@@ -48,8 +47,8 @@ class KotlinSuggestedRefactoringAvailability(refactoringSupport: SuggestedRefact
         val oldDeclaration = state.restoredDeclarationCopy() as? KtCallableDeclaration ?: return state
         oldDeclaration.containingKtFile.forcedModuleInfo = newDeclaration.getModuleInfo()
 
-        val descriptorWithOldSignature = oldDeclaration.resolveToDescriptorIfAny() as CallableDescriptor
-        val descriptorWithNewSignature = newDeclaration.resolveToDescriptorIfAny() as CallableDescriptor
+        val descriptorWithOldSignature = oldDeclaration.resolveToDescriptorIfAny() as CallableDescriptor?
+        val descriptorWithNewSignature = newDeclaration.resolveToDescriptorIfAny() as CallableDescriptor?
 
         val oldSignature = state.oldSignature
         val newSignature = state.newSignature
@@ -57,8 +56,8 @@ class KotlinSuggestedRefactoringAvailability(refactoringSupport: SuggestedRefact
         val (oldReturnType, newReturnType) = refineType(
             oldSignature.type,
             newSignature.type,
-            descriptorWithOldSignature.returnType,
-            descriptorWithNewSignature.returnType
+            descriptorWithOldSignature?.returnType,
+            descriptorWithNewSignature?.returnType
         )
 
         val improvedOldParameterTypesById = mutableMapOf<Any, String>()
@@ -71,8 +70,8 @@ class KotlinSuggestedRefactoringAvailability(refactoringSupport: SuggestedRefact
             val (oldType, newType) = refineType(
                 oldParameter.type,
                 newParameter.type,
-                descriptorWithOldSignature.valueParameters[oldIndex].type,
-                descriptorWithNewSignature.valueParameters[newIndex].type
+                descriptorWithOldSignature?.valueParameters?.get(oldIndex)?.type,
+                descriptorWithNewSignature?.valueParameters?.get(newIndex)?.type
             )
             // oldType and newType may not be null because arguments of refineType call were all non-null
             improvedOldParameterTypesById[id] = oldType!!
@@ -86,8 +85,8 @@ class KotlinSuggestedRefactoringAvailability(refactoringSupport: SuggestedRefact
         val (oldReceiverType, newReceiverType) = refineType(
             oldAdditionalData?.receiverType,
             newAdditionalData?.receiverType,
-            descriptorWithOldSignature.extensionReceiverParameter?.type,
-            descriptorWithNewSignature.extensionReceiverParameter?.type
+            descriptorWithOldSignature?.extensionReceiverParameter?.type,
+            descriptorWithNewSignature?.extensionReceiverParameter?.type
         )
 
         return state