From 263d342a79329f1fd378f9e875ea0bf5d2d3a916 Mon Sep 17 00:00:00 2001
From: Amir Omidi <amir@aaomidi.com>
Date: Thu, 3 Oct 2019 16:01:16 -0700
Subject: [PATCH] Revert "Revert "allows zone.js to cleanup error stacktraces
 (#7203)" (#7499)" (#7500)

This reverts commit 0d2dcb3d2596b6d8b3c08d99b69014922268f43a.
---
 src/sql/setup.js          | 8 ++++++--
 test/electron/renderer.js | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/sql/setup.js b/src/sql/setup.js
index 60beb48846..bc5e1eba7c 100644
--- a/src/sql/setup.js
+++ b/src/sql/setup.js
@@ -2,7 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-define(["require", "exports"], function (require) {
+define(["require", "exports", "vs/base/common/errors"], function (require, errors) {
 	const jquerylib = require.__$__nodeRequire('jquery');
 
 	window['jQuery'] = jquerylib;
@@ -18,6 +18,10 @@ define(["require", "exports"], function (require) {
 	require.__$__nodeRequire('slickgrid/slick.dataview');
 	require.__$__nodeRequire('slickgrid/plugins/slick.cellrangedecorator');
 	require.__$__nodeRequire('reflect-metadata');
-	require.__$__nodeRequire('zone.js');
+	require.__$__nodeRequire('zone.js/dist/zone');
+	require.__$__nodeRequire('zone.js/dist/zone-error');
 	require.__$__nodeRequire('chart.js');
+
+	window["Zone"]["__zone_symbol__ignoreConsoleErrorUncaughtError"] = true;
+	window["Zone"]["__zone_symbol__unhandledPromiseRejectionHandler"] = errors.onUnexpectedError;
 });
diff --git a/test/electron/renderer.js b/test/electron/renderer.js
index 1e72144e6e..e974e8ca3d 100644
--- a/test/electron/renderer.js
+++ b/test/electron/renderer.js
@@ -13,7 +13,7 @@ const util = require('util');
 const bootstrap = require('../../src/bootstrap');
 const coverage = require('../coverage');
 
-require('reflect-metadata'); // {{SQL CARBON EDIT}}
+require('../../src/sql/setup'); // {{SQL CARBON EDIT}}
 
 // Disabled custom inspect. See #38847
 if (util.inspect && util.inspect['defaultOptions']) {