ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-01 17:23:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/platform/keybinding/common/abstractKeybindingService.ts
View File

@@ -24,7 +24,7 @@ interface CurrentChord {
}
export abstract class AbstractKeybindingService extends Disposable implements IKeybindingService {
public _serviceBrand: any;
public _serviceBrand: undefined;
protected readonly _onDidUpdateKeybindings: Emitter<IKeybindingEvent> = this._register(new Emitter<IKeybindingEvent>());
get onDidUpdateKeybindings(): Event<IKeybindingEvent> {

2
src/vs/platform/keybinding/common/keybinding.ts
View File

@@ -41,7 +41,7 @@ export interface IKeyboardEvent {
export const IKeybindingService = createDecorator<IKeybindingService>('keybindingService');
export interface IKeybindingService {
_serviceBrand: any;
_serviceBrand: undefined;
onDidUpdateKeybindings: Event<IKeybindingEvent>;

3
src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
View File

@@ -15,7 +15,6 @@ import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKe
import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
import { INotification, INotificationService, IPromptChoice, IPromptOptions, NoOpNotification, IStatusMessageOptions } from 'vs/platform/notification/common/notification';
import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
function createContext(ctx: any) {
return {
@@ -132,7 +131,7 @@ suite('AbstractKeybindingService', () => {
};
let notificationService: INotificationService = {
_serviceBrand: {} as ServiceIdentifier<INotificationService>,
_serviceBrand: undefined,
notify: (notification: INotification) => {
showMessageCalls.push({ sev: notification.severity, message: notification.message });
return new NoOpNotification();

4
src/vs/platform/keybinding/test/common/mockKeybindingService.ts
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;