From 9495257de3ba24cd7df57a97e15f0dae989ab284 Mon Sep 17 00:00:00 2001 From: Kirill Rakhman Date: Wed, 13 Apr 2016 13:25:35 +0200 Subject: [PATCH] Add QuickFix to add 'crossinline' to parameter (#852) Fixes #KT-10844 --- .../kotlin/idea/quickfix/AddCrossinlineFix.kt | 51 +++++++++++++++++++ .../kotlin/idea/quickfix/QuickFixRegistrar.kt | 2 + .../testData/quickfix/addCrossinline/basic.kt | 13 +++++ .../quickfix/addCrossinline/basic.kt.after | 13 +++++ .../idea/quickfix/QuickFixTestGenerated.java | 15 ++++++ 5 files changed, 94 insertions(+) create mode 100644 idea/src/org/jetbrains/kotlin/idea/quickfix/AddCrossinlineFix.kt create mode 100644 idea/testData/quickfix/addCrossinline/basic.kt create mode 100644 idea/testData/quickfix/addCrossinline/basic.kt.after diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddCrossinlineFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddCrossinlineFix.kt new file mode 100644 index 00000000000..ef55ed961d9 --- /dev/null +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddCrossinlineFix.kt @@ -0,0 +1,51 @@ +/* + * Copyright 2010-2016 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.KtTokens +import org.jetbrains.kotlin.psi.* +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType + +class AddCrossInlineFix(element: KtNameReferenceExpression) : KotlinQuickFixAction(element) { + override fun getText() = "Add 'crossinline' to parameter '${element.getReferencedName()}'" + override fun getFamilyName() = "Add 'crossinline' to parameter" + + override fun invoke(project: Project, editor: Editor?, file: KtFile) { + val parameter = element.findParameterWithName(element.getReferencedName()) ?: return + if (!parameter.hasModifier(KtTokens.CROSSINLINE_KEYWORD)) { + parameter.addModifier(KtTokens.CROSSINLINE_KEYWORD) + } + } + + private fun KtElement.findParameterWithName(name: String): KtParameter? { + val function = getStrictParentOfType() ?: return null + return function.valueParameters.firstOrNull { it.name == name } ?: function.findParameterWithName(name) + } + + companion object Factory : KotlinIntentionActionsFactory() { + override fun doCreateActions(diagnostic: Diagnostic): List { + val casted = Errors.NON_LOCAL_RETURN_NOT_ALLOWED.cast(diagnostic) + val reference = casted.a as? KtNameReferenceExpression ?: return emptyList() + return listOf(AddCrossInlineFix(reference)) + } + } +} \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt index 7880b0a86c4..54526bc5757 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt @@ -370,5 +370,7 @@ class QuickFixRegistrar : QuickFixContributor { UNSUPPORTED.registerFactory(UnsupportedAsyncFix) DATA_CLASS_NOT_PROPERTY_PARAMETER.registerFactory(AddValVarToConstructorParameterAction.QuickFixFactory) + + NON_LOCAL_RETURN_NOT_ALLOWED.registerFactory(AddCrossInlineFix) } } diff --git a/idea/testData/quickfix/addCrossinline/basic.kt b/idea/testData/quickfix/addCrossinline/basic.kt new file mode 100644 index 00000000000..9130caf75f8 --- /dev/null +++ b/idea/testData/quickfix/addCrossinline/basic.kt @@ -0,0 +1,13 @@ +// "Add 'crossinline' to parameter 'block'" "true" + +interface I { + fun foo() +} + +inline fun bar(block: () -> Unit) { + object : I { + override fun foo() { + block() + } + } +} diff --git a/idea/testData/quickfix/addCrossinline/basic.kt.after b/idea/testData/quickfix/addCrossinline/basic.kt.after new file mode 100644 index 00000000000..1cf4dfc0b1b --- /dev/null +++ b/idea/testData/quickfix/addCrossinline/basic.kt.after @@ -0,0 +1,13 @@ +// "Add 'crossinline' to parameter 'block'" "true" + +interface I { + fun foo() +} + +inline fun bar(crossinline block: () -> Unit) { + object : I { + override fun foo() { + block() + } + } +} diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java index c354ef13098..e95e153f33b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java @@ -200,6 +200,21 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { } } + @TestMetadata("idea/testData/quickfix/addCrossinline") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class AddCrossinline extends AbstractQuickFixTest { + public void testAllFilesPresentInAddCrossinline() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addCrossinline"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + } + + @TestMetadata("basic.kt") + public void testBasic() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addCrossinline/basic.kt"); + doTest(fileName); + } + } + @TestMetadata("idea/testData/quickfix/addGenericUpperBound") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class)