Repository: microsoft/vscode (TypeScript) — Bug Fix

Issue:
Getting suspended from Settings Sync
Started seeing this yesterday:

<img width="489" alt="image" src="https://github.com/microsoft/vscode/assets/22350/75e952f3-e15a-4aca-82c4-039cda20f42d">

I have not modified any extensions and/or profiles, yet Settings Sync seems to be pushing Extensions related data very frequently.

![image](https://github.com/microsoft/vscode/assets/22350/a03695fd-5873-47b0-b9b3-c290481dce58)

cc @Tyriar 


Discussion:

Resolving patch:
diff --git a/src/vs/platform/userDataSync/common/extensionsMerge.ts b/src/vs/platform/userDataSync/common/extensionsMerge.ts
--- a/src/vs/platform/userDataSync/common/extensionsMerge.ts
+++ b/src/vs/platform/userDataSync/common/extensionsMerge.ts
@@ -395,7 +395,7 @@ function isSameExtensionState(a: IStringDictionary<any> = {}, b: IStringDictiona
 
 // massage incoming extension - add optional properties
 function massageIncomingExtension(extension: ISyncExtension): ISyncExtension {
-	return { ...extension, ...{ disabled: !!extension.disabled, installed: !!extension.installed } };
+	return { ...extension, ...{ disabled: !!extension.disabled, installed: !!extension.installed, isApplicationScoped: !!extension.isApplicationScoped } };
 }
 
 // massage outgoing extension - remove optional properties
@@ -408,7 +408,8 @@ function massageOutgoingExtension(extension: ISyncExtension, key: string): ISync
 		version: extension.version,
 		/* set following always so that to differentiate with older clients */
 		preRelease: !!extension.preRelease,
-		pinned: !!extension.pinned
+		pinned: !!extension.pinned,
+		isApplicationScoped: !!extension.isApplicationScoped,
 	};
 	if (extension.disabled) {
 		massagedExtension.disabled = true;


Test patch:
diff --git a/src/vs/platform/userDataSync/test/common/extensionsMerge.test.ts b/src/vs/platform/userDataSync/test/common/extensionsMerge.test.ts
--- a/src/vs/platform/userDataSync/test/common/extensionsMerge.test.ts
+++ b/src/vs/platform/userDataSync/test/common/extensionsMerge.test.ts
@@ -69,7 +69,7 @@ suite('ExtensionsMerge', () => {
 			aLocalSyncExtension({ identifier: { id: 'c', uuid: 'c' } }),
 		];
 		const skippedExtension = [
-			anSyncExtension({ identifier: { id: 'b', uuid: 'b' } }),
+			aSyncExtension({ identifier: { id: 'b', uuid: 'b' } }),
 		];
 		const expected = [...localExtensions];
 
@@ -88,7 +88,7 @@ suite('ExtensionsMerge', () => {
 			aLocalSyncExtension({ identifier: { id: 'c', uuid: 'c' } }),
 		];
 		const skippedExtension = [
-			anSyncExtension({ identifier: { id: 'b', uuid: 'b' } }),
+			aSyncExtension({ identifier: { id: 'b', uuid: 'b' } }),
 		];
 		const expected = [localExtensions[1], localExtensions[2]];
 
@@ -106,8 +106,8 @@ suite('ExtensionsMerge', () => {
 			aLocalSyncExtension({ identifier: { id: 'd', uuid: 'd' } }),
 		];
 		const remoteExtensions = [
-			anSyncExtension({ identifier: { id: 'b', uuid: 'b' } }),
-			anSyncExtension({ identifier: { id: 'c', uuid: 'c' } }),
+			aSyncExtension({ identifier: { id: 'b', uuid: 'b' } }),
+			aSyncExtension({ identifier: { id: 'c', uuid: 'c' } }),
 		];
 		const expected = [
 			anExpectedSyncExtension({ identifier: { id: 'b', uuid: 'b' } }),
@@ -133,8 +133,8 @@ suite('ExtensionsMerge', () => {
 			aLocalSyncExtension({ identifier: { id: 'd', uuid: 'd' } }),
 		];
 		const remoteExtensions = [
-			anSyncExtension({ identifier: { id: 'b', uuid: 'b' } }),
-			anSyncExtension({ identifier: { id: 'c', uuid: 'c' } }),
+			aSyncExtension({ identifier: { id: 'b', uuid: 'b' } }),
+			aSyncExtension({ identifier: { id: 'c', uuid: 'c' } }),
 		];
 		const expected = [
 			anExpectedSyncExtension({ identifier: { id: 'b', uuid: 'b' } }),
@@ -155,16 +155,16 @@ suite('ExtensionsMerge', () => {
 
 	test('merge local and remote extensions when remote is moved forwarded', () => {
 		const baseExtensions = [
-			anSyncExtension({ identifier: { id: 'a', uuid: 'a' } }),
-			anSyncExtension({ identifier: { id: 'd', uuid: 'd' } }),
+			aSyncExtension({ identifier: { id: 'a', uuid: 'a' } }),
+			aSyncExtension({ identifier: { id: 'd', uuid: 'd' } }),
 		];
 		const localExtensions = [
 			aLocalSyncExtension({ identifier: { id: 'a', uuid: 'a' } }),
 			aLocalSyncExtension({ identifier: { id: 'd', uuid: 'd' } }),
 		];
 		const remoteExtensions = [
-			anSyncExtension({ identifier: { id: 'b', uuid: 'b' } }),
-			anSyncExtension({ identifier: { id: 'c', uuid: 'c' } }),
+			aSyncExtension({ identifier: { id: 'b', uuid: 'b' } }),
+			aSyncExtension({ identifier: { id: 'c', uuid: 'c' } }),
 		];
 
 		const actual = merge(localExtensions, remoteExtensions, baseExtensions, [], [], []);
@@ -238,7 +238,7 @@ suite('ExtensionsMerge', () => {
 			aLocalSyncExtension({ identifier: { id: 'd', uuid: 'd' } }),
 		];
 		const skippedExtensions = [
-			anSyncExtension({ identifier: { id: 'a', uuid: 'a' } }),
+			aSyncExtension({ identifier: { id: 'a', uuid: 'a' } }),
 		];
 		const remoteExtensions = [
 			aRemoteSyncExtension({ identifier: { id: 'b', uuid: 'b' } }),
@@ -265,7 +265,7 @@ suite('ExtensionsMerge', () => {
 			aLocalSyncExtension({ identifier: { id: 'd', uuid: 'd' } }),
 		];
 		const skippedExtensions = [
-			anSyncExtension({ identifier: { id: 'a', uuid: 'a' } }),
+			aSyncExtension({ identifier: { id: 'a', uuid: 'a' } }),
 		];
 		const remoteExtensions = [
 			aRemoteSyncExtension({ identifier: { id: 'b', uuid: 'b' } }),
@@ -364,7 +364,7 @@ suite('ExtensionsMerge', () => {
 			aRemoteSyncExtension({ identifier: { id: 'd', uuid: 'd' } }),
 		];
 		const skippedExtensions = [
-			anSyncExtension({ identifier: { id: 'd', uuid: 'd' } }),
+			aSyncExtension({ identifier: { id: 'd', uuid: 'd' } }),
 		];
 		const localExtensions = [
 			aLocalSyncExtension({ identifier: { id: 'b', uuid: 'b' } }),
@@ -394,7 +394,7 @@ suite('ExtensionsMerge', () => {
 			aRemoteSyncExtension({ identifier: { id: 'd', uuid: 'd' } }),
 		];
 		const skippedExtensions = [
-			anSyncExtension({ identifier: { id: 'd', uuid: 'd' } }),
+			aSyncExtension({ identifier: { id: 'd', uuid: 'd' } }),
 		];
 		const localExtensions = [
 			aLocalSyncExtension({ identifier: { id: 'b', uuid: 'b' } }),
@@ -481,7 +481,7 @@ suite('ExtensionsMerge', () => {
 			aRemoteSyncExtension({ identifier: { id: 'd', uuid: 'd' } }),
 		];
 		const skippedExtensions = [
-			anSyncExtension({ identifier: { id: 'a', uuid: 'a' } }),
+			aSyncExtension({ identifier: { id: 'a', uuid: 'a' } }),
 		];
 		const localExtensions = [
 			aLocalSyncExtension({ identifier: { id: 'b', uuid: 'b' } }),
@@ -512,7 +512,7 @@ suite('ExtensionsMerge', () => {
 			aRemoteSyncExtension({ identifier: { id: 'd', uuid: 'd' } }),
 		];
 		const skippedExtensions = [
-			anSyncExtension({ identifier: { id: 'a', uuid: 'a' } }),
+			aSyncExtension({ identifier: { id: 'a', uuid: 'a' } }),
 		];
 		const localExtensions = [
 			aLocalSyncExtension({ identifier: { id: 'b', uuid: 'b' } }),
@@ -1317,6 +1317,74 @@ suite('ExtensionsMerge', () => {
 		assert.deepStrictEqual(actual.remote, null);
 	});
 
+	test('sync adding local application scoped extension', () => {
+		const localExtensions = [
+			aLocalSyncExtension({ identifier: { id: 'a', uuid: 'a' }, isApplicationScoped: true }),
+		];
+
+		const actual = merge(localExtensions, null, null, [], [], []);
+
+		assert.deepStrictEqual(actual.local.added, []);
+		assert.deepStrictEqual(actual.local.removed, []);
+		assert.deepStrictEqual(actual.local.updated, []);
+		assert.deepStrictEqual(actual.remote?.all, localExtensions);
+	});
+
+	test('sync merging local extension with isApplicationScoped property and remote does not has isApplicationScoped property', () => {
+		const localExtensions = [
+			aLocalSyncExtension({ identifier: { id: 'a', uuid: 'a' }, isApplicationScoped: false }),
+		];
+
+		const baseExtensions = [
+			aSyncExtension({ identifier: { id: 'a', uuid: 'a' } }),
+		];
+
+		const actual = merge(localExtensions, baseExtensions, baseExtensions, [], [], []);
+
+		assert.deepStrictEqual(actual.local.added, []);
+		assert.deepStrictEqual(actual.local.removed, []);
+		assert.deepStrictEqual(actual.local.updated, []);
+		assert.deepStrictEqual(actual.remote?.all, localExtensions);
+	});
+
+	test('sync merging when applicaiton scope is changed locally', () => {
+		const localExtensions = [
+			aLocalSyncExtension({ identifier: { id: 'a', uuid: 'a' }, isApplicationScoped: true }),
+		];
+
+		const baseExtensions = [
+			aRemoteSyncExtension({ identifier: { id: 'a', uuid: 'a' }, isApplicationScoped: false }),
+		];
+
+		const actual = merge(localExtensions, baseExtensions, baseExtensions, [], [], []);
+
+		assert.deepStrictEqual(actual.local.added, []);
+		assert.deepStrictEqual(actual.local.removed, []);
+		assert.deepStrictEqual(actual.local.updated, []);
+		assert.deepStrictEqual(actual.remote?.all, localExtensions);
+	});
+
+	test('sync merging when applicaiton scope is changed remotely', () => {
+		const localExtensions = [
+			aLocalSyncExtension({ identifier: { id: 'a', uuid: 'a' }, isApplicationScoped: false }),
+		];
+
+		const baseExtensions = [
+			aRemoteSyncExtension({ identifier: { id: 'a', uuid: 'a' }, isApplicationScoped: false }),
+		];
+
+		const remoteExtensions = [
+			aRemoteSyncExtension({ identifier: { id: 'a', uuid: 'a' }, isApplicationScoped: true }),
+		];
+
+		const actual = merge(localExtensions, remoteExtensions, baseExtensions, [], [], []);
+
+		assert.deepStrictEqual(actual.local.added, []);
+		assert.deepStrictEqual(actual.local.removed, []);
+		assert.deepStrictEqual(actual.local.updated, [anExpectedSyncExtension({ identifier: { id: 'a', uuid: 'a' }, isApplicationScoped: true })]);
+		assert.deepStrictEqual(actual.remote, null);
+	});
+
 	function anExpectedSyncExtension(extension: Partial<ISyncExtension>): ISyncExtension {
 		return {
 			identifier: { id: 'a', uuid: 'a' },
@@ -1324,6 +1392,7 @@ suite('ExtensionsMerge', () => {
 			pinned: false,
 			preRelease: false,
 			installed: true,
+			isApplicationScoped: false,
 			...extension
 		};
 	}
@@ -1334,6 +1403,7 @@ suite('ExtensionsMerge', () => {
 			version: '1.0.0',
 			pinned: false,
 			preRelease: false,
+			isApplicationScoped: false,
 			...extension
 		};
 	}
@@ -1345,6 +1415,7 @@ suite('ExtensionsMerge', () => {
 			pinned: false,
 			preRelease: false,
 			installed: true,
+			isApplicationScoped: false,
 			...extension
 		};
 	}
@@ -1356,11 +1427,12 @@ suite('ExtensionsMerge', () => {
 			pinned: false,
 			preRelease: false,
 			installed: true,
+			isApplicationScoped: false,
 			...extension
 		};
 	}
 
-	function anSyncExtension(extension: Partial<ISyncExtension>): ISyncExtension {
+	function aSyncExtension(extension: Partial<ISyncExtension>): ISyncExtension {
 		return {
 			identifier: { id: 'a', uuid: 'a' },
 			version: '1.0.0',