azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix messages #KT-25177

Browse Source
This commit is contained in:
Toshiaki Kameyama
2018-07-30 18:37:13 +09:00
committed by Anton Bannykh
parent 605736b6ba
commit f2fec6b078
17 changed files with 61 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/resources/inspectionDescriptions/RedundantAsDynamic.html
-5
View File
@@ -1,5 +0,0 @@
<html>
<body>
This inspection reports a redundant <b>asDynamic</b> call.
</body>
</html>
idea/resources/inspectionDescriptions/SuspiciousAsDynamic.html
+5
View File
@@ -0,0 +1,5 @@
<html>
<body>
This inspection reports a suspicious <b>asDynamic</b> member invocation.
</body>
</html>
idea/src/META-INF/plugin.xml
+2 -2
View File
@@ -2976,8 +2976,8 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
language="kotlin" language="kotlin"
/> />
<localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.RedundantAsDynamicInspection" <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.SuspiciousAsDynamicInspection"
displayName="Redundant 'asDynamic' call" displayName="Suspicious 'asDynamic' member invocation"
groupPath="Kotlin" groupPath="Kotlin"
groupName="Style issues" groupName="Style issues"
enabledByDefault="true" enabledByDefault="true"
idea/src/META-INF/plugin.xml.173
+2 -3
View File
@@ -2957,7 +2957,6 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
language="kotlin" language="kotlin"
/> />
<localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.RedundantWithInspection" <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.RedundantWithInspection"
displayName="Redundant 'with' call" displayName="Redundant 'with' call"
groupPath="Kotlin" groupPath="Kotlin"
@@ -2976,8 +2975,8 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
language="kotlin" language="kotlin"
/> />
<localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.RedundantAsDynamicInspection" <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.SuspiciousAsDynamicInspection"
displayName="Redundant 'asDynamic' call" displayName="Suspicious 'asDynamic' member invocation"
groupPath="Kotlin" groupPath="Kotlin"
groupName="Style issues" groupName="Style issues"
enabledByDefault="true" enabledByDefault="true"
idea/src/META-INF/plugin.xml.181
+2 -2
View File
@@ -2975,8 +2975,8 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
language="kotlin" language="kotlin"
/> />
<localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.RedundantAsDynamicInspection" <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.SuspiciousAsDynamicInspection"
displayName="Redundant 'asDynamic' call" displayName="Suspicious 'asDynamic' member invocation"
groupPath="Kotlin" groupPath="Kotlin"
groupName="Style issues" groupName="Style issues"
enabledByDefault="true" enabledByDefault="true"
idea/src/META-INF/plugin.xml.183
+2 -2
View File
@@ -2976,8 +2976,8 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
language="kotlin" language="kotlin"
/> />
<localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.RedundantAsDynamicInspection" <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.SuspiciousAsDynamicInspection"
displayName="Redundant 'asDynamic' call" displayName="Suspicious 'asDynamic' member invocation"
groupPath="Kotlin" groupPath="Kotlin"
groupName="Style issues" groupName="Style issues"
enabledByDefault="true" enabledByDefault="true"
idea/src/META-INF/plugin.xml.as31
+2 -2
View File
@@ -2975,8 +2975,8 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
language="kotlin" language="kotlin"
/> />
<localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.RedundantAsDynamicInspection" <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.SuspiciousAsDynamicInspection"
displayName="Redundant 'asDynamic' call" displayName="Suspicious 'asDynamic' member invocation"
groupPath="Kotlin" groupPath="Kotlin"
groupName="Style issues" groupName="Style issues"
enabledByDefault="true" enabledByDefault="true"
idea/src/META-INF/plugin.xml.as32
+2 -2
View File
@@ -2975,8 +2975,8 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
language="kotlin" language="kotlin"
/> />
<localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.RedundantAsDynamicInspection" <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.SuspiciousAsDynamicInspection"
displayName="Redundant 'asDynamic' call" displayName="Suspicious 'asDynamic' member invocation"
groupPath="Kotlin" groupPath="Kotlin"
groupName="Style issues" groupName="Style issues"
enabledByDefault="true" enabledByDefault="true"
idea/src/META-INF/plugin.xml.as33
+10
View File
@@ -2958,6 +2958,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
language="kotlin" language="kotlin"
/> />
<localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.RedundantWithInspection" <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.RedundantWithInspection"
displayName="Redundant 'with' call" displayName="Redundant 'with' call"
groupPath="Kotlin" groupPath="Kotlin"
@@ -2976,6 +2977,15 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
language="kotlin" language="kotlin"
/> />
<localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.SuspiciousAsDynamicInspection"
displayName="Suspicious 'asDynamic' member invocation"
groupPath="Kotlin"
groupName="Style issues"
enabledByDefault="true"
level="WEAK WARNING"
language="kotlin"
/>
<referenceImporter implementation="org.jetbrains.kotlin.idea.quickfix.KotlinReferenceImporter"/> <referenceImporter implementation="org.jetbrains.kotlin.idea.quickfix.KotlinReferenceImporter"/>
<fileType.fileViewProviderFactory filetype="KJSM" implementationClass="com.intellij.psi.ClassFileViewProviderFactory"/> <fileType.fileViewProviderFactory filetype="KJSM" implementationClass="com.intellij.psi.ClassFileViewProviderFactory"/>
idea/src/org/jetbrains/kotlin/idea/inspections/RedundantAsDynamicInspection.kt → idea/src/org/jetbrains/kotlin/idea/inspections/SuspiciousAsDynamicInspection.kt
+3 -3
View File
@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.psi.callExpressionVisitor
import org.jetbrains.kotlin.psi.psiUtil.getQualifiedExpressionForSelector import org.jetbrains.kotlin.psi.psiUtil.getQualifiedExpressionForSelector
import org.jetbrains.kotlin.types.DynamicType import org.jetbrains.kotlin.types.DynamicType
class RedundantAsDynamicInspection : AbstractKotlinInspection() { class SuspiciousAsDynamicInspection : AbstractKotlinInspection() {
override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean) = override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean) =
callExpressionVisitor(fun(call) { callExpressionVisitor(fun(call) {
if (call.platform != JsPlatform) return if (call.platform != JsPlatform) return
@@ -26,7 +26,7 @@ class RedundantAsDynamicInspection : AbstractKotlinInspection() {
if (call.getQualifiedExpressionForSelector()?.receiverExpression?.getCallableDescriptor()?.returnType !is DynamicType) return if (call.getQualifiedExpressionForSelector()?.receiverExpression?.getCallableDescriptor()?.returnType !is DynamicType) return
holder.registerProblem( holder.registerProblem(
call, call,
"Redundant 'asDynamic' call", "Suspicious 'asDynamic' member invocation",
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
RemoveAsDynamicCallFix() RemoveAsDynamicCallFix()
) )
@@ -34,7 +34,7 @@ class RedundantAsDynamicInspection : AbstractKotlinInspection() {
} }
private class RemoveAsDynamicCallFix : LocalQuickFix { private class RemoveAsDynamicCallFix : LocalQuickFix {
override fun getName() = "Remove 'asDynamic' call" override fun getName() = "Remove 'asDynamic' invocation"
override fun getFamilyName() = name override fun getFamilyName() = name
idea/testData/inspectionsLocal/redundantAsDynamic/.inspection
Vendored
-1
View File
@@ -1 +0,0 @@
org.jetbrains.kotlin.idea.inspections.RedundantAsDynamicInspection
idea/testData/inspectionsLocal/redundantAsDynamic/simple.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
// JS
fun test(d: dynamic) {
d.<caret>asDynamic().foo()
}
idea/testData/inspectionsLocal/redundantAsDynamic/simple.kt.after
Vendored
-4
View File
@@ -1,4 +0,0 @@
// JS
fun test(d: dynamic) {
d.foo()
}
idea/testData/inspectionsLocal/suspiciousAsDynamic/.inspection
Vendored
+1
View File
@@ -0,0 +1 @@
org.jetbrains.kotlin.idea.inspections.SuspiciousAsDynamicInspection
idea/testData/inspectionsLocal/suspiciousAsDynamic/simple.kt
Vendored
+6
View File
@@ -0,0 +1,6 @@
// JS
// PROBLEM: Suspicious 'asDynamic' member invocation
// FIX: Remove 'asDynamic' invocation
fun test(d: dynamic) {
d.<caret>asDynamic().foo()
}
idea/testData/inspectionsLocal/suspiciousAsDynamic/simple.kt.after
Vendored
+6
View File
@@ -0,0 +1,6 @@
// JS
// PROBLEM: Suspicious 'asDynamic' member invocation
// FIX: Remove 'asDynamic' invocation
fun test(d: dynamic) {
d.foo()
}
idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
Generated
+18 -18
View File
@@ -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") @TestMetadata("idea/testData/inspectionsLocal/redundantCompanionReference")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @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") @TestMetadata("idea/testData/inspectionsLocal/unnecessaryVariable")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)