azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extract Function: Fix replacement of references with class receivers (objects, class objects, enum classes)

Browse Source
This commit is contained in:
Alexey Sedunov
2014-05-23 18:13:39 +04:00
parent 240f033f4f
commit 3d6fc6e015
8 changed files with 117 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt
+14 -7
View File
@@ -331,14 +331,21 @@ private fun ExtractionData.inferParametersInfo(
val hasThisReceiver = thisDescriptor != null
val thisExpr = ref.getParent() as? JetThisExpression
val hasClassObjectReceiver = (thisDescriptor as? ClassDescriptor)?.getKind() == ClassKind.CLASS_OBJECT
val classObjectClassDescriptor =
if (hasClassObjectReceiver) thisDescriptor!!.getContainingDeclaration() as? ClassDescriptor else null
val typeDescriptor = ((thisDescriptor ?: originalDescriptor) as? ClassDescriptor)?.let {
when(it.getKind()) {
ClassKind.OBJECT, ClassKind.ENUM_CLASS -> it
ClassKind.CLASS_OBJECT, ClassKind.ENUM_ENTRY -> it.getContainingDeclaration() as? ClassDescriptor
else -> null
}
}
if (classObjectClassDescriptor != null) {
assert (classObjectClassDescriptor.canBeReferencedViaImport(), "Class object should be allowed only for importable classes: className = ${classObjectClassDescriptor.getName().asString()}")
replacementMap[refInfo.offsetInBody] = FqNameReplacement(DescriptorUtils.getFqNameSafe(originalDescriptor))
if (typeDescriptor != null) {
if (typeDescriptor.canBeReferencedViaImport()) {
replacementMap[refInfo.offsetInBody] = FqNameReplacement(DescriptorUtils.getFqNameSafe(originalDescriptor))
}
else {
nonDenotableTypes.add(typeDescriptor.getDefaultType())
}
}
else {
val extractThis = hasThisReceiver || thisExpr != null