From 6afd86a95a4ea963ec228e30db1f2795c6c34d48 Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Wed, 6 Mar 2019 15:19:35 +0300
Subject: [PATCH] handle default project that can appear via Welcome Screen |
Settings
---
.../refactoring/copy/CopyFilesOrDirectoriesHandler.java | 2 +-
.../com/intellij/openapi/fileChooser/impl/FileChooserUtil.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesHandler.java b/platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesHandler.java
index dbe2f3fc6dec..84861e96dad8 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesHandler.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesHandler.java
@@ -80,7 +80,7 @@ public class CopyFilesOrDirectoriesHandler extends CopyHandlerDelegateBase {
private static PsiDirectory tryNotNullizeDirectory(@NotNull Project project, @Nullable PsiDirectory defaultTargetDirectory) {
if (defaultTargetDirectory == null) {
VirtualFile root = FileChooserUtil.getLastOpenedFile(project);
- if (root == null) root = ProjectUtil.guessProjectDir(project);
+ if (root == null) root = project.isDefault() ? null : ProjectUtil.guessProjectDir(project);
if (root == null) root = VfsUtil.getUserHomeDir();
defaultTargetDirectory = root == null ? null :
root.isDirectory() ? PsiManager.getInstance(project).findDirectory(root) :
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/impl/FileChooserUtil.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/impl/FileChooserUtil.java
index d5704ed2800d..40c89858dbd6 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/impl/FileChooserUtil.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/impl/FileChooserUtil.java
@@ -54,7 +54,7 @@ public final class FileChooserUtil {
VirtualFile result;
if (toSelect == null && lastPath == null) {
- result = project == null ? null : ProjectUtil.guessProjectDir(project);
+ result = project == null || project.isDefault() ? null : ProjectUtil.guessProjectDir(project);
}
else if (toSelect != null && lastPath != null) {
if (Boolean.TRUE.equals(descriptor.getUserData(PathChooserDialog.PREFER_LAST_OVER_EXPLICIT))) {
--
GitLab