From c25c04856a1da46a580823c0eeb8a330154e59c7 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Thu, 5 Oct 2017 10:21:59 +0200 Subject: [PATCH] deliver missing changes --- src/vs/editor/standalone/test/browser/simpleServices.test.ts | 3 ++- src/vs/platform/keybinding/common/abstractKeybindingService.ts | 1 + .../keybinding/test/common/abstractKeybindingService.test.ts | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/vs/editor/standalone/test/browser/simpleServices.test.ts b/src/vs/editor/standalone/test/browser/simpleServices.test.ts index 12aaaad2825..e2a6120ec59 100644 --- a/src/vs/editor/standalone/test/browser/simpleServices.test.ts +++ b/src/vs/editor/standalone/test/browser/simpleServices.test.ts @@ -11,6 +11,7 @@ import { InstantiationService } from 'vs/platform/instantiation/common/instantia import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; import { KeyCode } from 'vs/base/common/keyCodes'; import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding'; +import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils'; suite('StandaloneKeybindingService', () => { @@ -35,7 +36,7 @@ suite('StandaloneKeybindingService', () => { let domElement = document.createElement('div'); - let keybindingService = new TestStandaloneKeybindingService(contextKeyService, commandService, messageService, domElement); + let keybindingService = new TestStandaloneKeybindingService(contextKeyService, commandService, NullTelemetryService, messageService, domElement); let commandInvoked = false; keybindingService.addDynamicKeybinding('testCommand', KeyCode.F9, () => { diff --git a/src/vs/platform/keybinding/common/abstractKeybindingService.ts b/src/vs/platform/keybinding/common/abstractKeybindingService.ts index c933039914b..85e8ad8165a 100644 --- a/src/vs/platform/keybinding/common/abstractKeybindingService.ts +++ b/src/vs/platform/keybinding/common/abstractKeybindingService.ts @@ -47,6 +47,7 @@ export abstract class AbstractKeybindingService implements IKeybindingService { ) { this._contextKeyService = contextKeyService; this._commandService = commandService; + this._telemetryService = telemetryService; this._statusService = statusService; this._messageService = messageService; diff --git a/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts b/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts index f5cc9fb7984..e0ce67f7b53 100644 --- a/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts +++ b/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts @@ -19,6 +19,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem'; import { OS } from 'vs/base/common/platform'; import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding'; +import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils'; function createContext(ctx: any) { return { @@ -40,7 +41,7 @@ suite('AbstractKeybindingService', () => { messageService: IMessageService, statusService?: IStatusbarService ) { - super(contextKeyService, commandService, messageService, statusService); + super(contextKeyService, commandService, NullTelemetryService, messageService, statusService); this._resolver = resolver; } -- GitLab