diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts index 30a07a249c4ad8cd9e340071f06653d9c364a782..2c68cfab6ff8ddc4f5a553265f973012a3de59ca 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts @@ -1613,7 +1613,7 @@ export class ShowRecommendedExtensionsAction extends Action { export class ShowSyncedExtensionsAction extends Action { static readonly ID = 'workbench.extensions.action.listSyncedExtensions'; - static LABEL = localize('showSyncedExtensions', "Show Synced Extensions"); + static LABEL = localize('showSyncedExtensions', "Show My Accoount Extensions"); constructor( id: string, @@ -1627,7 +1627,7 @@ export class ShowSyncedExtensionsAction extends Action { return this.viewletService.openViewlet(VIEWLET_ID, true) .then(viewlet => viewlet as IExtensionsViewlet) .then(viewlet => { - viewlet.search('@synced '); + viewlet.search('@myaccount '); viewlet.focus(); }); } diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts index 190c859fd12d01feb5034682c5e27e92560a25b8..c00bf2a5726aa53da4553faf91b8ae4f58ab03da 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts @@ -85,7 +85,7 @@ const viewIdNameMappings: { [id: string]: string } = { 'extensions.builtInExtensionsList': localize('builtInExtensions', "Features"), 'extensions.builtInThemesExtensionsList': localize('builtInThemesExtensions', "Themes"), 'extensions.builtInBasicsExtensionsList': localize('builtInBasicsExtensions', "Programming Languages"), - 'extensions.syncedExtensionsList': localize('syncedExtensions', "Synced"), + 'extensions.syncedExtensionsList': localize('syncedExtensions', "My Account"), }; export class ExtensionsViewletViewsContribution implements IWorkbenchContribution { diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts index 6c8b1e5fad3b041c07a63ecd2528a26fa98dfe56..11f9df53d68447cd252b1323754b5d9556f11d59 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts @@ -691,6 +691,9 @@ export class ExtensionsListView extends ViewletPanel { private async getSyncedExtensionsModel(query: Query, options: IQueryOptions, token: CancellationToken): Promise> { const syncedExtensions = await this.userDataSyncService.getRemoteExtensions(); + if (!syncedExtensions.length) { + return this.showEmptyModel(); + } const ids: string[] = [], names: string[] = []; for (const installed of syncedExtensions) { if (installed.identifier.uuid) { @@ -843,7 +846,7 @@ export class ExtensionsListView extends ViewletPanel { } static isSyncedExtensionsQuery(query: string): boolean { - return /@synced/i.test(query); + return /@myaccount/i.test(query); } focus(): void { @@ -944,7 +947,8 @@ export class BuiltInBasicsExtensionsView extends ExtensionsListView { export class SyncedExtensionsView extends ExtensionsListView { async show(query: string): Promise> { - return (query && query.trim() !== '@synced') ? this.showEmptyModel() : super.show('@synced'); + query = query || '@myaccount'; + return ExtensionsListView.isSyncedExtensionsQuery(query) ? super.show(query) : this.showEmptyModel(); } }