Should stop sending global settings and keybindings via IPC (fixes #6094)

src/vs/code/electron-main/main.ts

@@ -167,9 +167,6 @@ function main(accessor: ServicesAccessor, mainIpcServer: Server, userEnv: IProce
 	// Lifecycle
 	lifecycleService.ready();
 
-	// Load settings (TODO@Ben remove)
-	global.globalSettingsValue = JSON.stringify(configurationService.getConfiguration());
-
 	// Propagate to clients
 	windowsService.ready(userEnv);
 

src/vs/code/electron-main/windows.ts

@@ -193,11 +193,6 @@ export class WindowsManager implements IWindowsService {
 			}, 100);
 		});
 
-		this.configurationService.onDidUpdateConfiguration(event => {
-			global.globalSettingsValue = JSON.stringify(event.config); // Load settings (TODO@Ben remove)
-			this.sendToAll('vscode:optionsChange', JSON.stringify(event.config));
-		}, this);
-
 		ipc.on('vscode:startCrashReporter', (event: any, config: any) => {
 			this.logService.log('IPC#vscode:startCrashReporter');
 

src/vs/test/utils/servicesTestUtils.ts

@@ -57,9 +57,7 @@ export class TestContextService implements WorkspaceContextService.IWorkspaceCon
 
 	constructor(workspace: any = TestWorkspace, options: any = null) {
 		this.workspace = workspace;
-		this.options = options || {
-			globalSettings: {}
-		};
+		this.options = options || Object.create(null);
 	}
 
 	public getWorkspace(): IWorkspace {

src/vs/workbench/common/events.ts

@@ -26,29 +26,6 @@ export class EventType {
 	 * Event type for when a resources encoding changes.
 	 */
 	static RESOURCE_ENCODING_CHANGED = 'resourceEncodingChanged';
-
-	/**
-	 * Event type for when the workbench options change. Listeners should refresh their
-	 * assumption on workbench options after this event is emitted.
-	 */
-	static WORKBENCH_OPTIONS_CHANGED = 'workbenchOptionsChanged';
-}
-
-/**
- * Option change events are send when the options in the running instance change.
- */
-export class OptionsChangeEvent extends Event {
-	public key: string;
-	public before: any;
-	public after: any;
-
-	constructor(key: string, before: any, after: any, originalEvent?: any) {
-		super(originalEvent);
-
-		this.key = key;
-		this.before = before;
-		this.after = after;
-	}
 }
 
 export class ResourceEvent extends Event {

src/vs/workbench/common/options.ts

@@ -27,9 +27,4 @@ export interface IOptions {
 	 * Instructs the workbench to install the extensions from the provided local paths.
 	 */
 	extensionsToInstall?: string[];
-
-	/**
-	 * The global application settings if any.
-	 */
-	globalSettings?: any;
 }
\ No newline at end of file

src/vs/workbench/electron-browser/bootstrap/index.js

@@ -120,11 +120,6 @@ function main() {
 	const enableDeveloperTools = process.env['VSCODE_DEV'] || !!configuration.extensionDevelopmentPath;
 	registerListeners(enableDeveloperTools);
 
-	// We get the global settings through a remote call from the browser
-	// because its value can change dynamically.
-	const rawGlobalSettings = remote.getGlobal('globalSettingsValue') || '{}';
-	const globalSettings = JSON.parse(rawGlobalSettings);
-
 	// disable pinch zoom & apply zoom level early to avoid glitches
 	const zoomLevel = configuration.zoomLevel;
 	webFrame.setZoomLevelLimits(1, 1);
@@ -177,7 +172,7 @@ function main() {
 			timers.afterLoad = new Date();
 
 			require('vs/workbench/electron-browser/main')
-				.startup(configuration, globalSettings)
+				.startup(configuration)
 				.done(null, function (error) { onError(error, enableDeveloperTools); });
 		});
 	});

src/vs/workbench/electron-browser/integration.ts

@@ -22,7 +22,6 @@ import {IContextMenuService} from 'vs/platform/contextview/browser/contextView';
 import {ICommandService} from 'vs/platform/commands/common/commands';
 import {IKeybindingService} from 'vs/platform/keybinding/common/keybinding';
 import {IWorkspaceContextService}from 'vs/platform/workspace/common/workspace';
-import {LegacyWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService';
 import {IWindowService} from 'vs/workbench/services/window/electron-browser/windowService';
 import {IWindowConfiguration} from 'vs/workbench/electron-browser/window';
 import {IConfigurationService} from 'vs/platform/configuration/common/configuration';
@@ -74,12 +73,6 @@ export class ElectronIntegration {
 			this.commandService.executeCommand(actionId, { from: 'menu' }).done(undefined, err => this.messageService.show(Severity.Error, err));
 		});
 
-		// Support options change
-		ipc.on('vscode:optionsChange', (event, options: string) => {
-			const optionsData = JSON.parse(options);
-			(<LegacyWorkspaceContextService>this.contextService).updateOptions('globalSettings', optionsData);
-		});
-
 		// Support resolve keybindings event
 		ipc.on('vscode:resolveKeybindings', (event, rawActionIds: string) => {
 			let actionIds: string[] = [];

src/vs/workbench/electron-browser/main.ts

@@ -62,7 +62,7 @@ export interface IWindowConfiguration extends ParsedArgs {
 	extensionsToInstall?: string[];
 }
 
-export function startup(configuration: IWindowConfiguration, globalSettings: any): winjs.TPromise<void> {
+export function startup(configuration: IWindowConfiguration): winjs.TPromise<void> {
 
 	// Shell Options
 	const filesToOpen = configuration.filesToOpen && configuration.filesToOpen.length ? toInputs(configuration.filesToOpen) : null;
@@ -72,8 +72,7 @@ export function startup(configuration: IWindowConfiguration, globalSettings: any
 		filesToOpen,
 		filesToCreate,
 		filesToDiff,
-		extensionsToInstall: configuration.extensionsToInstall,
-		globalSettings
+		extensionsToInstall: configuration.extensionsToInstall
 	};
 
 	if (configuration.performance) {
@@ -131,7 +130,7 @@ function getWorkspace(workspacePath: string): IWorkspace {
 function openWorkbench(environment: IWindowConfiguration, workspace: IWorkspace, options: IOptions): winjs.TPromise<void> {
 	const eventService = new EventService();
 	const environmentService = new EnvironmentService(environment, environment.execPath);
-	const contextService = new LegacyWorkspaceContextService(eventService, workspace, options);
+	const contextService = new LegacyWorkspaceContextService(workspace, options);
 	const configurationService = new ConfigurationService(contextService, eventService, environmentService);
 
 	// Since the configuration service is one of the core services that is used in so many places, we initialize it

src/vs/workbench/services/workspace/common/contextService.ts

@@ -5,14 +5,11 @@
 'use strict';
 
 import {IOptions} from 'vs/workbench/common/options';
-import {EventType, OptionsChangeEvent} from 'vs/workbench/common/events';
-import {IEventService} from 'vs/platform/event/common/event';
 import {IWorkspace, WorkspaceContextService} from 'vs/platform/workspace/common/workspace';
 
 export class LegacyWorkspaceContextService extends WorkspaceContextService {
 
 	constructor(
-		private eventService: IEventService,
 		workspace: IWorkspace,
 		private options: IOptions
 	) {
@@ -22,11 +19,4 @@ export class LegacyWorkspaceContextService extends WorkspaceContextService {
 	public getOptions(): IOptions {
 		return this.options;
 	}
-
-	public updateOptions(key: string, value: any): void {
-		let oldValue = this.options[key];
-		this.options[key] = value;
-
-		this.eventService.emit(EventType.WORKBENCH_OPTIONS_CHANGED, new OptionsChangeEvent(key, oldValue, value));
-	}
 }
\ No newline at end of file