real fix for microsoft#66986

Benjamin Pasero · Benjamin Pasero · commit a09175a59e0d · 2019-01-25T11:43:15.000+01:00
diff --git a/src/vs/platform/extensionManagement/common/extensionEnablementService.ts b/src/vs/platform/extensionManagement/common/extensionEnablementService.ts
@@ -375,7 +375,7 @@ class StorageManager extends Disposable {
 	}
 
 	private _get(key: string, scope: StorageScope): string {
-		return this.storageService.get(key, scope, '[]') || '[]';
+		return this.storageService.get(key, scope, '[]');
 	}
 
 	private _set(key: string, value: string | undefined, scope: StorageScope): void {
diff --git a/src/vs/platform/storage/common/storage.ts b/src/vs/platform/storage/common/storage.ts
@@ -67,8 +67,8 @@ export interface IStorageService {
 	 * The scope argument allows to define the scope of the storage
 	 * operation to either the current workspace only or all workspaces.
 	 */
-	getInteger<R extends number | undefined>(key: string, scope: StorageScope, fallbackValue: number): number;
-	getInteger<R extends number | undefined>(key: string, scope: StorageScope, fallbackValue?: number): number | undefined;
+	getInteger(key: string, scope: StorageScope, fallbackValue: number): number;
+	getInteger(key: string, scope: StorageScope, fallbackValue?: number): number | undefined;
 
 	/**
 	 * Store a value under the given key to storage. The value will be converted to a string.
diff --git a/src/vs/platform/storage/node/storageIpc.ts b/src/vs/platform/storage/node/storageIpc.ts
@@ -57,7 +57,7 @@ export class GlobalStorageDatabaseChannel extends Disposable implements IServerC
 
 	private serializeEvents(events: IStorageChangeEvent[]): ISerializableItemsChangeEvent {
 		const items = new Map<Key, Value>();
-		events.forEach(event => items.set(event.key, this.storageMainService.get(event.key, '')));
+		events.forEach(event => items.set(event.key, this.storageMainService.get(event.key)));
 
 		return { items: mapToSerializable(items) } as ISerializableItemsChangeEvent;
 	}
diff --git a/src/vs/platform/storage/node/storageMainService.ts b/src/vs/platform/storage/node/storageMainService.ts
@@ -39,20 +39,23 @@ export interface IStorageMainService {
 	 * the provided defaultValue if the element is null or undefined.
 	 */
 	get(key: string, fallbackValue: string): string;
+	get(key: string, fallbackValue?: string): string | undefined;
 
 	/**
 	 * Retrieve an element stored with the given key from storage. Use
 	 * the provided defaultValue if the element is null or undefined. The element
 	 * will be converted to a boolean.
 	 */
 	getBoolean(key: string, fallbackValue: boolean): boolean;
+	getBoolean(key: string, fallbackValue?: boolean): boolean | undefined;
 
 	/**
 	 * Retrieve an element stored with the given key from storage. Use
 	 * the provided defaultValue if the element is null or undefined. The element
 	 * will be converted to a number using parseInt with a base of 10.
 	 */
 	getInteger(key: string, fallbackValue: number): number;
+	getInteger(key: string, fallbackValue?: number): number | undefined;
 
 	/**
 	 * Store a string value under the given key to storage. The value will
@@ -345,15 +348,21 @@ export class StorageMainService extends Disposable implements IStorageMainServic
 		});
 	}
 
-	get(key: string, fallbackValue: string): string {
+	get(key: string, fallbackValue: string): string;
+	get(key: string, fallbackValue?: string): string | undefined;
+	get(key: string, fallbackValue?: string): string | undefined {
 		return this.storage.get(key, fallbackValue);
 	}
 
-	getBoolean(key: string, fallbackValue: boolean): boolean {
+	getBoolean(key: string, fallbackValue: boolean): boolean;
+	getBoolean(key: string, fallbackValue?: boolean): boolean | undefined;
+	getBoolean(key: string, fallbackValue?: boolean): boolean | undefined {
 		return this.storage.getBoolean(key, fallbackValue);
 	}
 
-	getInteger(key: string, fallbackValue: number): number {
+	getInteger(key: string, fallbackValue: number): number;
+	getInteger(key: string, fallbackValue?: number): number | undefined;
+	getInteger(key: string, fallbackValue?: number): number | undefined {
 		return this.storage.getInteger(key, fallbackValue);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -375,7 +375,7 @@ class StorageManager extends Disposable {`
`375`	`375`	`}`
`376`	`376`
`377`	`377`	`private _get(key: string, scope: StorageScope): string {`
`378`		`- return this.storageService.get(key, scope, '[]') \|\| '[]';`
	`378`	`+ return this.storageService.get(key, scope, '[]');`
`379`	`379`	`}`
`380`	`380`
`381`	`381`	`private _set(key: string, value: string \| undefined, scope: StorageScope): void {`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ export class GlobalStorageDatabaseChannel extends Disposable implements IServerC`
`57`	`57`
`58`	`58`	`private serializeEvents(events: IStorageChangeEvent[]): ISerializableItemsChangeEvent {`
`59`	`59`	`const items = new Map<Key, Value>();`
`60`		`- events.forEach(event => items.set(event.key, this.storageMainService.get(event.key, '')));`
	`60`	`+ events.forEach(event => items.set(event.key, this.storageMainService.get(event.key)));`
`61`	`61`
`62`	`62`	`return { items: mapToSerializable(items) } as ISerializableItemsChangeEvent;`
`63`	`63`	`}`