diff --git a/src/vs/workbench/parts/debug/common/debug.ts b/src/vs/workbench/parts/debug/common/debug.ts index 8f141b9eef5a638b5624feb56e4af95df65ccf49..f3ab49a971c9beb8ed50fa99e330f99d25c21c6b 100644 --- a/src/vs/workbench/parts/debug/common/debug.ts +++ b/src/vs/workbench/parts/debug/common/debug.ts @@ -44,6 +44,7 @@ export const CONTEXT_WATCH_EXPRESSIONS_FOCUSED = new RawContextKey('wat export const CONTEXT_VARIABLES_FOCUSED = new RawContextKey('variablesFocused', true); export const CONTEXT_EXPRESSION_SELECTED = new RawContextKey('expressionSelected', false); export const CONTEXT_BREAKPOINT_SELECTED = new RawContextKey('breakpointSelected', false); +export const CONTEXT_CALLSTACK_ITEM_TYPE = new RawContextKey('callStackItemType', undefined); export const EDITOR_CONTRIBUTION_ID = 'editor.contrib.debug'; export const DEBUG_SCHEME = 'debug'; diff --git a/src/vs/workbench/parts/debug/electron-browser/callStackView.ts b/src/vs/workbench/parts/debug/electron-browser/callStackView.ts index 19cc1193e8639fd78985b7f9d2c56482ab1e378f..534b6d7d3d92f3c4c063c423f61a3cb82797c403 100644 --- a/src/vs/workbench/parts/debug/electron-browser/callStackView.ts +++ b/src/vs/workbench/parts/debug/electron-browser/callStackView.ts @@ -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'; @@ -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.$; @@ -38,6 +39,7 @@ export class CallStackView extends TreeViewsViewletPanel { private needsRefresh: boolean; private ignoreSelectionChangedEvent: boolean; private treeContainer: HTMLElement; + private callStackItemType: IContextKey; constructor( private options: IViewletViewOptions, @@ -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(() => { @@ -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()) {