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

Move: Fix file rename on undo/redo

Browse Source
This commit is contained in:
Alexey Sedunov
2015-06-18 16:37:01 +03:00
parent a80f65cfd9
commit 77f2c5d5b9
1 changed files with 27 additions and 18 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
+27 -18
View File
@@ -46,6 +46,7 @@ import com.intellij.refactoring.util.CommonRefactoringUtil;
import com.intellij.ui.ComboboxWithBrowseButton; import com.intellij.ui.ComboboxWithBrowseButton;
import com.intellij.ui.RecentsManager; import com.intellij.ui.RecentsManager;
import com.intellij.ui.ReferenceEditorComboWithBrowseButton; import com.intellij.ui.ReferenceEditorComboWithBrowseButton;
import com.intellij.usageView.UsageInfo;
import com.intellij.util.IncorrectOperationException; import com.intellij.util.IncorrectOperationException;
import com.intellij.util.text.UniqueNameGenerator; import com.intellij.util.text.UniqueNameGenerator;
import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.UIUtil;
@@ -514,26 +515,10 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
PsiDirectory targetDir = moveDestination.getTargetIfExists(sourceFile); PsiDirectory targetDir = moveDestination.getTargetIfExists(sourceFile);
final String targetFileName = tfFileNameInPackage.getText(); final String targetFileName = tfFileNameInPackage.getText();
if (targetDir == null || targetDir.findFile(targetFileName) == null) { if (targetDir == null || targetDir.findFile(targetFileName) == null) {
//noinspection ConstantConditions
final String temporaryName = UniqueNameGenerator.generateUniqueName(
"temp",
"",
".kt",
KotlinPackage.map(
sourceFile.getContainingDirectory().getFiles(),
new Function1<PsiFile, String>() {
@Override
public String invoke(PsiFile file) {
return file.getName();
}
}
)
);
PsiDirectory targetDirectory = ApplicationPackage.runWriteAction( PsiDirectory targetDirectory = ApplicationPackage.runWriteAction(
new Function0<PsiDirectory>() { new Function0<PsiDirectory>() {
@Override @Override
public PsiDirectory invoke() { public PsiDirectory invoke() {
sourceFile.setName(temporaryName);
return moveDestination.getTargetDirectory(sourceFile); return moveDestination.getTargetDirectory(sourceFile);
} }
} }
@@ -560,7 +545,29 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
} }
}, },
EmptyRunnable.INSTANCE EmptyRunnable.INSTANCE
) ) {
@Override
protected void performRefactoring(UsageInfo[] usages) {
//noinspection ConstantConditions
String temporaryName = UniqueNameGenerator.generateUniqueName(
"temp",
"",
".kt",
KotlinPackage.map(
sourceFile.getContainingDirectory().getFiles(),
new Function1<PsiFile, String>() {
@Override
public String invoke(PsiFile file) {
return file.getName();
}
}
)
);
sourceFile.setName(temporaryName);
super.performRefactoring(usages);
}
}
); );
return; return;
@@ -568,7 +575,9 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
int ret = Messages.showYesNoCancelDialog( int ret = Messages.showYesNoCancelDialog(
myProject, myProject,
"You are going to move all declarations out of '" + sourceFile.getVirtualFile().getPath() + "'. Do you want to delete this file?", "You are going to move all declarations out of '" +
sourceFile.getVirtualFile().getPath() +
"'. Do you want to delete this file?",
RefactoringBundle.message("move.title"), RefactoringBundle.message("move.title"),
Messages.getQuestionIcon() Messages.getQuestionIcon()
); );