Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix syncing extensions when new property is added #188462

Merged
merged 1 commit into from
Jul 21, 2023
Merged

Fix syncing extensions when new property is added #188462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 12 additions & 10 deletions src/vs/platform/userDataSync/common/extensionsMerge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ function areSame(fromExtension: ISyncExtension, toExtension: ISyncExtension, che
return false;
}

if (fromExtension.isApplicationScoped !== toExtension.isApplicationScoped) {
if (!!fromExtension.isApplicationScoped !== !!toExtension.isApplicationScoped) {
/* extension application scope has changed */
return false;
}
Expand Down Expand Up @@ -395,30 +395,32 @@ 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, isApplicationScoped: !!extension.isApplicationScoped } };
return { ...extension, ...{ disabled: !!extension.disabled, installed: !!extension.installed } };
}

// massage outgoing extension - remove optional properties
function massageOutgoingExtension(extension: ISyncExtension, key: string): ISyncExtension {
const massagedExtension: ISyncExtension = {
...extension,
identifier: {
id: extension.identifier.id,
uuid: key.startsWith('uuid:') ? key.substring('uuid:'.length) : undefined
},
version: extension.version,
/* set following always so that to differentiate with older clients */
preRelease: !!extension.preRelease,
pinned: !!extension.pinned,
isApplicationScoped: !!extension.isApplicationScoped,
};
if (extension.disabled) {
massagedExtension.disabled = true;
if (!extension.disabled) {
delete massagedExtension.disabled;
}
if (extension.installed) {
massagedExtension.installed = true;
if (!extension.installed) {
delete massagedExtension.installed;
}
if (extension.state) {
massagedExtension.state = extension.state;
if (!extension.state) {
delete massagedExtension.state;
}
if (!extension.isApplicationScoped) {
delete massagedExtension.isApplicationScoped;
}
return massagedExtension;
}
5 changes: 3 additions & 2 deletions src/vs/platform/userDataSync/common/extensionsSync.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ export class ExtensionsSynchroniser extends AbstractSynchroniser implements IUse
*/
/* Version 4: Change settings from `sync.${setting}` to `settingsSync.{setting}` */
/* Version 5: Introduce extension state */
protected readonly version: number = 5;
/* Version 6: Added isApplicationScoped property */
protected readonly version: number = 6;

private readonly previewResource: URI = this.extUri.joinPath(this.syncPreviewFolder, 'extensions.json');
private readonly baseResource: URI = this.previewResource.with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'base' });
Expand Down Expand Up @@ -377,7 +378,7 @@ export class LocalExtensionsProvider {
.map(extension => {
const { identifier, isBuiltin, manifest, preRelease, pinned, isApplicationScoped } = extension;
const syncExntesion: ILocalSyncExtension = { identifier, preRelease, version: manifest.version, pinned: !!pinned };
if (!isApplicationScopedExtension(manifest)) {
if (isApplicationScoped && !isApplicationScopedExtension(manifest)) {
syncExntesion.isApplicationScoped = isApplicationScoped;
}
if (disabledExtensions.some(disabledExtension => areSameExtensions(disabledExtension, identifier))) {
Expand Down
6 changes: 1 addition & 5 deletions src/vs/platform/userDataSync/test/common/extensionsMerge.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1344,7 +1344,7 @@ suite('ExtensionsMerge', () => {
assert.deepStrictEqual(actual.local.added, []);
assert.deepStrictEqual(actual.local.removed, []);
assert.deepStrictEqual(actual.local.updated, []);
assert.deepStrictEqual(actual.remote?.all, localExtensions);
assert.deepStrictEqual(actual.remote?.all, [anExpectedSyncExtension({ identifier: { id: 'a', uuid: 'a' } })]);
});

test('sync merging when applicaiton scope is changed locally', () => {
Expand Down Expand Up @@ -1392,7 +1392,6 @@ suite('ExtensionsMerge', () => {
pinned: false,
preRelease: false,
installed: true,
isApplicationScoped: false,
...extension
};
}
Expand All @@ -1403,7 +1402,6 @@ suite('ExtensionsMerge', () => {
version: '1.0.0',
pinned: false,
preRelease: false,
isApplicationScoped: false,
...extension
};
}
Expand All @@ -1415,7 +1413,6 @@ suite('ExtensionsMerge', () => {
pinned: false,
preRelease: false,
installed: true,
isApplicationScoped: false,
...extension
};
}
Expand All @@ -1427,7 +1424,6 @@ suite('ExtensionsMerge', () => {
pinned: false,
preRelease: false,
installed: true,
isApplicationScoped: false,
...extension
};
}
Expand Down