Set Electron session's proxy from user setting (fixes microsoft#94148)

chrmarti · chrmarti · commit 1e960d5abb57 · 2020-04-08T10:43:54.000+02:00
diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
@@ -118,6 +118,8 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 
 	private readonly touchBarGroups: TouchBarSegmentedControl[];
 
+	private currentHttpProxy?: string;
+
 	constructor(
 		config: IWindowCreationOptions,
 		@ILogService private readonly logService: ILogService,
@@ -594,6 +596,16 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 			this.currentMenuBarVisibility = newMenuBarVisibility;
 			this.setMenuBarVisibility(newMenuBarVisibility);
 		}
+		// Do not set to empty configuration at startup if setting is empty to not override configuration through CLI options:
+		const newHttpProxy = (this.configurationService.getValue<string>('http.proxy') || '').trim() || undefined;
+		if (newHttpProxy !== this.currentHttpProxy) {
+			this.currentHttpProxy = newHttpProxy;
+			this._win.webContents.session.setProxy({
+				proxyRules: newHttpProxy || '',
+				proxyBypassRules: '',
+				pacScript: '',
+			});
+		}
 	}
 
 	addTabbedWindow(window: ICodeWindow): void {
