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

unify project opening - IPR project must be opened in the same way as directory based (part 2)

Browse Source 
GitOrigin-RevId: 2c1c6ba19714509e1d6764a59ef14ba13b37d4f3
This commit is contained in:
Vladimir Krivosheev
2019-07-11 19:11:29 +03:00
committed by intellij-monorepo-bot
parent 5acd6d979c
commit 9a9f7e1dee
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/RecentProjectsManagerBase.java
+1 -1
View File
@@ -430,7 +430,7 @@ public class RecentProjectsManagerBase extends RecentProjectsManager implements
return existing;
}
if (Files.isDirectory(projectFile.resolve(Project.DIRECTORY_STORE_FOLDER))) {
if (ProjectUtil.isValidProjectPath(projectFile)) {
return PlatformProjectOpenProcessor.openExistingProject(projectFile, projectFile, openProjectOptions, null);
}
else {
platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java
+6 -4
View File
@@ -134,10 +134,7 @@ public class ProjectUtil {
}
}
if (Files.isDirectory(file.resolve(Project.DIRECTORY_STORE_FOLDER))) {
return PlatformProjectOpenProcessor.openExistingProject(file, file, options, null);
}
else if (StringUtil.endsWith(file.toString(), ProjectFileType.DOT_DEFAULT_EXTENSION) && Files.isRegularFile(file)) {
if (isValidProjectPath(file)) {
return PlatformProjectOpenProcessor.openExistingProject(file, file, options, null);
}
@@ -402,4 +399,9 @@ public class ProjectUtil {
}
return result;
}
public static boolean isValidProjectPath(@NotNull Path file) {
return Files.isDirectory(file.resolve(Project.DIRECTORY_STORE_FOLDER)) ||
(StringUtil.endsWith(file.toString(), ProjectFileType.DOT_DEFAULT_EXTENSION) && Files.isRegularFile(file));
}
}