VS Code merge to df8fe74bd55313de0dd2303bc47a4aab0ca56b0e (#17979)

* Merge from vscode 504f934659740e9d41501cad9f162b54d7745ad9

* delete unused folders

* distro

* Bump build node version

* update chokidar

* FIx hygiene errors

* distro

* Fix extension lint issues

* Remove strict-vscode

* Add copyright header exemptions

* Bump vscode-extension-telemetry to fix webpacking issue with zone.js

* distro

* Fix failing tests (revert marked.js back to current one until we decide to update)

* Skip searchmodel test

* Fix mac build

* temp debug script loading

* Try disabling coverage

* log error too

* Revert "log error too"

This reverts commit af0183e5d4ab458fdf44b88fbfab9908d090526f.

* Revert "temp debug script loading"

This reverts commit 3d687d541c76db2c5b55626c78ae448d3c25089c.

* Add comments explaining coverage disabling

* Fix ansi_up loading issue

* Merge latest from ads

* Use newer option

* Fix compile

* add debug logging warn

* Always log stack

* log more

* undo debug

* Update to use correct base path (+cleanup)

* distro

* fix compile errors

* Remove strict-vscode

* Fix sql editors not showing

* Show db dropdown input & fix styling

* Fix more info in gallery

* Fix gallery asset requests

* Delete unused workflow

* Fix tapable resolutions for smoke test compile error

* Fix smoke compile

* Disable crash reporting

* Disable interactive

Co-authored-by: ADS Merger <karlb@microsoft.com>

src/vs/platform/environment/node/argv.ts

@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as minimist from 'minimist';
-import { localize } from 'vs/nls';
 import { isWindows } from 'vs/base/common/platform';
+import { localize } from 'vs/nls';
 import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
 
 /**
@@ -65,6 +65,7 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
 	'status': { type: 'boolean', alias: 's', cat: 't', description: localize('status', "Print process usage and diagnostics information.") },
 	'prof-startup': { type: 'boolean', cat: 't', description: localize('prof-startup', "Run CPU profiler during startup.") },
 	'prof-append-timers': { type: 'string' },
+	'no-cached-data': { type: 'boolean' },
 	'prof-startup-prefix': { type: 'string' },
 	'prof-v8-extensions': { type: 'boolean' },
 	'disable-extensions': { type: 'boolean', deprecates: 'disableExtensions', cat: 't', description: localize('disableExtensions', "Disable all installed extensions.") },
@@ -94,6 +95,7 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
 	'driver': { type: 'string' },
 	'logExtensionHostCommunication': { type: 'boolean' },
 	'skip-release-notes': { type: 'boolean' },
+	'skip-welcome': { type: 'boolean' },
 	'disable-telemetry': { type: 'boolean' },
 	'disable-updates': { type: 'boolean' },
 	'disable-keytar': { type: 'boolean' },
@@ -130,6 +132,12 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
 
 	// chromium flags
 	'no-proxy-server': { type: 'boolean' },
+	// Minimist incorrectly parses keys that start with `--no`
+	// https://github.com/substack/minimist/blob/aeb3e27dae0412de5c0494e9563a5f10c82cc7a9/index.js#L118-L121
+	// If --no-sandbox is passed via cli wrapper it will be treated as --sandbox which is incorrect, we use
+	// the alias here to make sure --no-sandbox is always respected.
+	// For https://github.com/microsoft/vscode/issues/128279
+	'no-sandbox': { type: 'boolean', alias: 'sandbox' },
 	'proxy-server': { type: 'string' },
 	'proxy-bypass-list': { type: 'string' },
 	'proxy-pac-url': { type: 'string' },

src/vs/platform/environment/node/argvHelper.ts

@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { localize } from 'vs/nls';
-import { MIN_MAX_MEMORY_SIZE_MB } from 'vs/platform/files/common/files';
-import { parseArgs, ErrorReporter, OPTIONS } from 'vs/platform/environment/node/argv';
-import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
 import { IProcessEnvironment } from 'vs/base/common/platform';
+import { localize } from 'vs/nls';
+import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
+import { ErrorReporter, OPTIONS, parseArgs } from 'vs/platform/environment/node/argv';
+import { MIN_MAX_MEMORY_SIZE_MB } from 'vs/platform/files/common/files';
 
 function parseAndValidate(cmdLineArgs: string[], reportWarnings: boolean): NativeParsedArgs {
 	const errorReporter: ErrorReporter = {

src/vs/platform/environment/node/environmentService.ts

@@ -5,8 +5,8 @@
 
 import { homedir, tmpdir } from 'os';
 import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
-import { getUserDataPath } from 'vs/platform/environment/node/userDataPath';
 import { AbstractNativeEnvironmentService } from 'vs/platform/environment/common/environmentService';
+import { getUserDataPath } from 'vs/platform/environment/node/userDataPath';
 import { IProductService } from 'vs/platform/product/common/productService';
 
 export class NativeEnvironmentService extends AbstractNativeEnvironmentService {

src/vs/platform/environment/node/shellEnv.ts

@@ -3,15 +3,17 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as path from 'path';
 import { spawn } from 'child_process';
-import { generateUuid } from 'vs/base/common/uuid';
+import * as path from 'path';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
+import { toErrorMessage } from 'vs/base/common/errorMessage';
+import { canceled, isPromiseCanceledError } from 'vs/base/common/errors';
 import { IProcessEnvironment, isWindows, OS } from 'vs/base/common/platform';
-import { ILogService } from 'vs/platform/log/common/log';
+import { generateUuid } from 'vs/base/common/uuid';
+import { getSystemShell } from 'vs/base/node/shell';
 import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
 import { isLaunchedFromCli } from 'vs/platform/environment/node/argvHelper';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { getSystemShell } from 'vs/base/node/shell';
+import { ILogService } from 'vs/platform/log/common/log';
 
 /**
  * We need to get the environment from a user's shell.
@@ -49,8 +51,37 @@ export async function resolveShellEnv(logService: ILogService, args: NativeParse
 			logService.trace('resolveShellEnv(): running (macOS/Linux)');
 		}
 
+		// Call this only once and cache the promise for
+		// subsequent calls since this operation can be
+		// expensive (spawns a process).
 		if (!unixShellEnvPromise) {
-			unixShellEnvPromise = doResolveUnixShellEnv(logService);
+			unixShellEnvPromise = new Promise(async resolve => {
+				const cts = new CancellationTokenSource();
+
+				// Give up resolving shell env after 10 seconds
+				const timeout = setTimeout(() => {
+					logService.error(`[resolve shell env] Could not resolve shell environment within 10 seconds. Proceeding without shell environment...`);
+
+					cts.dispose(true);
+					resolve({});
+				}, 10000);
+
+				// Resolve shell env and handle errors
+				try {
+					const shellEnv = await doResolveUnixShellEnv(logService, cts.token);
+
+					resolve(shellEnv);
+				} catch (error) {
+					if (!isPromiseCanceledError(error)) {
+						logService.error(`[resolve shell env] Unable to resolve shell environment (${error}). Proceeding without shell environment...`);
+					}
+
+					resolve({});
+				} finally {
+					clearTimeout(timeout);
+					cts.dispose();
+				}
+			});
 		}
 
 		return unixShellEnvPromise;
@@ -59,7 +90,7 @@ export async function resolveShellEnv(logService: ILogService, args: NativeParse
 
 let unixShellEnvPromise: Promise<typeof process.env> | undefined = undefined;
 
-async function doResolveUnixShellEnv(logService: ILogService): Promise<typeof process.env> {
+async function doResolveUnixShellEnv(logService: ILogService, token: CancellationToken): Promise<typeof process.env> {
 	const promise = new Promise<typeof process.env>(async (resolve, reject) => {
 		const runAsNode = process.env['ELECTRON_RUN_AS_NODE'];
 		logService.trace('getUnixShellEnvironment#runAsNode', runAsNode);
@@ -80,6 +111,10 @@ async function doResolveUnixShellEnv(logService: ILogService): Promise<typeof pr
 		const systemShellUnix = await getSystemShell(OS, env);
 		logService.trace('getUnixShellEnvironment#shell', systemShellUnix);
 
+		if (token.isCancellationRequested) {
+			return reject(canceled);
+		}
+
 		// handle popular non-POSIX shells
 		const name = path.basename(systemShellUnix);
 		let command: string, shellArgs: Array<string>;
@@ -101,6 +136,12 @@ async function doResolveUnixShellEnv(logService: ILogService): Promise<typeof pr
 			env
 		});
 
+		token.onCancellationRequested(() => {
+			child.kill();
+
+			return reject(canceled);
+		});
+
 		child.on('error', err => {
 			logService.error('getUnixShellEnvironment#errorChildProcess', toErrorMessage(err));
 			resolve({});

src/vs/platform/environment/node/stdin.ts

@@ -5,9 +5,9 @@
 /**
  * This code is also used by standalone cli's. Avoid adding dependencies to keep the size of the cli small.
  */
-import * as paths from 'vs/base/common/path';
 import * as fs from 'fs';
 import * as os from 'os';
+import * as paths from 'vs/base/common/path';
 import { resolveTerminalEncoding } from 'vs/base/node/terminalEncoding';
 
 export function hasStdinWithoutTty() {
@@ -36,7 +36,7 @@ export function stdinDataListener(durationinMs: number): Promise<boolean> {
 }
 
 export function getStdinFilePath(): string {
-	return paths.join(os.tmpdir(), `code-stdin-${Math.random().toString(36).replace(/[^a-z]+/g, '').substr(0, 3)}.txt`);
+	return paths.join(os.tmpdir(), `code-stdin-${Math.random().toString(36).replace(/[^a-z]+/g, '').substr(0, 3)}`);
 }
 
 export async function readFromStdin(targetPath: string, verbose: boolean): Promise<void> {

src/vs/platform/environment/node/userDataPath.d.ts

@@ -8,7 +8,7 @@ import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
 /**
  * Returns the user data path to use with some rules:
  * - respect portable mode
- * - respect --user-data-dir CLI argument
  * - respect VSCODE_APPDATA environment variable
+ * - respect --user-data-dir CLI argument
  */
 export function getUserDataPath(args: NativeParsedArgs): string;

src/vs/platform/environment/node/userDataPath.js

@@ -54,38 +54,42 @@
 				return path.join(portablePath, 'user-data');
 			}
 
-			// 2. Support explicit --user-data-dir
+			// 2. Support global VSCODE_APPDATA environment variable
+			let appDataPath = process.env['VSCODE_APPDATA'];
+			if (appDataPath) {
+				return path.join(appDataPath, productName);
+			}
+
+			// With Electron>=13 --user-data-dir switch will be propagated to
+			// all processes https://github.com/electron/electron/blob/1897b14af36a02e9aa7e4d814159303441548251/shell/browser/electron_browser_client.cc#L546-L553
+			// Check VSCODE_PORTABLE and VSCODE_APPDATA before this case to get correct values.
+			// 3. Support explicit --user-data-dir
 			const cliPath = cliArgs['user-data-dir'];
 			if (cliPath) {
 				return cliPath;
 			}
 
-			// 3. Support global VSCODE_APPDATA environment variable
-			let appDataPath = process.env['VSCODE_APPDATA'];
-
 			// 4. Otherwise check per platform
-			if (!appDataPath) {
-				switch (process.platform) {
-					case 'win32':
-						appDataPath = process.env['APPDATA'];
-						if (!appDataPath) {
-							const userProfile = process.env['USERPROFILE'];
-							if (typeof userProfile !== 'string') {
-								throw new Error('Windows: Unexpected undefined %USERPROFILE% environment variable');
-							}
-
-							appDataPath = path.join(userProfile, 'AppData', 'Roaming');
+			switch (process.platform) {
+				case 'win32':
+					appDataPath = process.env['APPDATA'];
+					if (!appDataPath) {
+						const userProfile = process.env['USERPROFILE'];
+						if (typeof userProfile !== 'string') {
+							throw new Error('Windows: Unexpected undefined %USERPROFILE% environment variable');
 						}
-						break;
-					case 'darwin':
-						appDataPath = path.join(os.homedir(), 'Library', 'Application Support');
-						break;
-					case 'linux':
-						appDataPath = process.env['XDG_CONFIG_HOME'] || path.join(os.homedir(), '.config');
-						break;
-					default:
-						throw new Error('Platform not supported');
-				}
+
+						appDataPath = path.join(userProfile, 'AppData', 'Roaming');
+					}
+					break;
+				case 'darwin':
+					appDataPath = path.join(os.homedir(), 'Library', 'Application Support');
+					break;
+				case 'linux':
+					appDataPath = process.env['XDG_CONFIG_HOME'] || path.join(os.homedir(), '.config');
+					break;
+				default:
+					throw new Error('Platform not supported');
 			}
 
 			return path.join(appDataPath, 'azuredatastudio'); // {{SQL CARBON EDIT}} hard-code Azure Data Studio