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

Move: Warn about moving to the existing file in "Move to Package" mode

Browse Source
This commit is contained in:
Alexey Sedunov
2015-05-14 19:46:39 +03:00
parent 870c9c4668
commit 7cf7a14d9b
1 changed files with 14 additions and 1 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
+14 -1
View File
@@ -344,6 +344,19 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
final MoveDestination moveDestination = ((DestinationFolderComboBox) destinationFolderCB).selectDirectory(targetPackage, false); final MoveDestination moveDestination = ((DestinationFolderComboBox) destinationFolderCB).selectDirectory(targetPackage, false);
if (moveDestination == null) return null; if (moveDestination == null) return null;
final String targetFileName = tfFileNameInPackage.getText();
PsiDirectory directory = moveDestination.getTargetIfExists(sourceFile);
if (directory != null && directory.findFile(targetFileName) != null) {
String question = "File '" +
directory.getVirtualFile().getPath() +
"/" +
targetFileName +
"' already exists. Do you want to move selected declarations to this file?";
int ret = Messages.showYesNoDialog(myProject, question, RefactoringBundle.message("move.title"), Messages.getQuestionIcon());
if (ret != Messages.YES) return null;
}
return new DeferredJetFileKotlinMoveTarget( return new DeferredJetFileKotlinMoveTarget(
myProject, myProject,
new FqName(targetPackage.getQualifiedName()), new FqName(targetPackage.getQualifiedName()),
@@ -351,7 +364,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
@Override @Override
public JetFile invoke() { public JetFile invoke() {
PsiDirectory directory = moveDestination.getTargetDirectory(sourceFile); PsiDirectory directory = moveDestination.getTargetDirectory(sourceFile);
return RefactoringPackage.getOrCreateKotlinFile(tfFileNameInPackage.getText(), directory); return RefactoringPackage.getOrCreateKotlinFile(targetFileName, directory);
} }
} }
); );