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

test/smoke/src/areas/workbench/localization.test.ts

@@ -7,48 +7,50 @@ import * as assert from 'assert';
 
 import { SpectronApplication, Quality } from '../../spectron/application';
 
-describe('Localization', () => {
-	before(async function () {
-		const app = this.app as SpectronApplication;
-		this.app.suiteName = 'Localization';
+export function setup() {
+	describe('Localization', () => {
+		before(async function () {
+			const app = this.app as SpectronApplication;
+			this.app.suiteName = 'Localization';
 
-		if (app.quality === Quality.Dev) {
-			return;
-		}
+			if (app.quality === Quality.Dev) {
+				return;
+			}
 
-		await app.restart(['--locale=DE']);
+			await app.restart({ extraArgs: ['--locale=DE'] });
+		});
+
+		it(`starts with 'DE' locale and verifies title and viewlets text is in German`, async function () {
+			const app = this.app as SpectronApplication;
+
+			if (app.quality === Quality.Dev) {
+				this.skip();
+				return;
+			}
+
+			let text = await app.workbench.explorer.getOpenEditorsViewTitle();
+			await app.screenCapturer.capture('Open editors title');
+			assert(/geöffnete editoren/i.test(text));
+
+			await app.workbench.search.openSearchViewlet();
+			text = await app.workbench.search.getTitle();
+			await app.screenCapturer.capture('Search title');
+			assert(/suchen/i.test(text));
+
+			await app.workbench.scm.openSCMViewlet();
+			text = await app.workbench.scm.getTitle();
+			await app.screenCapturer.capture('Scm title');
+			assert(/quellcodeverwaltung/i.test(text));
+
+			await app.workbench.debug.openDebugViewlet();
+			text = await app.workbench.debug.getTitle();
+			await app.screenCapturer.capture('Debug title');
+			assert(/debuggen/i.test(text));
+
+			await app.workbench.extensions.openExtensionsViewlet();
+			text = await app.workbench.extensions.getTitle();
+			await app.screenCapturer.capture('Extensions title');
+			assert(/erweiterungen/i.test(text));
+		});
 	});
-
-	it(`starts with 'DE' locale and verifies title and viewlets text is in German`, async function () {
-		const app = this.app as SpectronApplication;
-
-		if (app.quality === Quality.Dev) {
-			this.skip();
-			return;
-		}
-
-		let text = await app.workbench.explorer.getOpenEditorsViewTitle();
-		await app.screenCapturer.capture('Open editors title');
-		assert(/geöffnete editoren/i.test(text));
-
-		await app.workbench.search.openSearchViewlet();
-		text = await app.workbench.search.getTitle();
-		await app.screenCapturer.capture('Search title');
-		assert(/suchen/i.test(text));
-
-		await app.workbench.scm.openSCMViewlet();
-		text = await app.workbench.scm.getTitle();
-		await app.screenCapturer.capture('Scm title');
-		assert(/quellcodeverwaltung/i.test(text));
-
-		await app.workbench.debug.openDebugViewlet();
-		text = await app.workbench.debug.getTitle();
-		await app.screenCapturer.capture('Debug title');
-		assert(/debuggen/i.test(text));
-
-		await app.workbench.extensions.openExtensionsViewlet();
-		text = await app.workbench.extensions.getTitle();
-		await app.screenCapturer.capture('Extensions title');
-		assert(/erweiterungen/i.test(text));
-	});
-});
+}