From eefbd72a64dd065daab6b5ba857e73cf639807a5 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 19 Jan 2016 17:50:08 +0300 Subject: [PATCH] Remove AddStarProjectionsFix for removed javaClass function. --- .../idea/quickfix/AddStarProjectionsFix.kt | 25 -------------- .../kotlin/idea/quickfix/QuickFixRegistrar.kt | 1 - .../addStarProjections/javaClass/fooOfC2.kt | 9 ----- .../javaClass/fooOfC2.kt.after | 9 ----- .../javaClass/javaClassOfC1Runtime.kt | 6 ---- .../javaClass/javaClassOfC1Runtime.kt.after | 6 ---- .../javaClass/javaClassOfC2Runtime.kt | 6 ---- .../javaClass/javaClassOfC2Runtime.kt.after | 6 ---- .../javaClass/javaClassOfCRuntime.kt | 6 ---- .../javaClass/javaClassOfCRuntime.kt.after | 6 ---- .../idea/quickfix/QuickFixTestGenerated.java | 33 ------------------- 11 files changed, 113 deletions(-) delete mode 100644 idea/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt delete mode 100644 idea/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt.after delete mode 100644 idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC1Runtime.kt delete mode 100644 idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC1Runtime.kt.after delete mode 100644 idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC2Runtime.kt delete mode 100644 idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC2Runtime.kt.after delete mode 100644 idea/testData/quickfix/addStarProjections/javaClass/javaClassOfCRuntime.kt delete mode 100644 idea/testData/quickfix/addStarProjections/javaClass/javaClassOfCRuntime.kt.after diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddStarProjectionsFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddStarProjectionsFix.kt index dea326153c1..b1764960460 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddStarProjectionsFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddStarProjectionsFix.kt @@ -48,29 +48,4 @@ open class AddStarProjectionsFix private constructor(element: KtUserType, return AddStarProjectionsFix(unwrappedType, diagnosticWithParameters.a) } } - - object JavaClassFactory : KotlinSingleIntentionActionFactory() { - public override fun createAction(diagnostic: Diagnostic): IntentionAction? { - val diagnosticWithParameters = Errors.WRONG_NUMBER_OF_TYPE_ARGUMENTS.cast(diagnostic) - val size = diagnosticWithParameters.a - val userType = QuickFixUtil.getParentElementOfType(diagnostic, KtUserType::class.java) ?: return null - return object : AddStarProjectionsFix(userType, size) { - override fun isAvailable(project: Project, editor: Editor?, file: PsiFile): Boolean { - // We are looking for the occurrence of Type in javaClass() - return super.isAvailable(project, editor, file) && isZeroTypeArguments && isInsideJavaClassCall - } - - private val isZeroTypeArguments: Boolean - get() = element.typeArguments.isEmpty() - - // Resolve is expensive so we use a heuristic here: the case is rare enough not to be annoying - private val isInsideJavaClassCall: Boolean - get() { - val call = element.parent.parent.parent.parent as? KtCallExpression - val callee = call?.calleeExpression as? KtSimpleNameExpression - return callee?.getReferencedName() == "javaClass" - } - } - } - } } diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt index 2015c1d8f3f..5f13a211e77 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt @@ -188,7 +188,6 @@ class QuickFixRegistrar : QuickFixContributor { BREAK_OR_CONTINUE_IN_WHEN.registerFactory(AddLoopLabelFix) NO_TYPE_ARGUMENTS_ON_RHS.registerFactory(AddStarProjectionsFix.IsExpressionFactory) - WRONG_NUMBER_OF_TYPE_ARGUMENTS.registerFactory(AddStarProjectionsFix.JavaClassFactory) TYPE_ARGUMENTS_REDUNDANT_IN_SUPER_QUALIFIER.registerFactory(RemovePsiElementSimpleFix.RemoveTypeArgumentsFactory) diff --git a/idea/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt b/idea/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt deleted file mode 100644 index 3dc1b27934d..00000000000 --- a/idea/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt +++ /dev/null @@ -1,9 +0,0 @@ -// "class org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix" "false" -// ERROR: Type argument expected -class C2 - -fun foo() {} - -fun test() { - foo>() -} diff --git a/idea/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt.after b/idea/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt.after deleted file mode 100644 index 3dc1b27934d..00000000000 --- a/idea/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt.after +++ /dev/null @@ -1,9 +0,0 @@ -// "class org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix" "false" -// ERROR: Type argument expected -class C2 - -fun foo() {} - -fun test() { - foo>() -} diff --git a/idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC1Runtime.kt b/idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC1Runtime.kt deleted file mode 100644 index 812be8ad556..00000000000 --- a/idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC1Runtime.kt +++ /dev/null @@ -1,6 +0,0 @@ -// "Add '<*>'" "true" -class C1 - -fun test() { - javaClass>() -} \ No newline at end of file diff --git a/idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC1Runtime.kt.after b/idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC1Runtime.kt.after deleted file mode 100644 index fc9405afbb6..00000000000 --- a/idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC1Runtime.kt.after +++ /dev/null @@ -1,6 +0,0 @@ -// "Add '<*>'" "true" -class C1 - -fun test() { - javaClass>() -} \ No newline at end of file diff --git a/idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC2Runtime.kt b/idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC2Runtime.kt deleted file mode 100644 index 1a52b5dbca2..00000000000 --- a/idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC2Runtime.kt +++ /dev/null @@ -1,6 +0,0 @@ -// "Add '<*, *>'" "true" -class C2 - -fun test() { - javaClass>() -} \ No newline at end of file diff --git a/idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC2Runtime.kt.after b/idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC2Runtime.kt.after deleted file mode 100644 index a8487023cac..00000000000 --- a/idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC2Runtime.kt.after +++ /dev/null @@ -1,6 +0,0 @@ -// "Add '<*, *>'" "true" -class C2 - -fun test() { - javaClass>() -} \ No newline at end of file diff --git a/idea/testData/quickfix/addStarProjections/javaClass/javaClassOfCRuntime.kt b/idea/testData/quickfix/addStarProjections/javaClass/javaClassOfCRuntime.kt deleted file mode 100644 index 1a83bf59deb..00000000000 --- a/idea/testData/quickfix/addStarProjections/javaClass/javaClassOfCRuntime.kt +++ /dev/null @@ -1,6 +0,0 @@ -// "class org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix" "false" -class C - -fun test() { - javaClass>() -} diff --git a/idea/testData/quickfix/addStarProjections/javaClass/javaClassOfCRuntime.kt.after b/idea/testData/quickfix/addStarProjections/javaClass/javaClassOfCRuntime.kt.after deleted file mode 100644 index ab2c414b9a0..00000000000 --- a/idea/testData/quickfix/addStarProjections/javaClass/javaClassOfCRuntime.kt.after +++ /dev/null @@ -1,6 +0,0 @@ -// "class org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix" "false" -class C - -fun test() { - javaClass> -} diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java index c63d2ba2719..259bb1e8d66 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java @@ -442,39 +442,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { } } - @TestMetadata("idea/testData/quickfix/addStarProjections/javaClass") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class JavaClass extends AbstractQuickFixTest { - public void testAllFilesPresentInJavaClass() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/javaClass"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); - } - - @TestMetadata("fooOfC2.kt") - public void testFooOfC2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt"); - doTest(fileName); - } - - @TestMetadata("javaClassOfC1Runtime.kt") - public void testJavaClassOfC1Runtime() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC1Runtime.kt"); - doTest(fileName); - } - - @TestMetadata("javaClassOfC2Runtime.kt") - public void testJavaClassOfC2Runtime() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC2Runtime.kt"); - doTest(fileName); - } - - @TestMetadata("javaClassOfCRuntime.kt") - public void testJavaClassOfCRuntime() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/javaClass/javaClassOfCRuntime.kt"); - doTest(fileName); - } - } - @TestMetadata("idea/testData/quickfix/addStarProjections/when") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class)