Merge VS Code 1.21 source code (#1067)

* Initial VS Code 1.21 file copy with patches

* A few more merges

* Post npm install

* Fix batch of build breaks

* Fix more build breaks

* Fix more build errors

* Fix more build breaks

* Runtime fixes 1

* Get connection dialog working with some todos

* Fix a few packaging issues

* Copy several node_modules to package build to fix loader issues

* Fix breaks from master

* A few more fixes

* Make tests pass

* First pass of license header updates

* Second pass of license header updates

* Fix restore dialog issues

* Remove add additional themes menu items

* fix select box issues where the list doesn't show up

* formatting

* Fix editor dispose issue

* Copy over node modules to correct location on all platforms

src/sql/parts/accountManagement/common/accountActions.ts

@@ -10,11 +10,13 @@ import Event, { Emitter } from 'vs/base/common/event';
 import { localize } from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Action } from 'vs/base/common/actions';
-import { IMessageService, IConfirmation, Severity } from 'vs/platform/message/common/message';
 
 import { error } from 'sql/base/common/log';
 import { IAccountManagementService } from 'sql/services/accountManagement/interfaces';
 import { IErrorMessageService } from 'sql/parts/connection/common/connectionManagement';
+import { IConfirmationService, IConfirmation } from 'vs/platform/dialogs/common/dialogs';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import Severity from 'vs/base/common/severity';
 
 /**
  * Actions to add a new account
@@ -79,7 +81,8 @@ export class RemoveAccountAction extends Action {
 
 	constructor(
 		private _account: sqlops.Account,
-		@IMessageService private _messageService: IMessageService,
+		@IConfirmationService private _confirmationService: IConfirmationService,
+		@INotificationService private _notificationService: INotificationService,
 		@IErrorMessageService private _errorMessageService: IErrorMessageService,
 		@IAccountManagementService private _accountManagementService: IAccountManagementService
 	) {
@@ -97,23 +100,26 @@ export class RemoveAccountAction extends Action {
 			type: 'question'
 		};
 
-		let confirmPromise: boolean = this._messageService.confirm(confirm);
-		if (!confirmPromise) {
-			return TPromise.as(false);
-		} else {
-			return new TPromise((resolve, reject) => {
-				self._accountManagementService.removeAccount(self._account.key)
-					.then(
-						(result) => { resolve(result); },
-						(err) => {
-							// Must handle here as this is an independent action
-							self._errorMessageService.showDialog(Severity.Error,
-								localize('removeAccountFailed', 'Failed to remove account'), err);
-							resolve(false);
-						}
-					);
-			});
-		}
+		return this._confirmationService.confirm(confirm).then(result => {
+			if (!result) {
+				return TPromise.as(false);
+			} else {
+				return new TPromise((resolve, reject) => {
+					self._accountManagementService.removeAccount(self._account.key)
+						.then(
+							(result) => { resolve(result); },
+							(err) => {
+								// Must handle here as this is an independent action
+								self._notificationService.notify({
+									severity: Severity.Error,
+									message: localize('removeAccountFailed', 'Failed to remove account')
+								});
+								resolve(false);
+							}
+						);
+				});
+			}
+		});
 	}
 }
 

src/sql/parts/accountManagement/common/accountManagement.contribution.ts

@@ -8,7 +8,7 @@
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
-import { IExtensionPointUser, ExtensionsRegistry } from 'vs/platform/extensions/common/extensionsRegistry';
+import { IExtensionPointUser, ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import { localize } from 'vs/nls';
 import { join } from 'path';