electron - configure to disable LayoutNG (workaround for microsoft#88873)

Benjamin Pasero · Benjamin Pasero · commit 42e21c2e6332 · 2020-02-17T10:44:25.000+01:00
diff --git a/src/main.js b/src/main.js
@@ -82,7 +82,7 @@ app.once('ready', function () {
 			traceOptions: args['trace-options'] || 'record-until-full,enable-sampling'
 		};
 
-		contentTracing.startRecording(traceOptions, () => onReady());
+		contentTracing.startRecording(traceOptions).finally(() => onReady());
 	} else {
 		onReady();
 	}
@@ -162,6 +162,9 @@ function configureCommandlineSwitchesSync(cliArgs) {
 		app.commandLine.appendSwitch('js-flags', jsFlags);
 	}
 
+	// TODO@Ben TODO@Deepak Electron 7 workaround for https://github.com/microsoft/vscode/issues/88873
+	app.commandLine.appendSwitch('disable-features', 'LayoutNG');
+
 	return argvConfig;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ app.once('ready', function () {`
`82`	`82`	`traceOptions: args['trace-options'] \|\| 'record-until-full,enable-sampling'`
`83`	`83`	`};`
`84`	`84`
`85`		`- contentTracing.startRecording(traceOptions, () => onReady());`
	`85`	`+ contentTracing.startRecording(traceOptions).finally(() => onReady());`
`86`	`86`	`} else {`
`87`	`87`	`onReady();`
`88`	`88`	`}`
`@@ -162,6 +162,9 @@ function configureCommandlineSwitchesSync(cliArgs) {`
`162`	`162`	`app.commandLine.appendSwitch('js-flags', jsFlags);`
`163`	`163`	`}`
`164`	`164`
	`165`	`+ // TODO@Ben TODO@Deepak Electron 7 workaround for https://github.com/microsoft/vscode/issues/88873`
	`166`	`+ app.commandLine.appendSwitch('disable-features', 'LayoutNG');`
	`167`	`+`
`165`	`168`	`return argvConfig;`
`166`	`169`	`}`
`167`	`170`