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

Reformat: Convert to primary constructor

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-05-08 17:42:59 +03:00
parent a41064295b
commit 67d2abbe5e
1 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/ConvertSecondaryConstructorToPrimaryIntention.kt
+27 -26
View File
@@ -34,18 +34,18 @@ import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
import org.jetbrains.kotlin.util.kind import org.jetbrains.kotlin.util.kind
class ConvertSecondaryConstructorToPrimaryInspection : IntentionBasedInspection<KtSecondaryConstructor>( class ConvertSecondaryConstructorToPrimaryInspection : IntentionBasedInspection<KtSecondaryConstructor>(
ConvertSecondaryConstructorToPrimaryIntention::class, ConvertSecondaryConstructorToPrimaryIntention::class,
{ constructor -> constructor.containingClass()?.secondaryConstructors?.size == 1 } { constructor -> constructor.containingClass()?.secondaryConstructors?.size == 1 }
) { ) {
override fun inspectionTarget(element: KtSecondaryConstructor) = element.getConstructorKeyword() override fun inspectionTarget(element: KtSecondaryConstructor) = element.getConstructorKeyword()
} }
class ConvertSecondaryConstructorToPrimaryIntention : SelfTargetingRangeIntention<KtSecondaryConstructor>( class ConvertSecondaryConstructorToPrimaryIntention : SelfTargetingRangeIntention<KtSecondaryConstructor>(
KtSecondaryConstructor::class.java, KtSecondaryConstructor::class.java,
"Convert to primary constructor" "Convert to primary constructor"
) { ) {
private tailrec fun ConstructorDescriptor.isReachableByDelegationFrom( private tailrec fun ConstructorDescriptor.isReachableByDelegationFrom(
constructor: ConstructorDescriptor, context: BindingContext, visited: Set<ConstructorDescriptor> = emptySet() constructor: ConstructorDescriptor, context: BindingContext, visited: Set<ConstructorDescriptor> = emptySet()
): Boolean { ): Boolean {
if (constructor == this) return true if (constructor == this) return true
if (constructor in visited) return false if (constructor in visited) return false
@@ -73,7 +73,7 @@ class ConvertSecondaryConstructorToPrimaryIntention : SelfTargetingRangeIntentio
} }
private fun KtExpression.tryConvertToPropertyByParameterInitialization( private fun KtExpression.tryConvertToPropertyByParameterInitialization(
constructorDescriptor: ConstructorDescriptor, context: BindingContext constructorDescriptor: ConstructorDescriptor, context: BindingContext
): Pair<ValueParameterDescriptor, PropertyDescriptor>? { ): Pair<ValueParameterDescriptor, PropertyDescriptor>? {
if (this !is KtBinaryExpression || operationToken != KtTokens.EQ) return null if (this !is KtBinaryExpression || operationToken != KtTokens.EQ) return null
val rightReference = right as? KtReferenceExpression ?: return null val rightReference = right as? KtReferenceExpression ?: return null
@@ -93,21 +93,22 @@ class ConvertSecondaryConstructorToPrimaryIntention : SelfTargetingRangeIntentio
} }
private fun KtSecondaryConstructor.extractInitializer( private fun KtSecondaryConstructor.extractInitializer(
parameterToPropertyMap: MutableMap<ValueParameterDescriptor, PropertyDescriptor>, parameterToPropertyMap: MutableMap<ValueParameterDescriptor, PropertyDescriptor>,
context: BindingContext, context: BindingContext,
factory: KtPsiFactory factory: KtPsiFactory
): KtClassInitializer? { ): KtClassInitializer? {
val constructorDescriptor = context[BindingContext.CONSTRUCTOR, this] ?: return null val constructorDescriptor = context[BindingContext.CONSTRUCTOR, this] ?: return null
val initializer = factory.createAnonymousInitializer() as? KtClassInitializer val initializer = factory.createAnonymousInitializer() as? KtClassInitializer
for (statement in bodyExpression?.statements ?: emptyList()) { for (statement in bodyExpression?.statements ?: emptyList()) {
val (rightDescriptor, leftDescriptor) = statement.tryConvertToPropertyByParameterInitialization(constructorDescriptor, context) val (rightDescriptor, leftDescriptor) =
?: with(initializer) { statement.tryConvertToPropertyByParameterInitialization(constructorDescriptor, context)
(initializer?.body as? KtBlockExpression)?.let { ?: with(initializer) {
it.addBefore(statement.copy(), it.rBrace) (initializer?.body as? KtBlockExpression)?.let {
it.addBefore(factory.createNewLine(), it.rBrace) it.addBefore(statement.copy(), it.rBrace)
} it.addBefore(factory.createNewLine(), it.rBrace)
null to null }
} null to null
}
if (rightDescriptor == null || leftDescriptor == null) continue if (rightDescriptor == null || leftDescriptor == null) continue
parameterToPropertyMap[rightDescriptor] = leftDescriptor parameterToPropertyMap[rightDescriptor] = leftDescriptor
} }
@@ -115,10 +116,10 @@ class ConvertSecondaryConstructorToPrimaryIntention : SelfTargetingRangeIntentio
} }
private fun KtSecondaryConstructor.moveParametersToPrimaryConstructorAndInitializers( private fun KtSecondaryConstructor.moveParametersToPrimaryConstructorAndInitializers(
primaryConstructor: KtPrimaryConstructor, primaryConstructor: KtPrimaryConstructor,
parameterToPropertyMap: MutableMap<ValueParameterDescriptor, PropertyDescriptor>, parameterToPropertyMap: MutableMap<ValueParameterDescriptor, PropertyDescriptor>,
context: BindingContext, context: BindingContext,
factory: KtPsiFactory factory: KtPsiFactory
) { ) {
val parameterList = primaryConstructor.valueParameterList!! val parameterList = primaryConstructor.valueParameterList!!
for (parameter in valueParameters) { for (parameter in valueParameters) {
@@ -131,7 +132,8 @@ class ConvertSecondaryConstructorToPrimaryIntention : SelfTargetingRangeIntentio
if (property != null) { if (property != null) {
if (propertyDescriptor.name == parameterDescriptor.name && if (propertyDescriptor.name == parameterDescriptor.name &&
propertyDescriptor.type == parameterDescriptor.type && propertyDescriptor.type == parameterDescriptor.type &&
propertyDescriptor.accessors.all { it.isDefault }) { propertyDescriptor.accessors.all { it.isDefault }
) {
propertyCommentSaver = CommentSaver(property) propertyCommentSaver = CommentSaver(property)
val valOrVar = if (property.isVar) factory.createVarKeyword() else factory.createValKeyword() val valOrVar = if (property.isVar) factory.createVarKeyword() else factory.createValKeyword()
newParameter.addBefore(valOrVar, newParameter.nameIdentifier) newParameter.addBefore(valOrVar, newParameter.nameIdentifier)
@@ -141,8 +143,7 @@ class ConvertSecondaryConstructorToPrimaryIntention : SelfTargetingRangeIntentio
newParameter.addBefore(newModifiers, newParameter.valOrVarKeyword) newParameter.addBefore(newModifiers, newParameter.valOrVarKeyword)
} }
property.delete() property.delete()
} } else {
else {
property.initializer = factory.createSimpleName(parameterDescriptor.name.asString()) property.initializer = factory.createSimpleName(parameterDescriptor.name.asString())
} }
} }
@@ -172,14 +173,14 @@ class ConvertSecondaryConstructorToPrimaryIntention : SelfTargetingRangeIntentio
val type = context[BindingContext.TYPE, typeReference] val type = context[BindingContext.TYPE, typeReference]
if ((type?.constructor?.declarationDescriptor as? ClassifierDescriptorWithTypeParameters)?.kind == ClassKind.CLASS) { if ((type?.constructor?.declarationDescriptor as? ClassifierDescriptorWithTypeParameters)?.kind == ClassKind.CLASS) {
val superTypeCallEntry = factory.createSuperTypeCallEntry( val superTypeCallEntry = factory.createSuperTypeCallEntry(
"${typeReference.text}${argumentList?.text ?: "()"}" "${typeReference.text}${argumentList?.text ?: "()"}"
) )
superTypeListEntry.replace(superTypeCallEntry) superTypeListEntry.replace(superTypeCallEntry)
break break
} }
} }
with (constructorInClass.replace(constructor)) { with(constructorInClass.replace(constructor)) {
constructorCommentSaver.restore(this) constructorCommentSaver.restore(this)
} }