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

Move: Support method moving

Browse Source
This commit is contained in:
aleksandrina-streltsova
2020-06-03 11:17:57 +03:00
committed by Igor Yakovlev
parent a5368e443c
commit 5515465760
34 changed files with 1050 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractMoveTest.kt
+29
View File
@@ -29,14 +29,19 @@ import org.jetbrains.kotlin.idea.refactoring.createKotlinFile
import org.jetbrains.kotlin.idea.refactoring.move.changePackage.KotlinChangePackageRefactoring
import org.jetbrains.kotlin.idea.refactoring.move.moveClassesOrPackages.KotlinAwareDelegatingMoveDestination
import org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.*
import org.jetbrains.kotlin.idea.refactoring.move.moveMethod.MoveKotlinMethodProcessor
import org.jetbrains.kotlin.idea.refactoring.runRefactoringTest
import org.jetbrains.kotlin.idea.search.allScope
import org.jetbrains.kotlin.idea.search.projectScope
import org.jetbrains.kotlin.idea.stubindex.KotlinFullClassNameIndex
import org.jetbrains.kotlin.idea.stubindex.KotlinFunctionShortNameIndex
import org.jetbrains.kotlin.idea.stubindex.KotlinPropertyShortNameIndex
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.KtClass
import org.jetbrains.kotlin.psi.KtClassOrObject
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtNamedDeclaration
import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
abstract class AbstractMoveTest : AbstractMultifileRefactoringTest() {
@@ -283,5 +288,29 @@ enum class MoveAction : AbstractMultifileRefactoringTest.RefactoringAction {
val descriptor = MoveDeclarationsDescriptor(project, MoveSource(elementToMove), moveTarget, delegate)
MoveKotlinDeclarationsProcessor(descriptor).run()
}
},
MOVE_KOTLIN_METHOD {
override fun runRefactoring(rootDir: VirtualFile, mainFile: PsiFile, elementsAtCaret: List<PsiElement>, config: JsonObject) {
val project = mainFile.project
val method =
KotlinFunctionShortNameIndex.getInstance().get(config.getString("methodToMove"), project, project.projectScope()).first()
val methodParameterName = config.getNullableString("methodParameter")
val sourcePropertyName = config.getNullableString("sourceProperty")
val targetObjectName = config.getNullableString("targetObject")
val targetVariable = when {
methodParameterName != null -> method.valueParameters.find { it.name == methodParameterName }!!
sourcePropertyName != null -> KotlinPropertyShortNameIndex.getInstance()
.get(sourcePropertyName, project, project.projectScope()).first()
else -> KotlinFullClassNameIndex.getInstance().get(targetObjectName!!, project, project.projectScope()).first()
}
val oldClassParameterNames = mutableMapOf<KtClass, String>()
val outerInstanceParameter = config.getNullableString("outerInstanceParameter")
if (outerInstanceParameter != null) {
oldClassParameterNames[method.containingClassOrObject as KtClass] = outerInstanceParameter
}
MoveKotlinMethodProcessor(method, targetVariable, oldClassParameterNames).run()
}
};
}
idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveTestGenerated.java
Generated
+15
View File
@@ -323,6 +323,21 @@ public class MoveTestGenerated extends AbstractMoveTest {
runTest("idea/testData/refactoring/move/kotlin/moveFile/typeRefWithArguments/typeRefWithArguments.test");
}
@TestMetadata("kotlin/moveMethod/moveToClass/parameterAsReference/parameterAsReference.test")
public void testKotlin_moveMethod_moveToClass_parameterAsReference_ParameterAsReference() throws Exception {
runTest("idea/testData/refactoring/move/kotlin/moveMethod/moveToClass/parameterAsReference/parameterAsReference.test");
}
@TestMetadata("kotlin/moveMethod/moveToClass/propertyAsReference/propertyAsReference.test")
public void testKotlin_moveMethod_moveToClass_propertyAsReference_PropertyAsReference() throws Exception {
runTest("idea/testData/refactoring/move/kotlin/moveMethod/moveToClass/propertyAsReference/propertyAsReference.test");
}
@TestMetadata("kotlin/moveMethod/moveToObject/moveToObject.test")
public void testKotlin_moveMethod_moveToObject_MoveToObject() throws Exception {
runTest("idea/testData/refactoring/move/kotlin/moveMethod/moveToObject/moveToObject.test");
}
@TestMetadata("kotlin/moveNestedClass/callableReferences/nestedToAnotherClass/nestedToAnotherClass.test")
public void testKotlin_moveNestedClass_callableReferences_nestedToAnotherClass_NestedToAnotherClass() throws Exception {
runTest("idea/testData/refactoring/move/kotlin/moveNestedClass/callableReferences/nestedToAnotherClass/nestedToAnotherClass.test");