Merge from vscode 0a7364f00514c46c9caceece15e1f82f82e3712f

test/unit/electron/index.js

@@ -12,6 +12,10 @@ const events = require('events');
 // const MochaJUnitReporter = require('mocha-junit-reporter');
 const url = require('url');
 
+// Disable render process reuse, we still have
+// non-context aware native modules in the renderer.
+app.allowRendererProcessReuse = false;
+
 const defaultReporterName = process.platform === 'win32' ? 'list' : 'spec';
 
 const optimist = require('optimist')
@@ -121,14 +125,13 @@ app.on('ready', () => {
 		width: 800,
 		show: false,
 		webPreferences: {
-			backgroundThrottling: false,
-			nodeIntegration: true,
-			webSecurity: false,
-			webviewTag: true,
 			preload: path.join(__dirname, '..', '..', '..', 'src', 'vs', 'base', 'parts', 'sandbox', 'electron-browser', 'preload.js'), // ensure similar environment as VSCode as tests may depend on this
+			nodeIntegration: true,
 			enableWebSQL: false,
 			enableRemoteModule: false,
-			nativeWindowOpen: true
+			spellcheck: false,
+			nativeWindowOpen: true,
+			webviewTag: true
 		}
 	});
 

test/unit/electron/renderer.js

@@ -34,7 +34,7 @@ function initLoader(opts) {
 		nodeRequire: require,
 		nodeMain: __filename,
 		catchError: true,
-		baseUrl: bootstrap.uriFromPath(path.join(__dirname, '../../../src')),
+		baseUrl: bootstrap.fileUriFromPath(path.join(__dirname, '../../../src')),
 		paths: {
 			'vs': `../${outdir}/vs`,
 			'sql': `../${outdir}/sql`, // {{SQL CARBON EDIT}}