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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Konstantin Bulenkov
2017-02-14 11:20:55 +01:00
parent 762545e080 64db043651
commit fd1ff72100
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesHandler.java
+14 -5
View File
@@ -44,6 +44,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -136,7 +137,10 @@ public class CopyFilesOrDirectoriesHandler extends CopyHandlerDelegateBase {
return;
}
copyImpl(elements, newName, targetDirectory, false, openInEditor);
SmartPointerManager manager = SmartPointerManager.getInstance(project);
copyImpl(Arrays.stream(elements)
.map(el -> manager.createSmartPsiElementPointer(el))
.toArray(SmartPsiElementPointer[]::new), newName, targetDirectory, false, openInEditor);
}
}
@@ -160,7 +164,10 @@ public class CopyFilesOrDirectoriesHandler extends CopyHandlerDelegateBase {
CopyFilesOrDirectoriesDialog dialog = new CopyFilesOrDirectoriesDialog(elements, null, element.getProject(), true);
if (dialog.showAndGet()) {
String newName = dialog.getNewName();
copyImpl(elements, newName, targetDirectory, true, true);
SmartPointerManager manager = SmartPointerManager.getInstance(element.getProject());
copyImpl(Arrays.stream(elements)
.map(el -> manager.createSmartPsiElementPointer(el))
.toArray(SmartPsiElementPointer[]::new), newName, targetDirectory, true, true);
}
}
@@ -203,7 +210,7 @@ public class CopyFilesOrDirectoriesHandler extends CopyHandlerDelegateBase {
* @param targetDirectory
* @param openInEditor
*/
private static void copyImpl(@NotNull final PsiElement[] elements,
private static void copyImpl(@NotNull final SmartPsiElementPointer[] elements,
@Nullable final String newName,
@NotNull final PsiDirectory targetDirectory,
final boolean doClone,
@@ -225,8 +232,10 @@ public class CopyFilesOrDirectoriesHandler extends CopyHandlerDelegateBase {
try {
PsiFile firstFile = null;
final int[] choice = elements.length > 1 || elements[0] instanceof PsiDirectory ? new int[]{-1} : null;
for (PsiElement element : elements) {
PsiFile f = copyToDirectory((PsiFileSystemItem)element, newName, targetDirectory, choice, title);
for (SmartPsiElementPointer element : elements) {
PsiElement psiElement = element.getElement();
if (psiElement == null) continue;
PsiFile f = copyToDirectory((PsiFileSystemItem)psiElement, newName, targetDirectory, choice, title);
if (firstFile == null) {
firstFile = f;
}