Merge from master

src/vs/platform/dialogs/node/dialogIpc.ts

@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IChannel, IServerChannel } from 'vs/base/parts/ipc/node/ipc';
+import { IDialogService, IConfirmation, IConfirmationResult } from 'vs/platform/dialogs/common/dialogs';
+import Severity from 'vs/base/common/severity';
+import { Event } from 'vs/base/common/event';
+
+export class DialogChannel implements IServerChannel {
+
+	constructor(@IDialogService private dialogService: IDialogService) { }
+
+	listen<T>(_, event: string): Event<T> {
+		throw new Error(`Event not found: ${event}`);
+	}
+
+	call(_, command: string, args?: any[]): Thenable<any> {
+		switch (command) {
+			case 'show': return this.dialogService.show(args![0], args![1], args![2]);
+			case 'confirm': return this.dialogService.confirm(args![0]);
+		}
+		return Promise.reject(new Error('invalid command'));
+	}
+}
+
+export class DialogChannelClient implements IDialogService {
+
+	_serviceBrand: any;
+
+	constructor(private channel: IChannel) { }
+
+	show(severity: Severity, message: string, options: string[]): Thenable<number> {
+		return this.channel.call('show', [severity, message, options]);
+	}
+
+	confirm(confirmation: IConfirmation): Thenable<IConfirmationResult> {
+		return this.channel.call('confirm', [confirmation]);
+	}
+}

src/vs/platform/dialogs/node/dialogService.ts

@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as readline from 'readline';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { IDialogService, IConfirmation, IConfirmationResult } from 'vs/platform/dialogs/common/dialogs';
 import Severity from 'vs/base/common/severity';
 import { localize } from 'vs/nls';
@@ -14,8 +13,8 @@ export class CommandLineDialogService implements IDialogService {
 
 	_serviceBrand: any;
 
-	show(severity: Severity, message: string, options: string[]): TPromise<number> {
-		const promise = new TPromise<number>((c, e) => {
+	show(severity: Severity, message: string, options: string[]): Promise<number> {
+		const promise = new Promise<number>((c, e) => {
 			const rl = readline.createInterface({
 				input: process.stdin,
 				output: process.stdout,
@@ -58,8 +57,8 @@ export class CommandLineDialogService implements IDialogService {
 		return -1;
 	}
 
-	confirm(confirmation: IConfirmation): TPromise<IConfirmationResult> {
-		return this.show(Severity.Info, confirmation.message, [confirmation.primaryButton, confirmation.secondaryButton || localize('cancel', "Cancel")]).then(index => {
+	confirm(confirmation: IConfirmation): Promise<IConfirmationResult> {
+		return this.show(Severity.Info, confirmation.message, [confirmation.primaryButton || localize('ok', "Ok"), confirmation.secondaryButton || localize('cancel', "Cancel")]).then(index => {
 			return {
 				confirmed: index === 0
 			} as IConfirmationResult;