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

Separate logic to determine if current open project actions corresponds to a project, see RIDER-39741

Browse Source 
GitOrigin-RevId: 220f9012988bfa8cd73b571407f9db82664fba64
This commit is contained in:
Evgeniy.Stepanov
2020-05-14 20:33:40 +00:00
committed by intellij-monorepo-bot
parent cb52012217
commit f9b0edafd1
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/RecentProjectListActionProvider.kt
+8
View File
@@ -4,6 +4,7 @@ package com.intellij.ide
import com.intellij.ide.impl.ProjectUtil
import com.intellij.openapi.actionSystem.AnAction
import com.intellij.openapi.components.service
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.util.text.StringUtil
import com.intellij.util.containers.ContainerUtil
@@ -93,6 +94,13 @@ open class RecentProjectListActionProvider {
return ReopenProjectAction(path, projectName, displayName)
}
/**
* Returns true if action corresponds to specified project
*/
open fun isCurrentProjectAction(project: Project, action: ReopenProjectAction): Boolean {
return StringUtil.equals(action.projectPath, project.basePath)
}
private fun getDuplicateProjectNames(openedPaths: Set<String>, recentPaths: Collection<String>): Set<String> {
val names = mutableSetOf<String>()
val duplicates = mutableSetOf<String>()
platform/platform-impl/src/com/intellij/ide/actions/RecentProjectsGroup.java
+2 -1
View File
@@ -34,9 +34,10 @@ public class RecentProjectsGroup extends ActionGroup implements DumbAware {
return actions.toArray(EMPTY_ARRAY);
}
RecentProjectListActionProvider provider = RecentProjectListActionProvider.getInstance();
List<AnAction> list = new ArrayList<>();
for (AnAction action : actions) {
if (!(action instanceof ReopenProjectAction) || !StringUtil.equals(((ReopenProjectAction)action).getProjectPath(), project.getBasePath())) {
if (!(action instanceof ReopenProjectAction) || !provider.isCurrentProjectAction(project, (ReopenProjectAction)action)) {
list.add(action);
}
}