From 7170209760133a3c519adea1ec238d0d06ab3af5 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Mon, 17 Nov 2014 14:21:24 +0300 Subject: [PATCH] Move: Suggest creating Kotlin file if it doesn't exist #KT-5379 Fixed --- .../plugin/refactoring/JetRefactoringBundle.properties | 4 +++- .../ui/MoveKotlinTopLevelDeclarationsDialog.java | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringBundle.properties b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringBundle.properties index 9339afa88e0..83ecec351cb 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringBundle.properties +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringBundle.properties @@ -42,4 +42,6 @@ package.private.0.will.no.longer.be.accessible.from.1=Package-private {0} will n 0.will.become.invisible.after.extraction={0} will become invisible after extraction setter.of.0.will.become.invisible.after.extraction = Setter of {0} will become invisible after extraction -naming.convention.will.be.violated.after.rename=Naming conventions will be violated after rename \ No newline at end of file +naming.convention.will.be.violated.after.rename=Naming conventions will be violated after rename + +file.does.not.exist=File {0} does not exist.\nDo you want to create it? \ No newline at end of file diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java index b3ae982fbb1..236525f568c 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java @@ -297,6 +297,14 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { JetFile jetFile = (JetFile) RefactoringPackage.toPsiFile(targetFile, myProject); if (jetFile != null) return new JetFileKotlinMoveTarget(jetFile); + int ret = Messages.showYesNoDialog( + myProject, + JetRefactoringBundle.message("file.does.not.exist", targetFile.getName()), + RefactoringBundle.message("move.title"), + Messages.getQuestionIcon() + ); + if (ret != Messages.YES) return null; + File targetDir = targetFile.getParentFile(); final PsiDirectory psiDirectory = RefactoringPackage.toPsiDirectory(targetDir, myProject); assert psiDirectory != null : "No directory found: " + targetDir.getPath();