Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463

* fix config changes

* fix strictnull checks

scripts/code.sh

@@ -5,10 +5,6 @@ set -e
 if [[ "$OSTYPE" == "darwin"* ]]; then
 	realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
 	ROOT=$(dirname "$(dirname "$(realpath "$0")")")
-
-	# On Linux with Electron 2.0.x running out of a VM causes
-	# a freeze so we only enable this flag on macOS
-	export ELECTRON_ENABLE_LOGGING=1
 else
 	ROOT=$(dirname "$(dirname "$(readlink -f $0)")")
 	if grep -qi Microsoft /proc/version; then
@@ -50,6 +46,8 @@ function code() {
 	export VSCODE_DEV=1
 	export VSCODE_CLI=1
 	export ELECTRON_ENABLE_STACK_DUMPING=1
+	export ELECTRON_ENABLE_LOGGING=1
+	export VSCODE_LOGS=
 
 	# Launch Code
 	exec "$CODE" . "$@"