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/workbench/services/activity/browser/activityService.ts

@@ -21,11 +21,11 @@ export class ActivityService implements IActivityService {
 		@IPanelService private panelService: IPanelService
 	) { }
 
-	public showActivity(compositeOrActionId: string, badge: IBadge, clazz?: string): IDisposable {
+	public showActivity(compositeOrActionId: string, badge: IBadge, clazz?: string, priority?: number): IDisposable {
 		if (this.panelService.getPanels().filter(p => p.id === compositeOrActionId).length) {
 			return this.panelPart.showActivity(compositeOrActionId, badge, clazz);
 		}
 
-		return this.activitybarPart.showActivity(compositeOrActionId, badge, clazz);
+		return this.activitybarPart.showActivity(compositeOrActionId, badge, clazz, priority);
 	}
 }

src/vs/workbench/services/activity/common/activity.ts

@@ -66,5 +66,5 @@ export interface IActivityService {
 	/**
 	 * Show activity in the panel for the given panel or in the activitybar for the given viewlet or global action.
 	 */
-	showActivity(compositeOrActionId: string, badge: IBadge, clazz?: string): IDisposable;
+	showActivity(compositeOrActionId: string, badge: IBadge, clazz?: string, priority?: number): IDisposable;
 }