storage - always have a workspace identifier

Benjamin Pasero · Benjamin Pasero · commit 34ee4b8daafa · 2018-10-22T15:43:25.000+02:00
diff --git a/src/vs/platform/storage/common/storageLegacyService.ts b/src/vs/platform/storage/common/storageLegacyService.ts
@@ -122,6 +122,13 @@ export class StorageLegacyService implements IStorageLegacyService {
 		// which is only possible if a id property is provided that we can check on
 		if (types.isNumber(legacyWorkspaceId)) {
 			this.cleanupWorkspaceScope(legacyWorkspaceId);
+		} else {
+			// ensure that we always store a workspace identifier because this key
+			// is used to migrate data out as needed
+			const workspaceIdentifier = this.getInteger(StorageLegacyService.WORKSPACE_IDENTIFIER, StorageLegacyScope.WORKSPACE);
+			if (!workspaceIdentifier) {
+				this.store(StorageLegacyService.WORKSPACE_IDENTIFIER, 42, StorageLegacyScope.WORKSPACE);
+			}
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,13 @@ export class StorageLegacyService implements IStorageLegacyService {`
`122`	`122`	`// which is only possible if a id property is provided that we can check on`
`123`	`123`	`if (types.isNumber(legacyWorkspaceId)) {`
`124`	`124`	`this.cleanupWorkspaceScope(legacyWorkspaceId);`
	`125`	`+ } else {`
	`126`	`+ // ensure that we always store a workspace identifier because this key`
	`127`	`+ // is used to migrate data out as needed`
	`128`	`+ const workspaceIdentifier = this.getInteger(StorageLegacyService.WORKSPACE_IDENTIFIER, StorageLegacyScope.WORKSPACE);`
	`129`	`+ if (!workspaceIdentifier) {`
	`130`	`+ this.store(StorageLegacyService.WORKSPACE_IDENTIFIER, 42, StorageLegacyScope.WORKSPACE);`
	`131`	`+ }`
`125`	`132`	`}`
`126`	`133`	`}`
`127`	`134`