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

manually re-apply 38b7de7484

Browse Source
This commit is contained in:
Kirill Timofeev
2019-01-25 14:23:59 +03:00
parent 8f0c079673
commit 38a94164ae
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/AttachToProcessActionBase.java
+12 -9
View File
@@ -82,7 +82,7 @@ public abstract class AttachToProcessActionBase extends AnAction {
@Override
public void run(@NotNull ProgressIndicator indicator) {
List<AttachItem> allItems = getTopLevelItems(indicator, project);
List<AttachItem> allItems = ContainerUtil.immutableList(getTopLevelItems(indicator, project));
ApplicationManager.getApplication().invokeLater(() -> {
AttachListStep step = new AttachListStep(allItems, XDebuggerBundle.message("xdebugger.attach.popup.title.default"), project);
@@ -127,15 +127,18 @@ public abstract class AttachToProcessActionBase extends AnAction {
}
@NotNull
protected List<AttachItem> getTopLevelItems(@NotNull ProgressIndicator indicator, @NotNull Project project) {
List<AttachToProcessItem> localAttachToProcessItems = collectAttachProcessItems(
project, LocalAttachHost.INSTANCE, indicator
);
List<AttachItem> remoteAttachToProcessItems = collectAttachHostsItems(
project, indicator
);
protected List<? extends AttachItem> getTopLevelItems(@NotNull ProgressIndicator indicator, @NotNull Project project) {
List<AttachItem> attachHostItems = collectAttachHostsItems(project, indicator);
return ContainerUtil.concat(remoteAttachToProcessItems, localAttachToProcessItems);
// If any of hosts available, fold local PIDs into "Local Host" subgroup
if (!attachHostItems.isEmpty()) {
AttachItem localHostGroupItem = new AttachHostItem(
LocalAttachHostPresentationGroup.INSTANCE, false, LocalAttachHost.INSTANCE, project, new UserDataHolderBase());
attachHostItems.add(localHostGroupItem);
doUpdateFirstInGroup(attachHostItems);
return attachHostItems;
}
return collectAttachProcessItems(project, LocalAttachHost.INSTANCE, indicator);
}
private static void doUpdateFirstInGroup(@NotNull List<? extends AttachItem> items) {