From 0d42d3f0a1cca372698201c6f2b80bca521ae446 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Tue, 30 Jul 2019 12:58:03 +0300 Subject: [PATCH] Fix CCE in move-refactoring It happens when companion object's descriptor doesn't correspond to PSI object declaration #EA-126981 fixed --- .../org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt index dc3863b1dec..33d4b035802 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt @@ -128,7 +128,8 @@ fun KtElement.processInternalReferencesToUpdateOnPackageNameChange( if (descriptor.isCompanionObject() && bindingContext[BindingContext.SHORT_REFERENCE_TO_COMPANION_OBJECT, refExpr] != null ) { - result = (result as KtObjectDeclaration).containingClassOrObject ?: result + if (result !is KtObjectDeclaration) return@lazy null + result = result.containingClassOrObject ?: result } result