Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Intellij Community
Commits
6afd86a9
Commit
6afd86a9
authored
6 years ago
by
Gregory.Shrago
1
Browse files
Options
Download
Email Patches
Plain Diff
handle default project that can appear via Welcome Screen | Settings
parent
5c97abf4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesHandler.java
+1
-1
...ellij/refactoring/copy/CopyFilesOrDirectoriesHandler.java
platform/platform-impl/src/com/intellij/openapi/fileChooser/impl/FileChooserUtil.java
+1
-1
...om/intellij/openapi/fileChooser/impl/FileChooserUtil.java
with
2 additions
and
2 deletions
+2
-2
platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesHandler.java
+
1
-
1
View file @
6afd86a9
...
...
@@ -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
)
:
...
...
This diff is collapsed.
Click to expand it.
platform/platform-impl/src/com/intellij/openapi/fileChooser/impl/FileChooserUtil.java
+
1
-
1
View file @
6afd86a9
...
...
@@ -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
)))
{
...
...
This diff is collapsed.
Click to expand it.
小 白蛋
@baidan
mentioned in commit
40bc029b
·
2 years ago
mentioned in commit
40bc029b
mentioned in commit 40bc029bcacf0cfee6792edff960f2826fdb1386
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment