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

EA-99924 - SOE: CopyPasteDelegator$MyEditable.pasteAfterCopy

Browse Source
This commit is contained in:
Anna.Kozlova
2017-04-04 15:08:19 +02:00
parent 525a42d851
commit 1ae435e59f
1 changed files with 4 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
+4 -4
View File
@@ -150,7 +150,7 @@ public abstract class CopyPasteDelegator implements CopyPasteSupport {
final Module module = LangDataKeys.MODULE.getData(dataContext);
PsiElement target = getPasteTarget(dataContext, module);
if (isCopied[0]) {
TransactionGuard.getInstance().submitTransactionAndWait(() -> pasteAfterCopy(elements, module, target));
TransactionGuard.getInstance().submitTransactionAndWait(() -> pasteAfterCopy(elements, module, target, true));
}
else if (MoveHandler.canMove(elements, target)) {
TransactionGuard.getInstance().submitTransactionAndWait(() -> pasteAfterCut(dataContext, elements, target));
@@ -197,13 +197,13 @@ public abstract class CopyPasteDelegator implements CopyPasteSupport {
return targetDirectory;
}
private void pasteAfterCopy(PsiElement[] elements, Module module, PsiElement target) {
private void pasteAfterCopy(PsiElement[] elements, Module module, PsiElement target, boolean tryFromFiles) {
PsiDirectory targetDirectory = getTargetDirectory(module, target);
try {
if (CopyHandler.canCopy(elements)) {
CopyHandler.doCopy(elements, targetDirectory);
}
else {
else if (tryFromFiles) {
List<File> files = PsiCopyPasteManager.asFileList(elements);
if (files != null) {
PsiManager manager = elements[0].getManager();
@@ -218,7 +218,7 @@ public abstract class CopyPasteDelegator implements CopyPasteSupport {
})
.filter(file -> file != null)
.toArray(PsiFileSystemItem[]::new);
pasteAfterCopy(items, module, target);
pasteAfterCopy(items, module, target, false);
}
}
}