Merge from vscode 1b314ab317fbff7d799b21754326b7d849889ceb

src/bootstrap-window.js

@@ -22,8 +22,6 @@
 	}
 }(this, function () {
 	const path = require.__$__nodeRequire('path');
-	const webFrame = require.__$__nodeRequire('electron').webFrame;
-	const ipc = require.__$__nodeRequire('electron').ipcRenderer;
 	const bootstrap = globalThis.MonacoBootstrap;
 
 	/**
@@ -36,7 +34,6 @@
 		/**
 		 * // configuration: INativeWindowConfiguration
 		 * @type {{
-		 * zoomLevel?: number,
 		 * extensionDevelopmentPath?: string[],
 		 * extensionTestsPath?: string,
 		 * userEnv?: { [key: string]: string | undefined },
@@ -45,12 +42,6 @@
 		 * }} */
 		const configuration = JSON.parse(args['config'] || '{}') || {};
 
-		// Apply zoom level early to avoid glitches
-		const zoomLevel = configuration.zoomLevel;
-		if (typeof zoomLevel === 'number' && zoomLevel !== 0) {
-			webFrame.setZoomLevel(zoomLevel);
-		}
-
 		// Error handler
 		process.on('uncaughtException', function (error) {
 			onUnexpectedError(error, enableDeveloperTools);
@@ -96,28 +87,9 @@
 		const loaderConfig = {
 			baseUrl: `${bootstrap.uriFromPath(configuration.appRoot)}/out`,
 			'vs/nls': nlsConfig,
-			nodeModules: [/*BUILD->INSERT_NODE_MODULES*/]
+			amdModulesPattern: /^(vs|sql)\//, // {{SQL CARBON EDIT}} include sql in regex
 		};
 
-		loaderConfig.nodeModules = loaderConfig.nodeModules.concat([
-			'@angular/common',
-			'@angular/core',
-			'@angular/forms',
-			'@angular/platform-browser',
-			'@angular/platform-browser-dynamic',
-			'@angular/router',
-			'rxjs/Observable',
-			'rxjs/add/observable/fromPromise',
-			'rxjs/Subject',
-			'rxjs/Observer',
-			'slickgrid/lib/jquery.event.drag-2.3.0',
-			'slickgrid/lib/jquery-ui-1.9.2',
-			'slickgrid/slick.core',
-			'slickgrid/slick.grid',
-			'slickgrid/slick.editors',
-			'slickgrid/slick.dataview'
-		]);
-
 		// cached data config
 		if (configuration.nodeCachedDataDir) {
 			loaderConfig.nodeCachedData = {
@@ -178,6 +150,8 @@
 	 * @returns {() => void}
 	 */
 	function registerDeveloperKeybindings(disallowReloadKeybinding) {
+		const ipcRenderer = globals().ipcRenderer;
+
 		const extractKey = function (e) {
 			return [
 				e.ctrlKey ? 'ctrl-' : '',
@@ -196,9 +170,9 @@
 		let listener = function (e) {
 			const key = extractKey(e);
 			if (key === TOGGLE_DEV_TOOLS_KB || key === TOGGLE_DEV_TOOLS_KB_ALT) {
-				ipc.send('vscode:toggleDevTools');
+				ipcRenderer.send('vscode:toggleDevTools');
 			} else if (key === RELOAD_KB && !disallowReloadKeybinding) {
-				ipc.send('vscode:reloadWindow');
+				ipcRenderer.send('vscode:reloadWindow');
 			}
 		};
 
@@ -218,7 +192,8 @@
 	 */
 	function onUnexpectedError(error, enableDeveloperTools) {
 		if (enableDeveloperTools) {
-			ipc.send('vscode:openDevTools');
+			const ipcRenderer = globals().ipcRenderer;
+			ipcRenderer.send('vscode:openDevTools');
 		}
 
 		console.error(`[uncaught exception]: ${error}`);
@@ -228,7 +203,16 @@
 		}
 	}
 
+	/**
+	 * @return {typeof import('./vs/base/parts/sandbox/electron-sandbox/globals')}
+	 */
+	function globals() {
+		// @ts-ignore (defined in globals.js)
+		return window.vscode;
+	}
+
 	return {
-		load
+		load,
+		globals
 	};
 }));