From 63acb194139c18c6ac87001f8893ab71dcec922c Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Wed, 4 Mar 2015 15:16:01 +0300 Subject: [PATCH] Minor: treat default objects as ordinary objects in ExtractionData.inferParametersInfo() --- .../introduce/extractionEngine/extractableAnalysisUtil.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt index d72f119ad23..8b25a658a3a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt @@ -599,8 +599,8 @@ private fun ExtractionData.inferParametersInfo( when (it) { is ClassDescriptor -> when(it.getKind()) { - ClassKind.OBJECT, ClassKind.ENUM_CLASS -> it : ClassDescriptor - ClassKind.CLASS_OBJECT, ClassKind.ENUM_ENTRY -> it.getContainingDeclaration() as? ClassDescriptor + ClassKind.CLASS_OBJECT, ClassKind.OBJECT, ClassKind.ENUM_CLASS -> it : ClassDescriptor + ClassKind.ENUM_ENTRY -> it.getContainingDeclaration() as? ClassDescriptor else -> if (ref.getNonStrictParentOfType() != null) it : ClassDescriptor else null }