From bc78d672c16ba3d4ea8e0093d36cb97abfe813a7 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 14 Sep 2017 21:10:20 +0300 Subject: [PATCH] Migration: add quick-fix to replace header->expect & impl->actual --- .../kotlin/idea/quickfix/QuickFixRegistrar.kt | 1 + .../idea/quickfix/ReplaceModifierFix.kt | 70 +++++++++++++++++++ .../deprecatedHeader/header/header.kt | 3 + .../deprecatedHeader/header/header.kt.after | 3 + .../deprecatedHeader/jvm/My.kt | 1 + .../deprecatedHeader/jvm/My.kt.after | 1 + .../deprecatedImpl/header/header.kt | 1 + .../deprecatedImpl/header/header.kt.after | 1 + .../deprecatedImpl/jvm/My.kt | 3 + .../deprecatedImpl/jvm/My.kt.after | 3 + .../idea/quickfix/QuickFixMultiModuleTest.kt | 10 +++ 11 files changed, 97 insertions(+) create mode 100644 idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceModifierFix.kt create mode 100644 idea/testData/multiModuleQuickFix/deprecatedHeader/header/header.kt create mode 100644 idea/testData/multiModuleQuickFix/deprecatedHeader/header/header.kt.after create mode 100644 idea/testData/multiModuleQuickFix/deprecatedHeader/jvm/My.kt create mode 100644 idea/testData/multiModuleQuickFix/deprecatedHeader/jvm/My.kt.after create mode 100644 idea/testData/multiModuleQuickFix/deprecatedImpl/header/header.kt create mode 100644 idea/testData/multiModuleQuickFix/deprecatedImpl/header/header.kt.after create mode 100644 idea/testData/multiModuleQuickFix/deprecatedImpl/jvm/My.kt create mode 100644 idea/testData/multiModuleQuickFix/deprecatedImpl/jvm/My.kt.after diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt index 088a3fdffe0..fbd799b2af0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt @@ -130,6 +130,7 @@ class QuickFixRegistrar : QuickFixContributor { removeModifierFactory) REDUNDANT_MODIFIER_IN_GETTER.registerFactory(removeRedundantModifierFactory) WRONG_MODIFIER_TARGET.registerFactory(removeModifierFactory) + DEPRECATED_MODIFIER_FOR_TARGET.registerFactory(ReplaceModifierFix) REDUNDANT_MODIFIER_FOR_TARGET.registerFactory(removeModifierFactory) WRONG_MODIFIER_CONTAINING_DECLARATION.registerFactory(removeModifierFactory) REPEATED_MODIFIER.registerFactory(removeModifierFactory) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceModifierFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceModifierFix.kt new file mode 100644 index 00000000000..1cbf4fe0b33 --- /dev/null +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceModifierFix.kt @@ -0,0 +1,70 @@ +/* + * Copyright 2010-2017 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.kotlin.idea.quickfix + +import com.intellij.codeInsight.intention.IntentionAction +import com.intellij.openapi.editor.Editor +import com.intellij.openapi.project.Project +import org.jetbrains.kotlin.diagnostics.Diagnostic +import org.jetbrains.kotlin.diagnostics.Errors +import org.jetbrains.kotlin.lexer.KtModifierKeywordToken +import org.jetbrains.kotlin.lexer.KtTokens +import org.jetbrains.kotlin.psi.KtFile +import org.jetbrains.kotlin.psi.KtModifierListOwner +import org.jetbrains.kotlin.psi.psiUtil.getParentOfType + +class ReplaceModifierFix( + element: KtModifierListOwner, + private val modifier: KtModifierKeywordToken +) : KotlinQuickFixAction(element) { + + private val text = when (modifier) { + KtTokens.HEADER_KEYWORD -> "Replace with 'expect'" + KtTokens.IMPL_KEYWORD -> "Replace with 'actual'" + else -> "Replace modifier (?)" + } + + override fun getText() = text + + override fun getFamilyName() = "Replace modifier" + + override fun invoke(project: Project, editor: Editor?, file: KtFile) { + val element = element ?: return + when (modifier) { + KtTokens.HEADER_KEYWORD -> { + element.addModifier(KtTokens.EXPECT_KEYWORD) + element.removeModifier(KtTokens.HEADER_KEYWORD) + } + KtTokens.IMPL_KEYWORD -> { + element.addModifier(KtTokens.ACTUAL_KEYWORD) + element.removeModifier(KtTokens.IMPL_KEYWORD) + } + } + } + + companion object : KotlinSingleIntentionActionFactory() { + override fun createAction(diagnostic: Diagnostic): IntentionAction? { + val deprecatedModifier = Errors.DEPRECATED_MODIFIER_FOR_TARGET.cast(diagnostic) + val modifier = deprecatedModifier.a + val modifierListOwner = deprecatedModifier.psiElement.getParentOfType(strict = true) ?: return null + return when (modifier) { + KtTokens.HEADER_KEYWORD, KtTokens.IMPL_KEYWORD -> ReplaceModifierFix(modifierListOwner, modifier) + else -> null + } + } + } +} \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/deprecatedHeader/header/header.kt b/idea/testData/multiModuleQuickFix/deprecatedHeader/header/header.kt new file mode 100644 index 00000000000..193878f5377 --- /dev/null +++ b/idea/testData/multiModuleQuickFix/deprecatedHeader/header/header.kt @@ -0,0 +1,3 @@ +// "Replace with 'expect'" "true" + +header class My \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/deprecatedHeader/header/header.kt.after b/idea/testData/multiModuleQuickFix/deprecatedHeader/header/header.kt.after new file mode 100644 index 00000000000..43841db480a --- /dev/null +++ b/idea/testData/multiModuleQuickFix/deprecatedHeader/header/header.kt.after @@ -0,0 +1,3 @@ +// "Replace with 'expect'" "true" + +expect class My \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/deprecatedHeader/jvm/My.kt b/idea/testData/multiModuleQuickFix/deprecatedHeader/jvm/My.kt new file mode 100644 index 00000000000..0e894af9dd1 --- /dev/null +++ b/idea/testData/multiModuleQuickFix/deprecatedHeader/jvm/My.kt @@ -0,0 +1 @@ +impl class My \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/deprecatedHeader/jvm/My.kt.after b/idea/testData/multiModuleQuickFix/deprecatedHeader/jvm/My.kt.after new file mode 100644 index 00000000000..0e894af9dd1 --- /dev/null +++ b/idea/testData/multiModuleQuickFix/deprecatedHeader/jvm/My.kt.after @@ -0,0 +1 @@ +impl class My \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/deprecatedImpl/header/header.kt b/idea/testData/multiModuleQuickFix/deprecatedImpl/header/header.kt new file mode 100644 index 00000000000..c6d45791570 --- /dev/null +++ b/idea/testData/multiModuleQuickFix/deprecatedImpl/header/header.kt @@ -0,0 +1 @@ +header class My \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/deprecatedImpl/header/header.kt.after b/idea/testData/multiModuleQuickFix/deprecatedImpl/header/header.kt.after new file mode 100644 index 00000000000..c6d45791570 --- /dev/null +++ b/idea/testData/multiModuleQuickFix/deprecatedImpl/header/header.kt.after @@ -0,0 +1 @@ +header class My \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/deprecatedImpl/jvm/My.kt b/idea/testData/multiModuleQuickFix/deprecatedImpl/jvm/My.kt new file mode 100644 index 00000000000..b51e6d87c4b --- /dev/null +++ b/idea/testData/multiModuleQuickFix/deprecatedImpl/jvm/My.kt @@ -0,0 +1,3 @@ +// "Replace with 'actual'" "true" + +impl class My \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/deprecatedImpl/jvm/My.kt.after b/idea/testData/multiModuleQuickFix/deprecatedImpl/jvm/My.kt.after new file mode 100644 index 00000000000..18436ca5db5 --- /dev/null +++ b/idea/testData/multiModuleQuickFix/deprecatedImpl/jvm/My.kt.after @@ -0,0 +1,3 @@ +// "Replace with 'actual'" "true" + +actual class My \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTest.kt index 574d60b1aaa..31cdbf1d100 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTest.kt @@ -54,6 +54,16 @@ class QuickFixMultiModuleTest : AbstractQuickFixMultiModuleTest() { doMultiPlatformTest() } + @Test + fun testDeprecatedHeader() { + doMultiPlatformTest() + } + + @Test + fun testDeprecatedImpl() { + doMultiPlatformTest() + } + @Test fun testEnum() { doMultiPlatformTest(impls = "js" to TargetPlatformKind.JavaScript)