development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

scope assertStorageValue to workspace changes only

Browse source
This commit is contained in:
Benjamin Pasero 2018-10-16 09:13:46 +02:00
parent cdaffba08c
commit a0b91c2c5d
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/vs/platform/storage/electron-browser/storageService.ts
View file

@ -201,32 +201,36 @@ export class DelegatingStorageService extends Disposable implements IStorageServ
const localStorageValue = this.storageLegacyService.get(key, this.convertScope(scope), fallbackValue);
const dbValue = this.storageService.get(key, scope, localStorageValue);
this.assertStorageValue(key, scope, dbValue, localStorageValue);
return dbValue;
return this.assertAndGet(key, scope, dbValue, localStorageValue);
}
getBoolean(key: string, scope: StorageScope, fallbackValue?: boolean): boolean {
const localStorageValue = this.storageLegacyService.getBoolean(key, this.convertScope(scope), fallbackValue);
const dbValue = this.storageService.getBoolean(key, scope, localStorageValue);
this.assertStorageValue(key, scope, dbValue, localStorageValue);
return dbValue;
return this.assertAndGet(key, scope, dbValue, localStorageValue);
}
getInteger(key: string, scope: StorageScope, fallbackValue?: number): number {
const localStorageValue = this.storageLegacyService.getInteger(key, this.convertScope(scope), fallbackValue);
const dbValue = this.storageService.getInteger(key, scope, localStorageValue);
this.assertStorageValue(key, scope, dbValue, localStorageValue);
return dbValue;
return this.assertAndGet(key, scope, dbValue, localStorageValue);
}
private assertStorageValue(key: string, scope: StorageScope, dbValue: any, storageValue: any): void {
if (dbValue !== storageValue) {
this.logService.error(`Unexpected storage value (key: ${key}, scope: ${scope === StorageScope.GLOBAL ? 'global' : 'workspace'}), actual: ${dbValue}, expected: ${storageValue}`);
private assertAndGet(key: string, scope: StorageScope, dbValue: any, localStorageValue: any): any {
if (scope === StorageScope.WORKSPACE) {
this.assertStorageValue(key, scope, dbValue, localStorageValue);
return dbValue;
}
return localStorageValue;
}
private assertStorageValue(key: string, scope: StorageScope, dbValue: any, localStorageValue: any): void {
if (dbValue !== localStorageValue) {
this.logService.error(`Unexpected storage value (key: ${key}, scope: ${scope === StorageScope.GLOBAL ? 'global' : 'workspace'}), actual: ${dbValue}, expected: ${localStorageValue}`);
}
}