From 9d768e237589f671923c54f7b6690617e1cbd17e Mon Sep 17 00:00:00 2001 From: shiraji Date: Tue, 6 Sep 2016 20:14:12 +0300 Subject: [PATCH] Add quickfix for FINAL_UPPER_BOUND: inline type parameter #KT-13773 Fixed --- .../idea/quickfix/InlineTypeParameterFix.kt | 60 +++++++++++++++++++ .../kotlin/idea/quickfix/QuickFixRegistrar.kt | 2 + .../quickfix/inlineTypeParameterFix/basic.kt | 3 + .../inlineTypeParameterFix/basic.kt.after | 3 + .../basicMultipleDef.kt | 9 +++ .../basicMultipleDef.kt.after | 9 +++ .../inlineTypeParameterFix/function.kt | 7 +++ .../inlineTypeParameterFix/function.kt.after | 7 +++ .../idea/quickfix/QuickFixTestGenerated.java | 27 +++++++++ 9 files changed, 127 insertions(+) create mode 100644 idea/src/org/jetbrains/kotlin/idea/quickfix/InlineTypeParameterFix.kt create mode 100644 idea/testData/quickfix/inlineTypeParameterFix/basic.kt create mode 100644 idea/testData/quickfix/inlineTypeParameterFix/basic.kt.after create mode 100644 idea/testData/quickfix/inlineTypeParameterFix/basicMultipleDef.kt create mode 100644 idea/testData/quickfix/inlineTypeParameterFix/basicMultipleDef.kt.after create mode 100644 idea/testData/quickfix/inlineTypeParameterFix/function.kt create mode 100644 idea/testData/quickfix/inlineTypeParameterFix/function.kt.after diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/InlineTypeParameterFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/InlineTypeParameterFix.kt new file mode 100644 index 00000000000..bead3c16a9c --- /dev/null +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/InlineTypeParameterFix.kt @@ -0,0 +1,60 @@ +/* + * 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.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.idea.caches.resolve.analyzeFully +import org.jetbrains.kotlin.psi.* +import org.jetbrains.kotlin.psi.psiUtil.forEachDescendantOfType +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.resolve.BindingContext + +class InlineTypeParameterFix(val typeReference: KtTypeReference) : KotlinQuickFixAction(typeReference) { + override fun invoke(project: Project, editor: Editor?, file: KtFile) { + val parameter = typeReference.parent as? KtTypeParameter ?: return + val bound = parameter.extendsBound ?: return + val parameterList = parameter.parent as? KtTypeParameterList ?: return + val parameterListOwner = typeReference.getStrictParentOfType() ?: return + val context = parameterListOwner.analyzeFully() + val parameterDescriptor = context[BindingContext.TYPE_PARAMETER, parameter] ?: return + parameterListOwner.forEachDescendantOfType() { + val typeElement = it.typeElement + val type = context[BindingContext.TYPE, it] + if (typeElement != null && type != null && type.constructor.declarationDescriptor == parameterDescriptor) { + typeElement.replace(bound) + } + } + + if (parameterList.parameters.size == 1) { + parameterList.delete() + } + else { + EditCommaSeparatedListHelper.removeItem(parameter) + } + } + + override fun getText() = "Inline type parameter" + + override fun getFamilyName() = text + + companion object Factory : KotlinSingleIntentionActionFactory() { + override fun createAction(diagnostic: Diagnostic) = InlineTypeParameterFix(Errors.FINAL_UPPER_BOUND.cast(diagnostic).psiElement) + } +} \ 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 f0f6ad23c2f..8fd0f302c0a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt @@ -416,5 +416,7 @@ class QuickFixRegistrar : QuickFixContributor { VALUE_PARAMETER_WITH_NO_TYPE_ANNOTATION.registerFactory(AddTypeAnnotationToValueParameterFix) UNRESOLVED_REFERENCE.registerFactory(CreateTypeParameterByRefActionFactory) + + FINAL_UPPER_BOUND.registerFactory(InlineTypeParameterFix) } } diff --git a/idea/testData/quickfix/inlineTypeParameterFix/basic.kt b/idea/testData/quickfix/inlineTypeParameterFix/basic.kt new file mode 100644 index 00000000000..db952753a99 --- /dev/null +++ b/idea/testData/quickfix/inlineTypeParameterFix/basic.kt @@ -0,0 +1,3 @@ +// "Inline type parameter" "true" + +data class DC>(val x: T, val y: String) \ No newline at end of file diff --git a/idea/testData/quickfix/inlineTypeParameterFix/basic.kt.after b/idea/testData/quickfix/inlineTypeParameterFix/basic.kt.after new file mode 100644 index 00000000000..ac9f9aed093 --- /dev/null +++ b/idea/testData/quickfix/inlineTypeParameterFix/basic.kt.after @@ -0,0 +1,3 @@ +// "Inline type parameter" "true" + +data class DC(val x: Int, val y: String) \ No newline at end of file diff --git a/idea/testData/quickfix/inlineTypeParameterFix/basicMultipleDef.kt b/idea/testData/quickfix/inlineTypeParameterFix/basicMultipleDef.kt new file mode 100644 index 00000000000..7ea161098ee --- /dev/null +++ b/idea/testData/quickfix/inlineTypeParameterFix/basicMultipleDef.kt @@ -0,0 +1,9 @@ +// "Inline type parameter" "true" + +data class DC, S : String>(val x: T, val y: String) { + var a: T = Int.MAX_VALUE + + fun foo(b: T) { + val c: T = Int.MIN_VALUE + } +} \ No newline at end of file diff --git a/idea/testData/quickfix/inlineTypeParameterFix/basicMultipleDef.kt.after b/idea/testData/quickfix/inlineTypeParameterFix/basicMultipleDef.kt.after new file mode 100644 index 00000000000..d51692a5130 --- /dev/null +++ b/idea/testData/quickfix/inlineTypeParameterFix/basicMultipleDef.kt.after @@ -0,0 +1,9 @@ +// "Inline type parameter" "true" + +data class DC(val x: Int, val y: String) { + var a: Int = Int.MAX_VALUE + + fun foo(b: Int) { + val c: Int = Int.MIN_VALUE + } +} \ No newline at end of file diff --git a/idea/testData/quickfix/inlineTypeParameterFix/function.kt b/idea/testData/quickfix/inlineTypeParameterFix/function.kt new file mode 100644 index 00000000000..54d7b6f2a67 --- /dev/null +++ b/idea/testData/quickfix/inlineTypeParameterFix/function.kt @@ -0,0 +1,7 @@ +// "Inline type parameter" "true" + +data class DC(val x: Int, val y: String) { + fun > foo() { + val a: S = Int.MAX_VALUE + } +} \ No newline at end of file diff --git a/idea/testData/quickfix/inlineTypeParameterFix/function.kt.after b/idea/testData/quickfix/inlineTypeParameterFix/function.kt.after new file mode 100644 index 00000000000..bd53c2899e0 --- /dev/null +++ b/idea/testData/quickfix/inlineTypeParameterFix/function.kt.after @@ -0,0 +1,7 @@ +// "Inline type parameter" "true" + +data class DC(val x: Int, val y: String) { + fun foo() { + val a: Int = Int.MAX_VALUE + } +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java index 0548ac3bc64..c9a3a85cfeb 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java @@ -5464,6 +5464,33 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { } } + @TestMetadata("idea/testData/quickfix/inlineTypeParameterFix") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class InlineTypeParameterFix extends AbstractQuickFixTest { + public void testAllFilesPresentInInlineTypeParameterFix() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/inlineTypeParameterFix"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + } + + @TestMetadata("basic.kt") + public void testBasic() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/inlineTypeParameterFix/basic.kt"); + doTest(fileName); + } + + @TestMetadata("basicMultipleDef.kt") + public void testBasicMultipleDef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/inlineTypeParameterFix/basicMultipleDef.kt"); + doTest(fileName); + } + + @TestMetadata("function.kt") + public void testFunction() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/inlineTypeParameterFix/function.kt"); + doTest(fileName); + } + } + @TestMetadata("idea/testData/quickfix/insertDelegationCall") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class)