ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998 (#7880)

Browse Source 
* Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998

* fix pipelines

* fix strict-null-checks

* add missing files
This commit is contained in:
Anthony Dresser
2019-10-21 22:12:22 -07:00
committed by GitHub
parent 7c9be74970
commit 1e22f47304
913 changed files with 18898 additions and 16536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/vs/workbench/services/preferences/common/preferencesModels.ts
View File

@@ -429,7 +429,7 @@ function parse(model: ITextModel, isSettingsProperty: (currentProperty: string,
export class WorkspaceConfigurationEditorModel extends SettingsEditorModel {
private _configurationGroups: ISettingsGroup[];
private _configurationGroups: ISettingsGroup[] = [];
get configurationGroups(): ISettingsGroup[] {
return this._configurationGroups;
@@ -448,9 +448,9 @@ export class WorkspaceConfigurationEditorModel extends SettingsEditorModel {
export class DefaultSettings extends Disposable {
private _allSettingsGroups: ISettingsGroup[];
private _content: string;
private _settingsByName: Map<string, ISetting>;
private _allSettingsGroups: ISettingsGroup[] | undefined;
private _content: string | undefined;
private _settingsByName = new Map<string, ISetting>();
readonly _onDidChange: Emitter<void> = this._register(new Emitter<void>());
readonly onDidChange: Event<void> = this._onDidChange.event;
@@ -467,7 +467,7 @@ export class DefaultSettings extends Disposable {
this.initialize();
}
return this._content;
return this._content!;
}
getSettingsGroups(forceUpdate = false): ISettingsGroup[] {
@@ -475,7 +475,7 @@ export class DefaultSettings extends Disposable {
this.initialize();
}
return this._allSettingsGroups;
return this._allSettingsGroups!;
}
private initialize(): void {
@@ -1249,7 +1249,7 @@ export function defaultKeybindingsContents(keybindingService: IKeybindingService
export class DefaultKeybindingsEditorModel implements IKeybindingsEditorModel<any> {
private _content: string;
private _content: string | undefined;
constructor(private _uri: URI,
@IKeybindingService private readonly keybindingService: IKeybindingService) {