diff --git a/idea/resources/inspectionDescriptions/RedundantAsDynamic.html b/idea/resources/inspectionDescriptions/RedundantAsDynamic.html deleted file mode 100644 index 470f6b9e44c..00000000000 --- a/idea/resources/inspectionDescriptions/RedundantAsDynamic.html +++ /dev/null @@ -1,5 +0,0 @@ - - -This inspection reports a redundant asDynamic call. - - \ No newline at end of file diff --git a/idea/resources/inspectionDescriptions/SuspiciousAsDynamic.html b/idea/resources/inspectionDescriptions/SuspiciousAsDynamic.html new file mode 100644 index 00000000000..a7ba6830234 --- /dev/null +++ b/idea/resources/inspectionDescriptions/SuspiciousAsDynamic.html @@ -0,0 +1,5 @@ + + +This inspection reports a suspicious asDynamic member invocation. + + \ No newline at end of file diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 6b63ed1b4f8..2e44f550033 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -2976,8 +2976,8 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio. language="kotlin" /> - - - - - - - + + + diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantAsDynamicInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/SuspiciousAsDynamicInspection.kt similarity index 90% rename from idea/src/org/jetbrains/kotlin/idea/inspections/RedundantAsDynamicInspection.kt rename to idea/src/org/jetbrains/kotlin/idea/inspections/SuspiciousAsDynamicInspection.kt index 4a872bc0b47..7c6aa099c23 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantAsDynamicInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/SuspiciousAsDynamicInspection.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.psi.callExpressionVisitor import org.jetbrains.kotlin.psi.psiUtil.getQualifiedExpressionForSelector import org.jetbrains.kotlin.types.DynamicType -class RedundantAsDynamicInspection : AbstractKotlinInspection() { +class SuspiciousAsDynamicInspection : AbstractKotlinInspection() { override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean) = callExpressionVisitor(fun(call) { if (call.platform != JsPlatform) return @@ -26,7 +26,7 @@ class RedundantAsDynamicInspection : AbstractKotlinInspection() { if (call.getQualifiedExpressionForSelector()?.receiverExpression?.getCallableDescriptor()?.returnType !is DynamicType) return holder.registerProblem( call, - "Redundant 'asDynamic' call", + "Suspicious 'asDynamic' member invocation", ProblemHighlightType.GENERIC_ERROR_OR_WARNING, RemoveAsDynamicCallFix() ) @@ -34,7 +34,7 @@ class RedundantAsDynamicInspection : AbstractKotlinInspection() { } private class RemoveAsDynamicCallFix : LocalQuickFix { - override fun getName() = "Remove 'asDynamic' call" + override fun getName() = "Remove 'asDynamic' invocation" override fun getFamilyName() = name diff --git a/idea/testData/inspectionsLocal/redundantAsDynamic/.inspection b/idea/testData/inspectionsLocal/redundantAsDynamic/.inspection deleted file mode 100644 index fbd5f7c0655..00000000000 --- a/idea/testData/inspectionsLocal/redundantAsDynamic/.inspection +++ /dev/null @@ -1 +0,0 @@ -org.jetbrains.kotlin.idea.inspections.RedundantAsDynamicInspection \ No newline at end of file diff --git a/idea/testData/inspectionsLocal/redundantAsDynamic/simple.kt b/idea/testData/inspectionsLocal/redundantAsDynamic/simple.kt deleted file mode 100644 index 1350b1eeb9b..00000000000 --- a/idea/testData/inspectionsLocal/redundantAsDynamic/simple.kt +++ /dev/null @@ -1,4 +0,0 @@ -// JS -fun test(d: dynamic) { - d.asDynamic().foo() -} \ No newline at end of file diff --git a/idea/testData/inspectionsLocal/redundantAsDynamic/simple.kt.after b/idea/testData/inspectionsLocal/redundantAsDynamic/simple.kt.after deleted file mode 100644 index 1daa5c1901e..00000000000 --- a/idea/testData/inspectionsLocal/redundantAsDynamic/simple.kt.after +++ /dev/null @@ -1,4 +0,0 @@ -// JS -fun test(d: dynamic) { - d.foo() -} \ No newline at end of file diff --git a/idea/testData/inspectionsLocal/suspiciousAsDynamic/.inspection b/idea/testData/inspectionsLocal/suspiciousAsDynamic/.inspection new file mode 100644 index 00000000000..dbafba7f131 --- /dev/null +++ b/idea/testData/inspectionsLocal/suspiciousAsDynamic/.inspection @@ -0,0 +1 @@ +org.jetbrains.kotlin.idea.inspections.SuspiciousAsDynamicInspection \ No newline at end of file diff --git a/idea/testData/inspectionsLocal/suspiciousAsDynamic/simple.kt b/idea/testData/inspectionsLocal/suspiciousAsDynamic/simple.kt new file mode 100644 index 00000000000..46b52cf9f12 --- /dev/null +++ b/idea/testData/inspectionsLocal/suspiciousAsDynamic/simple.kt @@ -0,0 +1,6 @@ +// JS +// PROBLEM: Suspicious 'asDynamic' member invocation +// FIX: Remove 'asDynamic' invocation +fun test(d: dynamic) { + d.asDynamic().foo() +} \ No newline at end of file diff --git a/idea/testData/inspectionsLocal/suspiciousAsDynamic/simple.kt.after b/idea/testData/inspectionsLocal/suspiciousAsDynamic/simple.kt.after new file mode 100644 index 00000000000..1dcbeb58bfc --- /dev/null +++ b/idea/testData/inspectionsLocal/suspiciousAsDynamic/simple.kt.after @@ -0,0 +1,6 @@ +// JS +// PROBLEM: Suspicious 'asDynamic' member invocation +// FIX: Remove 'asDynamic' invocation +fun test(d: dynamic) { + d.foo() +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java index 01eefbbe5e8..9fa756f615c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java @@ -3487,24 +3487,6 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest { } } - @TestMetadata("idea/testData/inspectionsLocal/redundantAsDynamic") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class RedundantAsDynamic extends AbstractLocalInspectionTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); - } - - public void testAllFilesPresentInRedundantAsDynamic() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/inspectionsLocal/redundantAsDynamic"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), TargetBackend.ANY, true); - } - - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("idea/testData/inspectionsLocal/redundantAsDynamic/simple.kt"); - } - } - @TestMetadata("idea/testData/inspectionsLocal/redundantCompanionReference") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -5525,6 +5507,24 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest { } } + @TestMetadata("idea/testData/inspectionsLocal/suspiciousAsDynamic") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class SuspiciousAsDynamic extends AbstractLocalInspectionTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInSuspiciousAsDynamic() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/inspectionsLocal/suspiciousAsDynamic"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), TargetBackend.ANY, true); + } + + @TestMetadata("simple.kt") + public void testSimple() throws Exception { + runTest("idea/testData/inspectionsLocal/suspiciousAsDynamic/simple.kt"); + } + } + @TestMetadata("idea/testData/inspectionsLocal/unnecessaryVariable") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class)