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

Fixes after review: ConvertMemberToExtensionIntention.convert moved to companion object

Browse Source
This commit is contained in:
qx
2017-05-04 13:37:57 +03:00
parent f163788821
commit 0ba4a82ca6
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtensionIntention.kt
+6 -4
View File
@@ -70,10 +70,6 @@ class ConvertMemberToExtensionIntention : SelfTargetingRangeIntention<KtCallable
} }
} }
fun convert(element: KtCallableDeclaration): KtCallableDeclaration {
return createExtensionCallableAndPrepareBodyToSelect(element).first
}
private fun createExtensionCallableAndPrepareBodyToSelect(element: KtCallableDeclaration): Pair<KtCallableDeclaration, KtExpression?> { private fun createExtensionCallableAndPrepareBodyToSelect(element: KtCallableDeclaration): Pair<KtCallableDeclaration, KtExpression?> {
val descriptor = element.resolveToDescriptor() val descriptor = element.resolveToDescriptor()
val containingClass = descriptor.containingDeclaration as ClassDescriptor val containingClass = descriptor.containingDeclaration as ClassDescriptor
@@ -211,4 +207,10 @@ class ConvertMemberToExtensionIntention : SelfTargetingRangeIntention<KtCallable
val text = allTypeParameters.map { it.text }.joinToString(",", "<", ">") val text = allTypeParameters.map { it.text }.joinToString(",", "<", ">")
return KtPsiFactory(member).createDeclaration<KtFunction>("fun $text foo()").typeParameterList return KtPsiFactory(member).createDeclaration<KtFunction>("fun $text foo()").typeParameterList
} }
companion object {
fun convert(element: KtCallableDeclaration): KtCallableDeclaration {
return ConvertMemberToExtensionIntention().createExtensionCallableAndPrepareBodyToSelect(element).first
}
}
} }
idea/src/org/jetbrains/kotlin/idea/quickfix/migration/MigrateExternalExtensionFix.kt
+1 -1
View File
@@ -75,7 +75,7 @@ class MigrateExternalExtensionFix(declaration: KtNamedDeclaration)
convertNativeAnnotationToJsName(memberDeclaration, annotations) convertNativeAnnotationToJsName(memberDeclaration, annotations)
annotations.nativeAnnotation.delete() annotations.nativeAnnotation.delete()
} else { } else {
val externalDeclaration = ConvertMemberToExtensionIntention().convert(memberDeclaration) val externalDeclaration = ConvertMemberToExtensionIntention.convert(memberDeclaration)
fixExtensionMemberDeclaration(externalDeclaration, null) fixExtensionMemberDeclaration(externalDeclaration, null)
} }
} }