Implement "Safe Delete" refactoring for value parameters
This commit is contained in:
Alexey Sedunov
@@ -23,6 +23,7 @@ import com.intellij.openapi.util.text.StringUtil;
|
||||
import com.intellij.openapi.vfs.CharsetToolkit;
|
||||
import com.intellij.psi.PsiElement;
|
||||
import com.intellij.psi.PsiMethod;
|
||||
import com.intellij.psi.PsiParameter;
|
||||
import com.intellij.psi.util.PsiTreeUtil;
|
||||
import com.intellij.refactoring.BaseRefactoringProcessor;
|
||||
import com.intellij.refactoring.safeDelete.SafeDeleteHandler;
|
||||
@@ -92,6 +93,14 @@ public abstract class AbstractJetSafeDeleteTest extends LightCodeInsightFixtureT
|
||||
doTest(path, JetTypeParameter.class, true);
|
||||
}
|
||||
|
||||
public void doValueParameterTest(@NotNull String path) throws Exception {
|
||||
doTest(path, JetParameter.class, false);
|
||||
}
|
||||
|
||||
public void doValueParameterTestWithJava(@NotNull String path) throws Exception {
|
||||
doTest(path, JetParameter.class, true);
|
||||
}
|
||||
|
||||
private <T extends PsiElement> void doTest(
|
||||
@NotNull String path, @NotNull Class<T> elementClass, boolean withJava) throws Exception {
|
||||
String[] filePaths;
|
||||
|
||||
@@ -30,7 +30,7 @@ import org.jetbrains.jet.safeDelete.AbstractJetSafeDeleteTest;
|
||||
|
||||
/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */
|
||||
@SuppressWarnings("all")
|
||||
@InnerTestClasses({JetSafeDeleteTestGenerated.KotlinClass.class, JetSafeDeleteTestGenerated.KotlinObject.class, JetSafeDeleteTestGenerated.KotlinFunction.class, JetSafeDeleteTestGenerated.KotlinFunctionWithJava.class, JetSafeDeleteTestGenerated.JavaFunctionWithKotlin.class, JetSafeDeleteTestGenerated.KotlinProperty.class, JetSafeDeleteTestGenerated.KotlinPropertyWithJava.class, JetSafeDeleteTestGenerated.JavaPropertyWithKotlin.class, JetSafeDeleteTestGenerated.KotlinTypeParameter.class, JetSafeDeleteTestGenerated.KotlinTypeParameterWithJava.class})
|
||||
@InnerTestClasses({JetSafeDeleteTestGenerated.KotlinClass.class, JetSafeDeleteTestGenerated.KotlinObject.class, JetSafeDeleteTestGenerated.KotlinFunction.class, JetSafeDeleteTestGenerated.KotlinFunctionWithJava.class, JetSafeDeleteTestGenerated.JavaFunctionWithKotlin.class, JetSafeDeleteTestGenerated.KotlinProperty.class, JetSafeDeleteTestGenerated.KotlinPropertyWithJava.class, JetSafeDeleteTestGenerated.JavaPropertyWithKotlin.class, JetSafeDeleteTestGenerated.KotlinTypeParameter.class, JetSafeDeleteTestGenerated.KotlinTypeParameterWithJava.class, JetSafeDeleteTestGenerated.KotlinValueParameter.class, JetSafeDeleteTestGenerated.KotlinValueParameterWithJava.class})
|
||||
public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
|
||||
@TestMetadata("idea/testData/safeDelete/deleteClass/kotlinClass")
|
||||
public static class KotlinClass extends AbstractJetSafeDeleteTest {
|
||||
@@ -632,6 +632,217 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
|
||||
|
||||
}
|
||||
|
||||
@TestMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter")
|
||||
public static class KotlinValueParameter extends AbstractJetSafeDeleteTest {
|
||||
public void testAllFilesPresentInKotlinValueParameter() throws Exception {
|
||||
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter"), Pattern.compile("^(.+)\\.kt$"), true);
|
||||
}
|
||||
|
||||
@TestMetadata("hierarchyWithSafeUsages1.kt")
|
||||
public void testHierarchyWithSafeUsages1() throws Exception {
|
||||
doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages1.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("hierarchyWithSafeUsages2.kt")
|
||||
public void testHierarchyWithSafeUsages2() throws Exception {
|
||||
doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages2.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("hierarchyWithSafeUsages3.kt")
|
||||
public void testHierarchyWithSafeUsages3() throws Exception {
|
||||
doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages3.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("hierarchyWithSafeUsages4.kt")
|
||||
public void testHierarchyWithSafeUsages4() throws Exception {
|
||||
doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages4.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("hierarchyWithSafeUsages5.kt")
|
||||
public void testHierarchyWithSafeUsages5() throws Exception {
|
||||
doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages5.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("hierarchyWithUnsafeUsages1.kt")
|
||||
public void testHierarchyWithUnsafeUsages1() throws Exception {
|
||||
doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages1.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("hierarchyWithUnsafeUsages2.kt")
|
||||
public void testHierarchyWithUnsafeUsages2() throws Exception {
|
||||
doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages2.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("hierarchyWithUnsafeUsages3.kt")
|
||||
public void testHierarchyWithUnsafeUsages3() throws Exception {
|
||||
doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages3.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("hierarchyWithUnsafeUsages4.kt")
|
||||
public void testHierarchyWithUnsafeUsages4() throws Exception {
|
||||
doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages4.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("hierarchyWithUnsafeUsages5.kt")
|
||||
public void testHierarchyWithUnsafeUsages5() throws Exception {
|
||||
doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages5.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("hierarchyWithUnsafeUsages6.kt")
|
||||
public void testHierarchyWithUnsafeUsages6() throws Exception {
|
||||
doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages6.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("hierarchyWithUnsafeUsages7.kt")
|
||||
public void testHierarchyWithUnsafeUsages7() throws Exception {
|
||||
doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages7.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("hierarchyWithUnsafeUsages8.kt")
|
||||
public void testHierarchyWithUnsafeUsages8() throws Exception {
|
||||
doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages8.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("internalUsage1.kt")
|
||||
public void testInternalUsage1() throws Exception {
|
||||
doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage1.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("internalUsage2.kt")
|
||||
public void testInternalUsage2() throws Exception {
|
||||
doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage2.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("safeUsages1.kt")
|
||||
public void testSafeUsages1() throws Exception {
|
||||
doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages1.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("safeUsages2.kt")
|
||||
public void testSafeUsages2() throws Exception {
|
||||
doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages2.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("safeUsages3.kt")
|
||||
public void testSafeUsages3() throws Exception {
|
||||
doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages3.kt");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@TestMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava")
|
||||
public static class KotlinValueParameterWithJava extends AbstractJetSafeDeleteTest {
|
||||
public void testAllFilesPresentInKotlinValueParameterWithJava() throws Exception {
|
||||
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava"), Pattern.compile("^(.+)\\.kt$"), true);
|
||||
}
|
||||
|
||||
@TestMetadata("hierarchyWithSafeUsages1.kt")
|
||||
public void testHierarchyWithSafeUsages1() throws Exception {
|
||||
doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages1.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("hierarchyWithSafeUsages2.kt")
|
||||
public void testHierarchyWithSafeUsages2() throws Exception {
|
||||
doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages2.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("hierarchyWithSafeUsages3.kt")
|
||||
public void testHierarchyWithSafeUsages3() throws Exception {
|
||||
doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages3.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("hierarchyWithSafeUsages4.kt")
|
||||
public void testHierarchyWithSafeUsages4() throws Exception {
|
||||
doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages4.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("hierarchyWithSafeUsages5.kt")
|
||||
public void testHierarchyWithSafeUsages5() throws Exception {
|
||||
doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages5.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("hierarchyWithUnsafeUsages1.kt")
|
||||
public void testHierarchyWithUnsafeUsages1() throws Exception {
|
||||
doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages1.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("hierarchyWithUnsafeUsages2.kt")
|
||||
public void testHierarchyWithUnsafeUsages2() throws Exception {
|
||||
doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages2.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("hierarchyWithUnsafeUsages3.kt")
|
||||
public void testHierarchyWithUnsafeUsages3() throws Exception {
|
||||
doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages3.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("hierarchyWithUnsafeUsages4.kt")
|
||||
public void testHierarchyWithUnsafeUsages4() throws Exception {
|
||||
doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages4.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("hierarchyWithUnsafeUsages5.kt")
|
||||
public void testHierarchyWithUnsafeUsages5() throws Exception {
|
||||
doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages5.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("internalUsage1.kt")
|
||||
public void testInternalUsage1() throws Exception {
|
||||
doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage1.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("internalUsage2.kt")
|
||||
public void testInternalUsage2() throws Exception {
|
||||
doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage2.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("mixedHierarchy1.kt")
|
||||
public void testMixedHierarchy1() throws Exception {
|
||||
doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy1.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("mixedHierarchy2.kt")
|
||||
public void testMixedHierarchy2() throws Exception {
|
||||
doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy2.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("mixedHierarchy3.kt")
|
||||
public void testMixedHierarchy3() throws Exception {
|
||||
doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy3.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("mixedHierarchyWithUnsafeUsages1.kt")
|
||||
public void testMixedHierarchyWithUnsafeUsages1() throws Exception {
|
||||
doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages1.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("mixedHierarchyWithUnsafeUsages2.kt")
|
||||
public void testMixedHierarchyWithUnsafeUsages2() throws Exception {
|
||||
doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages2.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("mixedHierarchyWithUnsafeUsages3.kt")
|
||||
public void testMixedHierarchyWithUnsafeUsages3() throws Exception {
|
||||
doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages3.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("safeUsages1.kt")
|
||||
public void testSafeUsages1() throws Exception {
|
||||
doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages1.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("safeUsages2.kt")
|
||||
public void testSafeUsages2() throws Exception {
|
||||
doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages2.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("safeUsages3.kt")
|
||||
public void testSafeUsages3() throws Exception {
|
||||
doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages3.kt");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public static Test suite() {
|
||||
TestSuite suite = new TestSuite("JetSafeDeleteTestGenerated");
|
||||
suite.addTestSuite(KotlinClass.class);
|
||||
@@ -644,6 +855,8 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
|
||||
suite.addTestSuite(JavaPropertyWithKotlin.class);
|
||||
suite.addTestSuite(KotlinTypeParameter.class);
|
||||
suite.addTestSuite(KotlinTypeParameterWithJava.class);
|
||||
suite.addTestSuite(KotlinValueParameter.class);
|
||||
suite.addTestSuite(KotlinValueParameterWithJava.class);
|
||||
return suite;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user