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

KotlinChangeSignatureData: cleanup code

Browse Source
This commit is contained in:
Dmitry Gridin
2019-09-03 18:30:42 +07:00
parent 7271e65851
commit cbdda6f9a8
1 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureData.kt
+26 -25
View File
@@ -41,9 +41,9 @@ import org.jetbrains.kotlin.utils.SmartList
import java.util.* import java.util.*
class KotlinChangeSignatureData( class KotlinChangeSignatureData(
override val baseDescriptor: CallableDescriptor, override val baseDescriptor: CallableDescriptor,
override val baseDeclaration: PsiElement, override val baseDeclaration: PsiElement,
private val descriptorsForSignatureChange: Collection<CallableDescriptor> private val descriptorsForSignatureChange: Collection<CallableDescriptor>
) : KotlinMethodDescriptor { ) : KotlinMethodDescriptor {
private val parameters: List<KotlinParameterInfo> private val parameters: List<KotlinParameterInfo>
override val receiver: KotlinParameterInfo? override val receiver: KotlinParameterInfo?
@@ -57,30 +57,32 @@ class KotlinChangeSignatureData(
else -> null else -> null
} }
parameters = baseDescriptor.valueParameters parameters = baseDescriptor.valueParameters
.mapTo(receiver?.let{ arrayListOf(it) } ?: arrayListOf()) { parameterDescriptor -> .mapTo(receiver?.let { arrayListOf(it) } ?: arrayListOf()) { parameterDescriptor ->
val jetParameter = valueParameters?.get(parameterDescriptor.index) val jetParameter = valueParameters?.get(parameterDescriptor.index)
val parameterType = parameterDescriptor.type val parameterType = parameterDescriptor.type
val parameterTypeText = jetParameter?.typeReference?.text val parameterTypeText = jetParameter?.typeReference?.text
?: IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.renderType(parameterType) ?: IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.renderType(parameterType)
KotlinParameterInfo( KotlinParameterInfo(
callableDescriptor = baseDescriptor, callableDescriptor = baseDescriptor,
originalIndex = parameterDescriptor.index, originalIndex = parameterDescriptor.index,
name = parameterDescriptor.name.asString().quoteIfNeeded(), name = parameterDescriptor.name.asString().quoteIfNeeded(),
originalTypeInfo = KotlinTypeInfo(false, parameterType, parameterTypeText), originalTypeInfo = KotlinTypeInfo(false, parameterType, parameterTypeText),
defaultValueForParameter = jetParameter?.defaultValue, defaultValueForParameter = jetParameter?.defaultValue,
valOrVar = jetParameter?.valOrVarKeyword.toValVar() valOrVar = jetParameter?.valOrVarKeyword.toValVar()
) )
} }
} }
private fun createReceiverInfoIfNeeded(): KotlinParameterInfo? { private fun createReceiverInfoIfNeeded(): KotlinParameterInfo? {
val receiverType = baseDescriptor.extensionReceiverParameter?.type ?: return null val receiverType = baseDescriptor.extensionReceiverParameter?.type ?: return null
val receiverName = suggestReceiverNames(baseDeclaration.project, baseDescriptor).first() val receiverName = suggestReceiverNames(baseDeclaration.project, baseDescriptor).first()
val receiverTypeText = (baseDeclaration as? KtCallableDeclaration)?.receiverTypeReference?.text val receiverTypeText = (baseDeclaration as? KtCallableDeclaration)?.receiverTypeReference?.text
?: IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.renderType(receiverType) ?: IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.renderType(receiverType)
return KotlinParameterInfo(callableDescriptor = baseDescriptor, return KotlinParameterInfo(
name = receiverName, callableDescriptor = baseDescriptor,
originalTypeInfo = KotlinTypeInfo(false, receiverType, receiverTypeText)) name = receiverName,
originalTypeInfo = KotlinTypeInfo(false, receiverType, receiverTypeText)
)
} }
override val original: KotlinMethodDescriptor override val original: KotlinMethodDescriptor
@@ -89,7 +91,7 @@ class KotlinChangeSignatureData(
override val primaryCallables: Collection<KotlinCallableDefinitionUsage<PsiElement>> by lazy { override val primaryCallables: Collection<KotlinCallableDefinitionUsage<PsiElement>> by lazy {
descriptorsForSignatureChange.map { descriptorsForSignatureChange.map {
val declaration = DescriptorToSourceUtilsIde.getAnyDeclaration(baseDeclaration.project, it) val declaration = DescriptorToSourceUtilsIde.getAnyDeclaration(baseDeclaration.project, it)
assert(declaration != null) { "No declaration found for " + baseDescriptor } assert(declaration != null) { "No declaration found for $baseDescriptor" }
KotlinCallableDefinitionUsage(declaration!!, it, null, null) KotlinCallableDefinitionUsage(declaration!!, it, null, null)
} }
} }
@@ -104,8 +106,7 @@ class KotlinChangeSignatureData(
if (primaryDeclaration.isExpectDeclaration()) { if (primaryDeclaration.isExpectDeclaration()) {
return@flatMapTo primaryDeclaration.actualsForExpected().mapNotNull { return@flatMapTo primaryDeclaration.actualsForExpected().mapNotNull {
val descriptor = it.unsafeResolveToDescriptor() val callableDescriptor = when (val descriptor = it.unsafeResolveToDescriptor()) {
val callableDescriptor = when (descriptor) {
is CallableDescriptor -> descriptor is CallableDescriptor -> descriptor
is ClassDescriptor -> descriptor.unsubstitutedPrimaryConstructor ?: return@mapNotNull null is ClassDescriptor -> descriptor.unsubstitutedPrimaryConstructor ?: return@mapNotNull null
else -> return@mapNotNull null else -> return@mapNotNull null
@@ -166,5 +167,5 @@ class KotlinChangeSignatureData(
override fun canChangeName() = !(baseDescriptor is ConstructorDescriptor || baseDescriptor is AnonymousFunctionDescriptor) override fun canChangeName() = !(baseDescriptor is ConstructorDescriptor || baseDescriptor is AnonymousFunctionDescriptor)
override fun canChangeReturnType(): MethodDescriptor.ReadWriteOption = override fun canChangeReturnType(): MethodDescriptor.ReadWriteOption =
if (baseDescriptor is ConstructorDescriptor) MethodDescriptor.ReadWriteOption.None else MethodDescriptor.ReadWriteOption.ReadWrite if (baseDescriptor is ConstructorDescriptor) MethodDescriptor.ReadWriteOption.None else MethodDescriptor.ReadWriteOption.ReadWrite
} }