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

IDEA-73140 XDebugger: Debugger always switches you to "Debugger" tab when first breakpoint is hit

Browse Source
This commit is contained in:
Egor.Ushakov
2014-07-02 18:40:58 +04:00
parent 496fb918b8
commit 42104b9222
6 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-resources/src/idea/LangActions.xml
+1
View File
@@ -681,6 +681,7 @@
<action id="XDebugger.AutoTooltip" class="com.intellij.xdebugger.impl.actions.ValueTooltipAutoShowAction"/>
<action id="XDebugger.ToggleSortValues" class="com.intellij.xdebugger.impl.ui.tree.actions.SortValuesToggleAction" icon="AllIcons.ObjectBrowser.Sorted"/>
<action id="Debugger.MarkObject" class="com.intellij.xdebugger.impl.actions.MarkObjectAction"/>
<action id="Debugger.FocusOnBreakpoint" class="com.intellij.xdebugger.impl.actions.FocusOnBreakpointAction"/>
</group>
<group id="XDebugger.ToolWindow.TopToolbar">
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java
+8 -2
View File
@@ -694,6 +694,14 @@ public class XDebugSessionImpl implements XDebugSession {
myActiveNonLineBreakpoint = !(breakpoint instanceof XLineBreakpoint<?>) ? breakpoint : null;
positionReached(suspendContext);
UIUtil.invokeLaterIfNeeded(new Runnable() {
@Override
public void run() {
mySessionTab.toFront();
mySessionTab.getUi().attractBy(XDebuggerUIConstants.LAYOUT_VIEW_BREAKPOINT_CONDITION);
}
});
if (breakpoint instanceof XLineBreakpoint<?> && ((XLineBreakpoint)breakpoint).isTemporary()) {
handleTemporaryBreakpointHit(breakpoint);
}
@@ -775,8 +783,6 @@ public class XDebugSessionImpl implements XDebugSession {
initSessionTab();
showSessionTab();
}
mySessionTab.toFront();
mySessionTab.getUi().attractBy(XDebuggerUIConstants.LAYOUT_VIEW_BREAKPOINT_CONDITION);
if (myCurrentPosition != null) {
adjustMouseTrackingCounter(myCurrentPosition, 1);
}
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/actions/FocusOnBreakpointAction.java → platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/FocusOnBreakpointAction.java
+1 -1
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.debugger.ui.breakpoints.actions;
package com.intellij.xdebugger.impl.actions;
import com.intellij.execution.ui.actions.AbstractFocusOnAction;
import com.intellij.xdebugger.impl.ui.XDebuggerUIConstants;
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/XDebuggerActions.java
+2
View File
@@ -68,4 +68,6 @@ public interface XDebuggerActions {
@NonNls String AUTO_TOOLTIP = "XDebugger.AutoTooltip";
@NonNls String MARK_OBJECT = "Debugger.MarkObject";
@NonNls String FOCUS_ON_BREAKPOINT = "Debugger.FocusOnBreakpoint";
}
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java
+4
View File
@@ -237,6 +237,10 @@ public class XDebugSessionTab extends DebuggerSessionTabBase {
initLogConsoles(runConfiguration, myRunContentDescriptor.getProcessHandler(), myConsole);
}
final DefaultActionGroup focus = new DefaultActionGroup();
focus.add(ActionManager.getInstance().getAction(XDebuggerActions.FOCUS_ON_BREAKPOINT));
myUi.getOptions().setAdditionalFocusActions(focus);
rebuildViews();
}
resources/src/idea/JavaActions.xml
-1
View File
@@ -184,7 +184,6 @@
<action id="Debugger.ResumeThread" class="com.intellij.debugger.actions.ResumeThreadAction"/>
<action id="Debugger.FreezeThread" class="com.intellij.debugger.actions.FreezeThreadAction"/>
<action id="Debugger.InterruptThread" class="com.intellij.debugger.actions.InterruptThreadAction"/>
<action id="Debugger.FocusOnBreakpoint" class="com.intellij.debugger.ui.breakpoints.actions.FocusOnBreakpointAction"/>
<add-to-group group-id="DebuggerActions" anchor="first"/>
</group>