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

Move: Do not create target directory outside of write-action

Browse Source
This commit is contained in:
Alexey Sedunov
2016-01-28 13:53:03 +03:00
parent 222dfd265b
commit 625bfe12eb
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java
+4 -4
View File
@@ -489,7 +489,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
PsiDirectory sourceDirectory = getSourceDirectory(sourceFiles); PsiDirectory sourceDirectory = getSourceDirectory(sourceFiles);
if (isMoveToPackage()) { if (isMoveToPackage()) {
MoveDestination moveDestination = selectPackageBasedMoveDestination(true); final MoveDestination moveDestination = selectPackageBasedMoveDestination(true);
if (moveDestination == null) return null; if (moveDestination == null) return null;
final String targetFileName = sourceFiles.size() > 1 ? null : tfFileNameInPackage.getText(); final String targetFileName = sourceFiles.size() > 1 ? null : tfFileNameInPackage.getText();
@@ -533,15 +533,15 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
} }
// All source files must be in the same directory // All source files must be in the same directory
final PsiDirectory targetDir = moveDestination.getTargetDirectory(sourceFiles.get(0));
return new KotlinMoveTargetForDeferredFile( return new KotlinMoveTargetForDeferredFile(
new FqName(getTargetPackage()), new FqName(getTargetPackage()),
targetDir, moveDestination.getTargetIfExists(sourceFiles.get(0)),
new Function1<KtFile, KtFile>() { new Function1<KtFile, KtFile>() {
@Override @Override
public KtFile invoke(@NotNull KtFile originalFile) { public KtFile invoke(@NotNull KtFile originalFile) {
return JetRefactoringUtilKt.getOrCreateKotlinFile( return JetRefactoringUtilKt.getOrCreateKotlinFile(
targetFileName != null ? targetFileName : originalFile.getName(), targetDir targetFileName != null ? targetFileName : originalFile.getName(),
moveDestination.getTargetDirectory(originalFile)
); );
} }
} }