MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

copy: initialize initial target directory based on target selected, avoids changing current project in case of 2 open (IDEA-142307)

Browse Source
This commit is contained in:
Anna Kozlova
2015-07-14 22:07:17 +03:00
parent a7c3221a61
commit 72cc102c0d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/CopyPasteDelegator.java
+7 -4
View File
@@ -25,10 +25,7 @@ import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Key;
import com.intellij.psi.PsiDirectory;
import com.intellij.psi.PsiDirectoryContainer;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiManager;
import com.intellij.psi.*;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.refactoring.copy.CopyHandler;
import com.intellij.refactoring.move.MoveCallback;
@@ -164,6 +161,12 @@ public abstract class CopyPasteDelegator implements CopyPasteSupport {
targetDirectory.putCopyableUserData(SHOW_CHOOSER_KEY, directories.length > 1);
}
}
if (targetDirectory == null && target != null) {
final PsiFile containingFile = target.getContainingFile();
if (containingFile != null) {
targetDirectory = containingFile.getContainingDirectory();
}
}
if (CopyHandler.canCopy(elements)) {
CopyHandler.doCopy(elements, targetDirectory);
}