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/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts

@@ -14,12 +14,12 @@ import { ICommandService } from 'vs/platform/commands/common/commands';
 import { KeybindingResolver } from 'vs/platform/keybinding/common/keybindingResolver';
 import { IContext, ContextKeyExpr, IContextKeyService, IContextKeyServiceTarget } from 'vs/platform/contextkey/common/contextkey';
 import { IStatusbarService } from 'vs/platform/statusbar/common/statusbar';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
 import { OS } from 'vs/base/common/platform';
 import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
 import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
+import { INotificationService, NoOpNotification, INotification } from 'vs/platform/notification/common/notification';
 
 function createContext(ctx: any) {
 	return {
@@ -38,10 +38,10 @@ suite('AbstractKeybindingService', () => {
 			resolver: KeybindingResolver,
 			contextKeyService: IContextKeyService,
 			commandService: ICommandService,
-			messageService: IMessageService,
+			notificationService: INotificationService,
 			statusService?: IStatusbarService
 		) {
-			super(contextKeyService, commandService, NullTelemetryService, messageService, statusService);
+			super(contextKeyService, commandService, NullTelemetryService, notificationService, statusService);
 			this._resolver = resolver;
 		}
 
@@ -121,17 +121,23 @@ suite('AbstractKeybindingService', () => {
 				}
 			};
 
-			let messageService: IMessageService = {
+			let notificationService: INotificationService = {
 				_serviceBrand: undefined,
-				hideAll: undefined,
-				confirm: undefined,
-				confirmWithCheckbox: undefined,
-				show: (sev: Severity, message: any): () => void => {
-					showMessageCalls.push({
-						sev: sev,
-						message: message
-					});
-					return null;
+				notify: (notification: INotification) => {
+					showMessageCalls.push({ sev: notification.severity, message: notification.message });
+					return new NoOpNotification();
+				},
+				info: (message: any) => {
+					showMessageCalls.push({ sev: Severity.Info, message });
+					return new NoOpNotification();
+				},
+				warn: (message: any) => {
+					showMessageCalls.push({ sev: Severity.Warning, message });
+					return new NoOpNotification();
+				},
+				error: (message: any) => {
+					showMessageCalls.push({ sev: Severity.Error, message });
+					return new NoOpNotification();
 				}
 			};
 
@@ -150,7 +156,7 @@ suite('AbstractKeybindingService', () => {
 
 			let resolver = new KeybindingResolver(items, []);
 
-			return new TestKeybindingService(resolver, contextKeyService, commandService, messageService, statusbarService);
+			return new TestKeybindingService(resolver, contextKeyService, commandService, notificationService, statusbarService);
 		};
 	});