#95209 Move to final API

microsoft · Oct 27, 2020 · 325cb4a · 325cb4a
1 parent 7beee04
commit 325cb4a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 23 deletions.
diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
@@ -5647,7 +5647,12 @@ declare module 'vscode' {
 		 * A memento object that stores state independent
 		 * of the current opened [workspace](#workspace.workspaceFolders).
 		 */
-		readonly globalState: Memento;
+		readonly globalState: Memento & {
+			/**
+			 * Set the keys whose values should be synced across devices when extensions synchronization is enabled.
+			 */
+			setKeysForSync(keys: string[]): void;
+		};
 
 		/**
 		 * The uri of the directory containing the extension.

diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
@@ -2169,18 +2169,4 @@ declare module 'vscode' {
 
 	}
 	//#endregion
-
-	//#region Syncing Extension's Global State https://github.com/microsoft/vscode/issues/95209 @sandy081
-	export interface ExtensionContext {
-
-		readonly syncedGlobalState: Memento & {
-			/**
-			 * List of keys whose values should be synced across devices when extensions synchronization is enabled .
-			 * Set synced keys to an empty array to unset the synced state.
-			 */
-			syncedKeys: ReadonlyArray<string>;
-		};
-
-	}
-	//#endregion
 }
diff --git a/src/vs/workbench/api/common/extHostExtensionService.ts b/src/vs/workbench/api/common/extHostExtensionService.ts
@@ -387,7 +387,6 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 			const that = this;
 			return Object.freeze<vscode.ExtensionContext>({
 				globalState,
-				get syncedGlobalState() { checkProposedApiEnabled(extensionDescription); return globalState; },
 				workspaceState,
 				subscriptions: [],
 				get extensionUri() { return extensionDescription.extensionLocation; },

diff --git a/src/vs/workbench/api/common/extHostMemento.ts b/src/vs/workbench/api/common/extHostMemento.ts
@@ -7,7 +7,6 @@ import type * as vscode from 'vscode';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { ExtHostStorage } from 'vs/workbench/api/common/extHostStorage';
 import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { checkProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
 
 export class ExtensionMemento implements vscode.Memento {
 
@@ -64,12 +63,8 @@ export class ExtensionGlobalMemento extends ExtensionMemento {
 
 	private readonly _extension: IExtensionDescription;
 
-	private _syncedKeys: string[] = [];
-	get syncedKeys(): ReadonlyArray<string> { return Object.freeze(this._syncedKeys); }
-	set syncedKeys(syncKeys: ReadonlyArray<string>) {
-		checkProposedApiEnabled(this._extension);
-		this._syncedKeys = [...syncKeys];
-		this._storage.registerExtensionStorageKeysToSync({ id: this._id, version: this._extension.version }, this._syncedKeys);
+	setKeysForSync(keys: string[]): void {
+		this._storage.registerExtensionStorageKeysToSync({ id: this._id, version: this._extension.version }, keys);
 	}
 
 	constructor(extensionDescription: IExtensionDescription, storage: ExtHostStorage) {