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

Move: Forbid refactoring if target file is the same as the original one

Browse Source
This commit is contained in:
Alexey Sedunov
2015-05-15 14:40:43 +03:00
parent 35bdf9c261
commit 1a60995ea9
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java
+15 -2
View File
@@ -355,7 +355,13 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
final String targetFileName = tfFileNameInPackage.getText();
PsiDirectory directory = moveDestination.getTargetIfExists(sourceFile);
if (directory != null && directory.findFile(targetFileName) != null) {
PsiFile targetFile = directory != null ? directory.findFile(targetFileName) : null;
if (targetFile != null) {
if (targetFile == sourceFile) {
setErrorText("Can't move to the original file");
return null;
}
String question = "File '" +
directory.getVirtualFile().getPath() +
"/" +
@@ -380,7 +386,14 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
final File targetFile = new File(getTargetFilePath());
JetFile jetFile = (JetFile) RefactoringPackage.toPsiFile(targetFile, myProject);
if (jetFile != null) return new JetFileKotlinMoveTarget(jetFile);
if (jetFile != null) {
if (jetFile == sourceFile) {
setErrorText("Can't move to the original file");
return null;
}
return new JetFileKotlinMoveTarget(jetFile);
}
int ret = Messages.showYesNoDialog(
myProject,