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

KotlinElementActionsFactory.createChangeModifierActions modernisation

Browse Source 
to allow IDEA relatively safely remove `createChangeModifierActions(target: JvmModifiersOwner, request: MemberRequest.Modifier)` in 192
This commit is contained in:
Nicolay Mitropolsky
2019-04-28 17:30:21 +03:00
parent 4b99d85322
commit bd16c4629a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt
+5 -2
View File
@@ -208,11 +208,11 @@ class KotlinElementActionsFactory : JvmElementActionsFactory() {
return TypeInfo.ByExplicitCandidateTypes(candidateTypes.toList()) return TypeInfo.ByExplicitCandidateTypes(candidateTypes.toList())
} }
override fun createChangeModifierActions(target: JvmModifiersOwner, request: MemberRequest.Modifier): List<IntentionAction> { override fun createChangeModifierActions(target: JvmModifiersOwner, request: ChangeModifierRequest): List<IntentionAction> {
val kModifierOwner = target.toKtElement<KtModifierListOwner>() ?: return emptyList() val kModifierOwner = target.toKtElement<KtModifierListOwner>() ?: return emptyList()
val modifier = request.modifier val modifier = request.modifier
val shouldPresent = request.shouldPresent val shouldPresent = request.shouldBePresent()
//TODO: make similar to `createAddMethodActions` //TODO: make similar to `createAddMethodActions`
val (kToken, shouldPresentMapped) = when { val (kToken, shouldPresentMapped) = when {
modifier == JvmModifier.FINAL -> KtTokens.OPEN_KEYWORD to !shouldPresent modifier == JvmModifier.FINAL -> KtTokens.OPEN_KEYWORD to !shouldPresent
@@ -231,6 +231,9 @@ class KotlinElementActionsFactory : JvmElementActionsFactory() {
return listOfNotNull(action) return listOfNotNull(action)
} }
override fun createChangeModifierActions(target: JvmModifiersOwner, request: MemberRequest.Modifier): List<IntentionAction> =
createChangeModifierActions(target, modifierRequest(request.modifier, request.shouldPresent))
override fun createAddConstructorActions(targetClass: JvmClass, request: CreateConstructorRequest): List<IntentionAction> { override fun createAddConstructorActions(targetClass: JvmClass, request: CreateConstructorRequest): List<IntentionAction> {
val targetKtClass = targetClass.toKtClassOrFile() as? KtClass ?: return emptyList() val targetKtClass = targetClass.toKtClassOrFile() as? KtClass ?: return emptyList()