Skip to content

Commit

Permalink
debug: add callStackItemType context key to be used by node debuggers
Browse files Browse the repository at this point in the history
fixes #19180
  • Loading branch information
isidorn committed May 11, 2018
1 parent c2d5611 commit f8b0ac4
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/vs/workbench/parts/debug/common/debug.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export const CONTEXT_WATCH_EXPRESSIONS_FOCUSED = new RawContextKey<boolean>('wat
export const CONTEXT_VARIABLES_FOCUSED = new RawContextKey<boolean>('variablesFocused', true);
export const CONTEXT_EXPRESSION_SELECTED = new RawContextKey<boolean>('expressionSelected', false);
export const CONTEXT_BREAKPOINT_SELECTED = new RawContextKey<boolean>('breakpointSelected', false);
export const CONTEXT_CALLSTACK_ITEM_TYPE = new RawContextKey<string>('callStackItemType', undefined);

export const EDITOR_CONTRIBUTION_ID = 'editor.contrib.debug';
export const DEBUG_SCHEME = 'debug';
Expand Down
18 changes: 17 additions & 1 deletion src/vs/workbench/parts/debug/electron-browser/callStackView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import * as dom from 'vs/base/browser/dom';
import { TPromise } from 'vs/base/common/winjs.base';
import * as errors from 'vs/base/common/errors';
import { TreeViewsViewletPanel, IViewletViewOptions, IViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
import { IDebugService, State, IStackFrame, ISession, IThread } from 'vs/workbench/parts/debug/common/debug';
import { IDebugService, State, IStackFrame, ISession, IThread, CONTEXT_CALLSTACK_ITEM_TYPE } from 'vs/workbench/parts/debug/common/debug';
import { Thread, StackFrame, ThreadAndSessionIds, Session, Model } from 'vs/workbench/parts/debug/common/debugModel';
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
Expand All @@ -25,6 +25,7 @@ import { TreeResourceNavigator, WorkbenchTree } from 'vs/platform/list/browser/l
import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';

const $ = dom.$;

Expand All @@ -38,6 +39,7 @@ export class CallStackView extends TreeViewsViewletPanel {
private needsRefresh: boolean;
private ignoreSelectionChangedEvent: boolean;
private treeContainer: HTMLElement;
private callStackItemType: IContextKey<string>;

constructor(
private options: IViewletViewOptions,
Expand All @@ -47,9 +49,11 @@ export class CallStackView extends TreeViewsViewletPanel {
@IInstantiationService private instantiationService: IInstantiationService,
@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
@IConfigurationService configurationService: IConfigurationService,
@IContextKeyService contextKeyService: IContextKeyService
) {
super({ ...(options as IViewOptions), ariaHeaderLabel: nls.localize('callstackSection', "Call Stack Section") }, keybindingService, contextMenuService, configurationService);
this.settings = options.viewletSettings;
this.callStackItemType = CONTEXT_CALLSTACK_ITEM_TYPE.bindTo(contextKeyService);

// Create scheduler to prevent unnecessary flashing of tree when reacting to changes
this.onCallStackChangeScheduler = new RunOnceScheduler(() => {
Expand Down Expand Up @@ -132,6 +136,18 @@ export class CallStackView extends TreeViewsViewletPanel {
}
}
}));
this.disposables.push(this.tree.onDidChangeFocus(() => {
const focus = this.tree.getFocus();
if (focus instanceof StackFrame) {
this.callStackItemType.set('stackFrame');
} else if (focus instanceof Thread) {
this.callStackItemType.set('thread');
} else if (focus instanceof Session) {
this.callStackItemType.set('session');
} else {
this.callStackItemType.reset();
}
}));

this.disposables.push(this.debugService.getModel().onDidChangeCallStack(() => {
if (!this.isVisible()) {
Expand Down

0 comments on commit f8b0ac4

Please sign in to comment.