Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 (#6381)

* Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973

* disable strict null check

resources/completions/bash/code

@@ -50,7 +50,7 @@ _code()
 			--uninstall-extension --enable-proposed-api --verbose --log -s
 			--status -p --performance --prof-startup --disable-extensions
 			--disable-extension --inspect-extensions
-			--inspect-brk-extensions --disable-gpu --upload-logs
+			--inspect-brk-extensions --disable-gpu
 			--max-memory=' -- "$cur") )
 		[[ $COMPREPLY == *= ]] && compopt -o nospace
 		return

resources/completions/zsh/_code

@@ -14,6 +14,7 @@ arguments=(
 	'--user-data-dir[specify the directory that user data is kept in]:directory:_directories'
 	'(- *)'{-v,--version}'[print version]'
 	'(- *)'{-h,--help}'[print usage]'
+	'(- *)'{--telemetry}'[Shows all telemetry events which VS code collects.]'
 	'--extensions-dir[set the root path for extensions]:root path:_directories'
 	'--list-extensions[list the installed extensions]'
 	'--show-versions[show versions of installed extensions, when using --list-extension]'
@@ -30,7 +31,6 @@ arguments=(
 	'--inspect-extensions[allow debugging and profiling of extensions]'
 	'--inspect-brk-extensions[allow debugging and profiling of extensions with the extension host being paused after start]'
 	'--disable-gpu[disable GPU hardware acceleration]'
-	'--upload-logs[upload logs from current session to a secure endpoint]:confirm:(iConfirmLogsUpload)'
 	'--max-memory=[max memory size for a window (in Mbytes)]:size (Mbytes)'
 	'*:file or directory:_files'
 )

resources/linux/rpm/dependencies.json

@@ -63,83 +63,5 @@
 		"libxcb.so.1()(64bit)",
 		"libxkbfile.so.1()(64bit)",
 		"libsecret-1.so.0()(64bit)"
-	],
-	"i386": [
-		"ld-linux.so.2",
-		"ld-linux.so.2(GLIBC_2.1)",
-		"libX11-xcb.so.1",
-		"libX11.so.6",
-		"libXcomposite.so.1",
-		"libXcursor.so.1",
-		"libXdamage.so.1",
-		"libXext.so.6",
-		"libXfixes.so.3",
-		"libXi.so.6",
-		"libXrandr.so.2",
-		"libXrender.so.1",
-		"libXss.so.1",
-		"libXtst.so.6",
-		"libasound.so.2",
-		"libatk-1.0.so.0",
-		"libc.so.6",
-		"libc.so.6(GLIBC_2.0)",
-		"libc.so.6(GLIBC_2.1)",
-		"libc.so.6(GLIBC_2.1.3)",
-		"libc.so.6(GLIBC_2.11)",
-		"libc.so.6(GLIBC_2.2)",
-		"libc.so.6(GLIBC_2.2.3)",
-		"libc.so.6(GLIBC_2.3)",
-		"libc.so.6(GLIBC_2.3.2)",
-		"libc.so.6(GLIBC_2.3.4)",
-		"libc.so.6(GLIBC_2.4)",
-		"libc.so.6(GLIBC_2.6)",
-		"libc.so.6(GLIBC_2.7)",
-		"libcairo.so.2",
-		"libcups.so.2",
-		"libdbus-1.so.3",
-		"libdl.so.2",
-		"libdl.so.2(GLIBC_2.0)",
-		"libdl.so.2(GLIBC_2.1)",
-		"libexpat.so.1",
-		"libfontconfig.so.1",
-		"libfreetype.so.6",
-		"libgcc_s.so.1",
-		"libgcc_s.so.1(GCC_4.0.0)",
-		"libgcc_s.so.1(GLIBC_2.0)",
-		"libgdk-x11-2.0.so.0",
-		"libgdk_pixbuf-2.0.so.0",
-		"libgio-2.0.so.0",
-		"libglib-2.0.so.0",
-		"libgmodule-2.0.so.0",
-		"libgobject-2.0.so.0",
-		"libgtk-3.so.0",
-		"libm.so.6",
-		"libm.so.6(GLIBC_2.0)",
-		"libm.so.6(GLIBC_2.1)",
-		"libnspr4.so",
-		"libnss3.so",
-		"libnssutil3.so",
-		"libpango-1.0.so.0",
-		"libpangocairo-1.0.so.0",
-		"libpthread.so.0",
-		"libpthread.so.0(GLIBC_2.0)",
-		"libpthread.so.0(GLIBC_2.1)",
-		"libpthread.so.0(GLIBC_2.2)",
-		"libpthread.so.0(GLIBC_2.2.3)",
-		"libpthread.so.0(GLIBC_2.3.2)",
-		"libpthread.so.0(GLIBC_2.3.3)",
-		"librt.so.1",
-		"librt.so.1(GLIBC_2.2)",
-		"libsmime3.so",
-		"libstdc++.so.6",
-		"libstdc++.so.6(GLIBCXX_3.4)",
-		"libstdc++.so.6(GLIBCXX_3.4.10)",
-		"libstdc++.so.6(GLIBCXX_3.4.11)",
-		"libstdc++.so.6(GLIBCXX_3.4.14)",
-		"libstdc++.so.6(GLIBCXX_3.4.15)",
-		"libstdc++.so.6(GLIBCXX_3.4.9)",
-		"libxcb.so.1",
-		"libxkbfile.so.1",
-		"libsecret-1.so.0"
 	]
 }

resources/linux/snap/snapcraft.yaml

@@ -51,6 +51,7 @@ apps:
   @@NAME@@:
     command: electron-launch $SNAP/usr/share/@@NAME@@/bin/@@NAME@@
     desktop: usr/share/applications/@@NAME@@.desktop
+    common-id: @@NAME@@.desktop
     environment:
       DISABLE_WAYLAND: 1
       GSETTINGS_SCHEMA_DIR: $SNAP/usr/share/glib-2.0/schemas

resources/win32/bin/code.sh

@@ -6,12 +6,23 @@ COMMIT="@@COMMIT@@"
 APP_NAME="@@APPNAME@@"
 QUALITY="@@QUALITY@@"
 NAME="@@NAME@@"
+DATAFOLDER="@@DATAFOLDER@@"
 VSCODE_PATH="$(dirname "$(dirname "$(realpath "$0")")")"
 ELECTRON="$VSCODE_PATH/$NAME.exe"
 if grep -qi Microsoft /proc/version; then
 	# in a wsl shell
-	WSL_BUILD=$(uname -r | sed -E 's/^.+-([0-9]+)-[Mm]icrosoft/\1/')
-	if [ $WSL_BUILD -ge 17063 ] 2> /dev/null; then
+	if ! [ -z "$WSL_DISTRO_NAME" ]; then
+		# $WSL_DISTRO_NAME is available since WSL builds 18362, also for WSL2
+		WSL_BUILD=18362
+	else
+		WSL_BUILD=$(uname -r | sed -E 's/^.+-([0-9]+)-Microsoft/\1/')
+		if [ -z "$WSL_BUILD" ]; then
+			WSL_BUILD=0
+		fi
+	fi
+
+	if [ $WSL_BUILD -ge 17063 ]; then
+		# $WSL_DISTRO_NAME is available since WSL builds 18362, also for WSL2
 		# WSLPATH is available since WSL build 17046
 		# WSLENV is available since WSL build 17063
 		export WSLENV=ELECTRON_RUN_AS_NODE/w:$WSLENV
@@ -26,7 +37,7 @@ if grep -qi Microsoft /proc/version; then
 			# replace \r\n with \n in WSL_EXT_WLOC
 			WSL_CODE=$(wslpath -u "${WSL_EXT_WLOC%%[[:cntrl:]]}")/scripts/wslCode.sh
 			WIN_CODE_CMD=$(wslpath -w "$VSCODE_PATH/bin/$APP_NAME.cmd")
-			"$WSL_CODE" $COMMIT $QUALITY "$WIN_CODE_CMD" "$APP_NAME" "$@"
+			"$WSL_CODE" "$COMMIT" "$QUALITY" "$WIN_CODE_CMD" "$APP_NAME" "$DATAFOLDER" "$@"
 			exit $?
 		else
 			CLI=$(wslpath -m "$VSCODE_PATH/resources/app/out/cli.js")