From d33a1d808d699d0421fb4470cedab218a303f3a7 Mon Sep 17 00:00:00 2001 From: Christof Marti Date: Wed, 30 May 2018 17:08:24 +0200 Subject: [PATCH] Fix errors installing extension from Welcome page (fixes #50753) --- .../extensionManagement/node/extensionManagementService.ts | 2 +- .../parts/welcome/page/electron-browser/welcomePage.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts index 1e1bece31af37..5d7e31e087c11 100644 --- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts +++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts @@ -246,7 +246,7 @@ export class ExtensionManagementService extends Disposable implements IExtension return this.downloadAndInstallExtensions(extensionsToInstall, operataions) .then( locals => this.onDidInstallExtensions(extensionsToInstall, locals, operataions, []) - .then(() => locals.filter(l => areSameExtensions({ id: getGalleryExtensionIdFromLocal(l), uuid: l.identifier.uuid }, extension.identifier)[0])), + .then(() => locals.filter(l => areSameExtensions({ id: getGalleryExtensionIdFromLocal(l), uuid: l.identifier.uuid }, extension.identifier))[0]), errors => this.onDidInstallExtensions(extensionsToInstall, [], operataions, errors)); }, error => this.onDidInstallExtensions([extension], [], [this.getOperation(extension.identifier, installed)], [error]))); diff --git a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts index 9dd2099fc18f2..a6fa57c21d2c9 100644 --- a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts +++ b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts @@ -117,7 +117,7 @@ const extensionPacks: ExtensionSuggestion[] = [ // { name: localize('welcomePage.go', "Go"), id: 'lukehoban.go' }, { name: localize('welcomePage.php', "PHP"), id: 'felixfbecker.php-pack' }, { name: localize('welcomePage.azure', "Azure"), title: localize('welcomePage.showAzureExtensions', "Show Azure extensions"), id: 'workbench.extensions.action.showAzureExtensions', isCommand: true }, - { name: localize('welcomePage.docker', "Docker"), id: 'PeterJausovec.vscode-docker' }, + { name: localize('welcomePage.docker', "Docker"), id: 'peterjausovec.vscode-docker' }, ]; const keymapExtensions: ExtensionSuggestion[] = [