chore(vscode): update to 1.55.2

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

@@ -85,6 +85,7 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
 
 	'locate-extension': { type: 'string[]' },
 	'extensionDevelopmentPath': { type: 'string[]' },
+	'extensionDevelopmentKind': { type: 'string[]' },
 	'extensionTestsPath': { type: 'string' },
 	'debugId': { type: 'string' },
 	'debugRenderer': { type: 'boolean' },
@@ -263,7 +264,7 @@ export function formatOptions(options: OptionDescriptions<any>, columns: number)
 }
 
 function indent(count: number): string {
-	return (<any>' ').repeat(count);
+	return ' '.repeat(count);
 }
 
 function wrapText(text: string, columns: number): string[] {

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

@@ -4,40 +4,21 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { homedir, tmpdir } from 'os';
-import product from 'vs/platform/product/common/product';
-import { IDebugParams, IExtensionHostDebugParams, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
 import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
-import { getDefaultUserDataPath } from 'vs/base/node/userDataPath';
-import { dirname, join, normalize, resolve } from 'vs/base/common/path';
-import { joinPath } from 'vs/base/common/resources';
-import { memoize } from 'vs/base/common/decorators';
-import { toLocalISOString } from 'vs/base/common/date';
-import { FileAccess } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
+import { getUserDataPath } from 'vs/platform/environment/node/userDataPath';
+import { AbstractNativeEnvironmentService } from 'vs/platform/environment/common/environmentService';
+import { IProductService } from 'vs/platform/product/common/productService';
 
-export class NativeEnvironmentService implements INativeEnvironmentService {
+export class NativeEnvironmentService extends AbstractNativeEnvironmentService {
 
-	declare readonly _serviceBrand: undefined;
-
-	get args(): NativeParsedArgs { return this._args; }
-
-	@memoize
-	get appRoot(): string { return dirname(FileAccess.asFileUri('', require).fsPath); }
-
-	readonly logsPath: string;
-
-	@memoize
-	get userHome(): URI { return URI.file(homedir()); }
-
-	@memoize
-	get userDataPath(): string {
-		const vscodePortable = process.env['VSCODE_PORTABLE'];
-		if (vscodePortable) {
-			return join(vscodePortable, 'user-data');
-		}
-
-		return parseUserDataDir(this._args, process);
+	constructor(args: NativeParsedArgs, productService: IProductService) {
+		super(args, {
+			homeDir: homedir(),
+			tmpDir: tmpdir(),
+			userDataDir: getUserDataPath(args)
+		}, productService);
 	}
+<<<<<<< HEAD
 
 	@memoize
 	get appSettingsHome(): URI { return URI.file(join(this.userDataPath, 'User')); }
@@ -249,4 +230,6 @@ export function parsePathArg(arg: string | undefined, process: NodeJS.Process):
 
 export function parseUserDataDir(args: NativeParsedArgs, process: NodeJS.Process): string {
 	return parsePathArg(args['user-data-dir'], process) || resolve(getDefaultUserDataPath());
+=======
+>>>>>>> 801aed93200dc0ccf325a09089c911e8e2b612d0
 }

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

@@ -79,7 +79,9 @@ async function doResolveUnixShellEnv(logService: ILogService): Promise<typeof pr
 		logService.trace('getUnixShellEnvironment#env', env);
 		logService.trace('getUnixShellEnvironment#spawn', command);
 
-		const systemShellUnix = await getSystemShell(platform);
+		const systemShellUnix = await getSystemShell(platform, env);
+		logService.trace('getUnixShellEnvironment#shell', systemShellUnix);
+
 		const child = spawn(systemShellUnix, ['-ilc', command], {
 			detached: true,
 			stdio: ['ignore', 'pipe', process.stderr],

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

@@ -0,0 +1,14 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+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
+ */
+export function getUserDataPath(args: NativeParsedArgs): string;

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

@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/// <reference path="../../../../typings/require.d.ts" />
+
+//@ts-check
+(function () {
+	'use strict';
+
+	/**
+	 * @param {typeof import('path')} path
+	 * @param {typeof import('os')} os
+	 * @param {string} productName
+	 */
+	function factory(path, os, productName) {
+
+		/**
+		 * @param {import('../../environment/common/argv').NativeParsedArgs} cliArgs
+		 *
+		 * @returns {string}
+		 */
+		function getUserDataPath(cliArgs) {
+			return path.resolve(doGetUserDataPath(cliArgs));
+		}
+
+		/**
+		 * @param {import('../../environment/common/argv').NativeParsedArgs} cliArgs
+		 *
+		 * @returns {string}
+		 */
+		function doGetUserDataPath(cliArgs) {
+
+			// 1. Support portable mode
+			const portablePath = process.env['VSCODE_PORTABLE'];
+			if (portablePath) {
+				return path.join(portablePath, 'user-data');
+			}
+
+			// 2. 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');
+						}
+						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, productName);
+		}
+
+		return {
+			getUserDataPath
+		};
+	}
+
+	if (typeof define === 'function') {
+		define(['require', 'path', 'os', 'vs/base/common/network', 'vs/base/common/resources'], function (require, /** @type {typeof import('path')} */ path, /** @type {typeof import('os')} */ os, /** @type {typeof import('../../../base/common/network')} */ network, /** @type {typeof import("../../../base/common/resources")} */ resources) {
+			const rootPath = resources.dirname(network.FileAccess.asFileUri('', require));
+			const pkg = require.__$__nodeRequire(resources.joinPath(rootPath, 'package.json').fsPath);
+
+			return factory(path, os, pkg.name);
+		}); // amd
+	} else if (typeof module === 'object' && typeof module.exports === 'object') {
+		const pkg = require('../../../../../package.json');
+		const path = require('path');
+		const os = require('os');
+
+		module.exports = factory(path, os, pkg.name); // commonjs
+	} else {
+		throw new Error('Unknown context');
+	}
+}());