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

fixing IDEA-142798 Debugger does not activate correct session on breakpoint

Browse Source
This commit is contained in:
Egor.Ushakov
2015-07-21 19:29:08 +03:00
parent 847bd7e469
commit 2469bb7be0
2 changed files with 49 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerManagerImpl.java
+6
View File
@@ -263,6 +263,12 @@ public class XDebuggerManagerImpl extends XDebuggerManager
public void setActiveSession(@Nullable XDebugSessionImpl session, @Nullable XSourcePosition position, boolean useSelection,
final @Nullable GutterIconRenderer gutterIconRenderer) {
boolean sessionChanged = myActiveSession.getAndSet(session) != session;
if (sessionChanged && session != null) {
XDebugSessionTab tab = session.getSessionTab();
if (tab != null) {
tab.select();
}
}
updateExecutionPoint(position, useSelection, gutterIconRenderer);
if (sessionChanged) {
onActiveSessionChanged();
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerSessionTabBase.java
+43 -24
View File
@@ -37,6 +37,7 @@ import com.intellij.openapi.wm.ToolWindow;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.ui.AppIcon;
import com.intellij.ui.content.Content;
import com.intellij.util.ui.UIUtil;
import com.intellij.xdebugger.XDebuggerBundle;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -91,37 +92,55 @@ public abstract class DebuggerSessionTabBase extends RunTab {
}
public void select() {
if (ApplicationManager.getApplication().isUnitTestMode()) return;
UIUtil.invokeLaterIfNeeded(new Runnable() {
@Override
public void run() {
if (myRunContentDescriptor != null) {
ToolWindow toolWindow = ExecutionManager.getInstance(myProject).getContentManager()
.getToolWindowByDescriptor(myRunContentDescriptor);
Content content = myRunContentDescriptor.getAttachedContent();
if (toolWindow != null && content != null && !toolWindow.getContentManager().isSelected(content)) {
toolWindow.getContentManager().setSelectedContent(content);
}
}
}
});
}
public void toFront(boolean focus, @Nullable final Runnable onShowCallback) {
if (!ApplicationManager.getApplication().isUnitTestMode()) {
if (ApplicationManager.getApplication().isUnitTestMode()) return;
ApplicationManager.getApplication().invokeLater(new Runnable() {
@Override
public void run() {
if (myRunContentDescriptor != null) {
ToolWindow toolWindow = ExecutionManager.getInstance(myProject).getContentManager()
.getToolWindowByDescriptor(myRunContentDescriptor);
if (toolWindow != null) {
if (!toolWindow.isVisible()) {
toolWindow.show(onShowCallback);
}
//noinspection ConstantConditions
toolWindow.getContentManager().setSelectedContent(myRunContentDescriptor.getAttachedContent());
}
}
}
});
if (focus) {
ApplicationManager.getApplication().invokeLater(new Runnable() {
@Override
public void run() {
if (myRunContentDescriptor != null) {
ToolWindow toolWindow = ExecutionManager.getInstance(myProject).getContentManager()
.getToolWindowByDescriptor(myRunContentDescriptor);
if (toolWindow != null) {
if (!toolWindow.isVisible()) {
toolWindow.show(onShowCallback);
}
//noinspection ConstantConditions
toolWindow.getContentManager().setSelectedContent(myRunContentDescriptor.getAttachedContent());
}
boolean focusWnd = Registry.is("debugger.mayBringFrameToFrontOnBreakpoint");
ProjectUtil.focusProjectWindow(myProject, focusWnd);
if (!focusWnd) {
AppIcon.getInstance().requestAttention(myProject, true);
}
}
});
if (focus) {
ApplicationManager.getApplication().invokeLater(new Runnable() {
@Override
public void run() {
boolean focusWnd = Registry.is("debugger.mayBringFrameToFrontOnBreakpoint");
ProjectUtil.focusProjectWindow(myProject, focusWnd);
if (!focusWnd) {
AppIcon.getInstance().requestAttention(myProject, true);
}
}
});
}
}
}
}