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

Implement Intention + Inspection to remove empty secondary constructor body #KT-14326 Fixed

Browse Source
This commit is contained in:
Kirill Rakhman
2016-10-31 23:31:06 +01:00
committed by Mikhail Glukhikh
parent 495dd3641c
commit 8a73a1da2c
10 changed files with 100 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/resources/intentionDescriptions/RemoveEmptySecondaryConstructorBodyIntention/after.kt.template
+1
View File
@@ -0,0 +1 @@
constructor(a: Int)
idea/resources/intentionDescriptions/RemoveEmptySecondaryConstructorBodyIntention/before.kt.template
+3
View File
@@ -0,0 +1,3 @@
constructor(a: Int) <spot>{
}</spot>
idea/resources/intentionDescriptions/RemoveEmptySecondaryConstructorBodyIntention/description.html
+5
View File
@@ -0,0 +1,5 @@
<html>
<body>
This intention removes empty bodies of secondary constructors
</body>
</html>
idea/src/META-INF/plugin.xml
+13
View File
@@ -1420,6 +1420,11 @@
<category>Kotlin</category> <category>Kotlin</category>
</intentionAction> </intentionAction>
<intentionAction>
<className>org.jetbrains.kotlin.idea.intentions.RemoveEmptySecondaryConstructorBodyIntention</className>
<category>Kotlin</category>
</intentionAction>
<localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.ObjectLiteralToLambdaInspection" <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.ObjectLiteralToLambdaInspection"
displayName="Object literal can be converted to lambda" displayName="Object literal can be converted to lambda"
groupName="Kotlin" groupName="Kotlin"
@@ -1902,6 +1907,14 @@
language="kotlin" language="kotlin"
/> />
<localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.RemoveEmptySecondaryConstructorBodyInspection"
displayName="Remove empty constructor body"
groupName="Kotlin"
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/intentions/RemoveEmptySecondaryConstructorBodyIntention.kt
+42
View File
@@ -0,0 +1,42 @@
/*
* 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.intentions
import com.intellij.codeInspection.CleanupLocalInspectionTool
import com.intellij.codeInspection.ProblemHighlightType
import com.intellij.openapi.editor.Editor
import org.jetbrains.kotlin.idea.inspections.IntentionBasedInspection
import org.jetbrains.kotlin.psi.KtBlockExpression
import org.jetbrains.kotlin.psi.KtSecondaryConstructor
class RemoveEmptySecondaryConstructorBodyInspection : IntentionBasedInspection<KtBlockExpression>(RemoveEmptySecondaryConstructorBodyIntention::class), CleanupLocalInspectionTool {
override val problemHighlightType: ProblemHighlightType
get() = ProblemHighlightType.LIKE_UNUSED_SYMBOL
}
class RemoveEmptySecondaryConstructorBodyIntention() : SelfTargetingOffsetIndependentIntention<KtBlockExpression>(KtBlockExpression::class.java, "Remove empty constructor body") {
override fun applyTo(element: KtBlockExpression, editor: Editor?) = element.delete()
override fun isApplicableTo(element: KtBlockExpression): Boolean {
if(element.parent !is KtSecondaryConstructor) return false
if(element.statements.isNotEmpty()) return false
return element.text.replace("{", "").replace("}", "").isBlank()
}
}
idea/testData/intentions/removeEmptySecondaryConstructorBody/.intention
Vendored
+1
View File
@@ -0,0 +1 @@
org.jetbrains.kotlin.idea.intentions.RemoveEmptySecondaryConstructorBodyIntention
idea/testData/intentions/removeEmptySecondaryConstructorBody/comment.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
// IS_APPLICABLE: false
class Foo() {
constructor(a: Int) : this() <caret>{
//comment
}
}
idea/testData/intentions/removeEmptySecondaryConstructorBody/simple.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
class Foo() {
constructor(a: Int) : this() <caret>{
}
}
idea/testData/intentions/removeEmptySecondaryConstructorBody/simple.kt.after
Vendored
+3
View File
@@ -0,0 +1,3 @@
class Foo() {
constructor(a: Int) : this()<caret>
}
idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+21
View File
@@ -10843,6 +10843,27 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
} }
} }
@TestMetadata("idea/testData/intentions/removeEmptySecondaryConstructorBody")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class RemoveEmptySecondaryConstructorBody extends AbstractIntentionTest {
public void testAllFilesPresentInRemoveEmptySecondaryConstructorBody() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeEmptySecondaryConstructorBody"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
}
@TestMetadata("comment.kt")
public void testComment() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeEmptySecondaryConstructorBody/comment.kt");
doTest(fileName);
}
@TestMetadata("simple.kt")
public void testSimple() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeEmptySecondaryConstructorBody/simple.kt");
doTest(fileName);
}
}
@TestMetadata("idea/testData/intentions/removeExplicitLambdaParameterTypes") @TestMetadata("idea/testData/intentions/removeExplicitLambdaParameterTypes")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)