development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-13 06:48:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Keep throwing but add a little more context, #30942

Browse source
This commit is contained in:
Johannes Rieken 2017-07-24 12:28:03 +02:00
parent 4b20d3e9bf
commit a449cdf121
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/vs/platform/actions/common/menu.ts
View file

@ -21,13 +21,13 @@ export class Menu implements IMenu {
private _onDidChange = new Emitter<IMenu>();
constructor(
private id: MenuId,
private _id: MenuId,
startupSignal: TPromise<boolean>,
@ICommandService private _commandService: ICommandService,
@IContextKeyService private _contextKeyService: IContextKeyService
) {
startupSignal.then(_ => {
const menuItems = MenuRegistry.getMenuItems(id);
const menuItems = MenuRegistry.getMenuItems(_id);
const keysFilter = new Set<string>();
let group: MenuItemGroup;
@ -48,6 +48,9 @@ export class Menu implements IMenu {
// subscribe to context changes
this._disposables.push(this._contextKeyService.onDidChangeContext(keys => {
if (!keys) {
throw new Error(`Receiving bad onDidChangeContext-event form MenuId[${this._id.id}]`);
}
for (let k of keys) {
if (keysFilter.has(k)) {
this._onDidChange.fire();

4
src/vs/platform/contextkey/browser/contextKeyService.ts
View file

@ -126,7 +126,7 @@ class ContextKey<T> implements IContextKey<T> {
}
}
export abstract class AbstractContextKeyService {
export abstract class AbstractContextKeyService implements IContextKeyService {
public _serviceBrand: any;
protected _onDidChangeContext: Event<string[]>;
@ -138,6 +138,8 @@ export abstract class AbstractContextKeyService {
this._onDidChangeContextKey = new Emitter<string>();
}
abstract dispose(): void;
public createKey<T>(key: string, defaultValue: T): IContextKey<T> {
return new ContextKey(this, key, defaultValue);
}