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

Add "Redundant empty initializer block" inspection

Browse Source 
^KT-5008 Fixed
This commit is contained in:
Toshiaki Kameyama
2019-04-25 08:43:48 +03:00
committed by Natalia Selezneva
parent c155bf680f
commit b650c7ab00
11 changed files with 122 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/psi/src/org/jetbrains/kotlin/psi/VisitorWrappers.kt
+9
View File
@@ -440,3 +440,12 @@ fun postfixExpressionVisitor(block: (KtPostfixExpression) -> Unit) =
block(expression) block(expression)
} }
} }
fun classInitializerVisitor(block: (KtClassInitializer) -> Unit) =
object : KtVisitorVoid() {
override fun visitClassInitializer(expression: KtClassInitializer) {
super.visitClassInitializer(expression)
block(expression)
}
}
idea/resources/META-INF/plugin-common.xml
+10
View File
@@ -3379,6 +3379,16 @@
language="kotlin" language="kotlin"
/> />
<localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.RedundantEmptyInitializerBlockInspection"
displayName="Redundant empty initializer block"
groupPath="Kotlin"
groupName="Redundant constructs"
enabledByDefault="true"
level="INFO"
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/resources/inspectionDescriptions/RedundantEmptyInitializerBlock.html
+6
View File
@@ -0,0 +1,6 @@
<html>
<body>
This inspection reports redundant empty initializer block.
</pre>
</body>
</html>
idea/src/org/jetbrains/kotlin/idea/inspections/RedundantEmptyInitializerBlockInspection.kt
+38
View File
@@ -0,0 +1,38 @@
/*
* Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.idea.inspections
import com.intellij.codeInspection.LocalQuickFix
import com.intellij.codeInspection.ProblemDescriptor
import com.intellij.codeInspection.ProblemHighlightType
import com.intellij.codeInspection.ProblemsHolder
import com.intellij.openapi.project.Project
import org.jetbrains.kotlin.psi.KtBlockExpression
import org.jetbrains.kotlin.psi.KtClassInitializer
import org.jetbrains.kotlin.psi.classInitializerVisitor
class RedundantEmptyInitializerBlockInspection : AbstractKotlinInspection() {
override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean) = classInitializerVisitor(fun(initializer) {
val body = initializer.body as? KtBlockExpression ?: return
if (body.statements.isNotEmpty()) return
holder.registerProblem(
initializer,
"Redundant empty initializer block",
ProblemHighlightType.LIKE_UNUSED_SYMBOL,
RemoveInitializerBlockFix()
)
})
private class RemoveInitializerBlockFix : LocalQuickFix {
override fun getName() = "Remove initializer block"
override fun getFamilyName() = name
override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
(descriptor.psiElement as? KtClassInitializer)?.delete()
}
}
}
idea/testData/inspectionsLocal/redundantEmptyInitializerBlock/.inspection
Vendored
+1
View File
@@ -0,0 +1 @@
org.jetbrains.kotlin.idea.inspections.RedundantEmptyInitializerBlockInspection
idea/testData/inspectionsLocal/redundantEmptyInitializerBlock/empty.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
class Test {
<caret>init {
}
}
idea/testData/inspectionsLocal/redundantEmptyInitializerBlock/empty.kt.after
Vendored
+2
View File
@@ -0,0 +1,2 @@
class Test {
}
idea/testData/inspectionsLocal/redundantEmptyInitializerBlock/hasComment.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
class Test {
// init comment1
<caret>init {
// init comment2
}
fun foo() {
}
}
idea/testData/inspectionsLocal/redundantEmptyInitializerBlock/hasComment.kt.after
Vendored
+5
View File
@@ -0,0 +1,5 @@
class Test {
fun foo() {
}
}
idea/testData/inspectionsLocal/redundantEmptyInitializerBlock/notEmpty.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
// PROBLEM: none
class Test {
<caret>init {
foo()
}
fun foo() {
}
}
idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
Generated
+28
View File
@@ -6056,6 +6056,34 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest {
} }
} }
@TestMetadata("idea/testData/inspectionsLocal/redundantEmptyInitializerBlock")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class RedundantEmptyInitializerBlock extends AbstractLocalInspectionTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
}
public void testAllFilesPresentInRedundantEmptyInitializerBlock() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/inspectionsLocal/redundantEmptyInitializerBlock"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), TargetBackend.ANY, true);
}
@TestMetadata("empty.kt")
public void testEmpty() throws Exception {
runTest("idea/testData/inspectionsLocal/redundantEmptyInitializerBlock/empty.kt");
}
@TestMetadata("hasComment.kt")
public void testHasComment() throws Exception {
runTest("idea/testData/inspectionsLocal/redundantEmptyInitializerBlock/hasComment.kt");
}
@TestMetadata("notEmpty.kt")
public void testNotEmpty() throws Exception {
runTest("idea/testData/inspectionsLocal/redundantEmptyInitializerBlock/notEmpty.kt");
}
}
@TestMetadata("idea/testData/inspectionsLocal/redundantEnumConstructorInvocation") @TestMetadata("idea/testData/inspectionsLocal/redundantEnumConstructorInvocation")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)