Merge vscode source through 1.62 release (#19981)

* Build breaks 1

* Build breaks

* Build breaks

* Build breaks

* More build breaks

* Build breaks (#2512)

* Runtime breaks

* Build breaks

* Fix dialog location break

* Update typescript

* Fix ASAR break issue

* Unit test breaks

* Update distro

* Fix breaks in ADO builds (#2513)

* Bump to node 16

* Fix hygiene errors

* Bump distro

* Remove reference to node type

* Delete vscode specific extension

* Bump to node 16 in CI yaml

* Skip integration tests in CI builds (while fixing)

* yarn.lock update

* Bump moment dependency in remote yarn

* Fix drop-down chevron style

* Bump to node 16

* Remove playwrite from ci.yaml

* Skip building build scripts in hygine check

test/unit/electron/index.js

@@ -88,11 +88,15 @@ function deserializeRunnable(runnable) {
 function deserializeError(err) {
 	const inspect = err.inspect;
 	err.inspect = () => inspect;
+	// Unfortunately, mocha rewrites and formats err.actual/err.expected.
+	// This formatting is hard to reverse, so err.*JSON includes the unformatted value.
 	if (err.actual) {
 		err.actual = JSON.parse(err.actual).value;
+		err.actualJSON = err.actual;
 	}
 	if (err.expected) {
 		err.expected = JSON.parse(err.expected).value;
+		err.expectedJSON = err.expected;
 	}
 	return err;
 }

test/unit/electron/renderer.js

@@ -129,6 +129,12 @@ function createCoverageReport(opts) {
 	return Promise.resolve(undefined);
 }
 
+function loadWorkbenchTestingModule() {
+	return new Promise((resolve, reject) => {
+		loader.require(['vs/workbench/test/electron-browser/testing'], resolve, reject);
+	})
+}
+
 function loadTestModules(opts) {
 
 	if (opts.run) {
@@ -192,20 +198,34 @@ function loadTests(opts) {
 		});
 	});
 
-	return loadTestModules(opts).then(() => {
-		suite('Unexpected Errors & Loader Errors', function () {
-			test('should not have unexpected errors', function () {
-				const errors = _unexpectedErrors.concat(_loaderErrors);
-				if (errors.length) {
-					errors.forEach(function (stack) {
-						console.error('');
-						console.error(stack);
-					});
-					assert.ok(false, errors);
-				}
+	return loadWorkbenchTestingModule().then((workbenchTestingModule) => {
+		const assertCleanState = workbenchTestingModule.assertCleanState;
+
+		suite('Tests are using suiteSetup and setup correctly', () => {
+			test.skip('assertCleanState - check that registries are clean at the start of test running', () => {
+				assertCleanState();
 			});
 		});
-	});
+
+		return loadTestModules(opts).then(() => {
+			suite('Unexpected Errors & Loader Errors', function () {
+				test('should not have unexpected errors', function () {
+					const errors = _unexpectedErrors.concat(_loaderErrors);
+					if (errors.length) {
+						errors.forEach(function (stack) {
+							console.error('');
+							console.error(stack);
+						});
+						assert.ok(false, errors);
+					}
+				});
+
+				test.skip('assertCleanState - check that registries are clean and objects are disposed at the end of test running', () => {
+					assertCleanState();
+				});
+			});
+		});
+	})
 }
 
 function serializeSuite(suite) {

test/unit/fullJsonStreamReporter.js

@@ -35,6 +35,8 @@ module.exports = class FullJsonStreamReporter extends BaseRunner {
 			test = clean(test);
 			test.actual = err.actual;
 			test.expected = err.expected;
+			test.actualJSON = err.actualJSON;
+			test.expectedJSON = err.expectedJSON;
 			test.err = err.message;
 			test.stack = err.stack || null;
 			writeEvent(['fail', test]);