From 6c0f89cd32c1e417ce8168b913f456907b76276d Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Wed, 27 Jul 2016 09:29:27 +0200 Subject: [PATCH] use later in post extension uninstall message fixes #9801 --- src/vs/platform/message/common/message.ts | 3 ++- .../parts/extensions/electron-browser/extensionsActions.ts | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/vs/platform/message/common/message.ts b/src/vs/platform/message/common/message.ts index ae1f2356407..cfde27c0cd3 100644 --- a/src/vs/platform/message/common/message.ts +++ b/src/vs/platform/message/common/message.ts @@ -24,7 +24,8 @@ export interface IConfirmation { } export const CloseAction = new Action('close.message', nls.localize('close', "Close"), null, true, () => TPromise.as(true)); -export const CancelAction = new Action('close.message', nls.localize('cancel', "Cancel"), null, true, () => TPromise.as(true)); +export const LaterAction = new Action('later.message', nls.localize('later', "Later"), null, true, () => TPromise.as(true)); +export const CancelAction = new Action('cancel.message', nls.localize('cancel', "Cancel"), null, true, () => TPromise.as(true)); export const IMessageService = createDecorator('messageService'); diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts index 696a59455b8..e900aff2bd8 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts @@ -13,7 +13,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { ReloadWindowAction } from 'vs/workbench/electron-browser/actions'; import { IExtension, ExtensionState, IExtensionsWorkbenchService, VIEWLET_ID, IExtensionsViewlet } from './extensions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IMessageService, CloseAction } from 'vs/platform/message/common/message'; +import { IMessageService, LaterAction } from 'vs/platform/message/common/message'; import { ToggleViewletAction } from 'vs/workbench/browser/viewlet'; import { IViewletService } from 'vs/workbench/services/viewlet/common/viewletService'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; @@ -93,7 +93,7 @@ export class UninstallAction extends Action { return this.extensionsWorkbenchService.uninstall(this.extension).then(() => { this.messageService.show(severity.Info, { message: localize('postUninstallMessage', "{0} was successfully uninstalled. Restart to deactivate it.", this.extension.displayName), - actions: [CloseAction, this.instantiationService.createInstance(ReloadWindowAction, ReloadWindowAction.ID, localize('restartNow', "Restart Now"))] + actions: [LaterAction, this.instantiationService.createInstance(ReloadWindowAction, ReloadWindowAction.ID, localize('restartNow', "Restart Now"))] }); }); } -- GitLab