Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463

* fix config changes

* fix strictnull checks
This commit is contained in:
Anthony Dresser
2019-09-15 22:38:26 -07:00
committed by GitHub
parent fa6c52699e
commit ea0f9e6ce9
1226 changed files with 21541 additions and 17633 deletions

View File

@@ -36,7 +36,7 @@ class MockKeybindingContextKey<T> implements IContextKey<T> {
export class MockContextKeyService implements IContextKeyService {
public _serviceBrand: any;
public _serviceBrand: undefined;
private _keys = new Map<string, IContextKey<any>>();
public dispose(): void {
@@ -69,7 +69,7 @@ export class MockContextKeyService implements IContextKeyService {
}
export class MockKeybindingService implements IKeybindingService {
public _serviceBrand: any;
public _serviceBrand: undefined;
public get onDidUpdateKeybindings(): Event<IKeybindingEvent> {
return Event.None;