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

strict null for contrib/preferences and contrib/configuration (#11915)

Browse Source
This commit is contained in:
Anthony Dresser
2020-08-21 15:51:29 -07:00
committed by GitHub
parent 061052e4f3
commit faff61bb82
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/workbench/contrib/configuration/common/configurationUpgrader.ts
View File

@@ -31,8 +31,8 @@ const settingsToMove: { [key: string]: string } = deepFreeze({
export class ConfigurationUpgraderContribution implements IWorkbenchContribution {
private static readonly STORAGE_KEY = 'configurationUpgrader';
private readonly globalStorage: { [key: string]: boolean };
private readonly workspaceStorage: { [key: string]: boolean };
private readonly globalStorage: { [key: string]: boolean } = JSON.parse(this.storageService.get(ConfigurationUpgraderContribution.STORAGE_KEY, StorageScope.GLOBAL, '{}'));
private readonly workspaceStorage: { [key: string]: boolean } = JSON.parse(this.storageService.get(ConfigurationUpgraderContribution.STORAGE_KEY, StorageScope.WORKSPACE, '{}'));
public readonly processingPromise: Promise<void>;
@@ -41,8 +41,6 @@ export class ConfigurationUpgraderContribution implements IWorkbenchContribution
@IConfigurationService private readonly configurationService: IConfigurationService,
@INotificationService private readonly notificationService: INotificationService
) {
this.globalStorage = JSON.parse(this.storageService.get(ConfigurationUpgraderContribution.STORAGE_KEY, StorageScope.GLOBAL, '{}'));
this.workspaceStorage = JSON.parse(this.storageService.get(ConfigurationUpgraderContribution.STORAGE_KEY, StorageScope.WORKSPACE, '{}'));
this.processingPromise = (async () => {
await this.processSettings();
this.storageService.store(ConfigurationUpgraderContribution.STORAGE_KEY, JSON.stringify(this.globalStorage), StorageScope.GLOBAL);

5
src/sql/workbench/contrib/preferences/browser/sqlSettingsLayout.ts
View File

@@ -5,10 +5,9 @@
import { localize } from 'vs/nls';
import { tocData as vstocData, ITOCEntry } from 'vs/workbench/contrib/preferences/browser/settingsLayout';
import { assign } from 'vs/base/common/objects';
// Copy existing table of contents and append
export const tocData: ITOCEntry = assign({}, vstocData);
export const tocData: ITOCEntry = Object.assign({}, vstocData);
let sqlTocItems: ITOCEntry[] = [{
id: 'data',
label: localize('data', "Data"),
@@ -40,4 +39,4 @@ let sqlTocItems: ITOCEntry[] = [{
}
]
}];
tocData.children.push(...sqlTocItems);
tocData.children!.push(...sqlTocItems);