fix(vscode): redo extra extension paths

Author: Akash Satheesan

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

@@ -39,6 +39,8 @@ export interface NativeParsedArgs {
 	'extensions-dir'?: string;
 	'extensions-download-dir'?: string;
 	'builtin-extensions-dir'?: string;
+	'extra-extensions-dir'?: string[]; // NOTE@coder: added extra extensions dir
+	'extra-builtin-extensions-dir'?: string[]; // NOTE@coder: added extra builtin extensions dir
 	extensionDevelopmentPath?: string[]; // undefined or array of 1 or more local paths or URIs
 	extensionTestsPath?: string; // either a local path or a URI
 	extensionDevelopmentKind?: string[];

lib/vscode/src/vs/platform/environment/common/environment.ts

@@ -124,6 +124,9 @@ export interface INativeEnvironmentService extends IEnvironmentService {
 	extensionsPath: string;
 	extensionsDownloadPath: string;
 	builtinExtensionsPath: string;
+	// NOTE@coder: add extraExtensionPaths/extraBuiltinExtensionPaths
+	extraExtensionPaths: string[];
+	extraBuiltinExtensionPaths: string[];
 
 	// --- smoke test support
 	driverHandle?: string;

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

@@ -15,6 +15,24 @@ import { URI } from 'vs/base/common/uri';
 import { ExtensionKind } from 'vs/platform/extensions/common/extensions';
 import { env } from 'vs/base/common/process';
 
+// NOTE@coder: add parsePathArg
+function parsePathArg(arg: string | undefined, process: NodeJS.Process): string | undefined {
+	if (!arg) {
+		return undefined;
+	}
+
+	// Determine if the arg is relative or absolute, if relative use the original CWD
+	// (VSCODE_CWD), not the potentially overridden one (process.cwd()).
+	const resolved = resolve(arg);
+
+	if (normalize(arg) === resolved) {
+		return resolved;
+	}
+
+	return resolve(process.env['VSCODE_CWD'] || process.cwd(), arg);
+}
+
+
 export interface INativeEnvironmentPaths {
 
 	/**
@@ -157,6 +175,19 @@ export abstract class AbstractNativeEnvironmentService implements INativeEnviron
 		return joinPath(this.userHome, this.productService.dataFolderName, 'extensions').fsPath;
 	}
 
+	/**
+	 * NOTE@coder: add extraExtensionPaths and extraBuiltinExtensionPaths
+	 */
+	@memoize
+	get extraExtensionPaths(): string[] {
+		return (this._args['extra-extensions-dir'] || []).map((p) => <string>parsePathArg(p, process));
+	}
+
+	@memoize
+	get extraBuiltinExtensionPaths(): string[] {
+		return (this._args['extra-builtin-extensions-dir'] || []).map((p) => <string>parsePathArg(p, process));
+	}
+ 
 	@memoize
 	get extensionDevelopmentLocationURI(): URI[] | undefined {
 		const extensionDevelopmentPaths = this.args.extensionDevelopmentPath;

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

@@ -52,6 +52,9 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
 	'extensions-dir': { type: 'string', deprecates: 'extensionHomePath', cat: 'e', args: 'dir', description: localize('extensionHomePath', "Set the root path for extensions.") },
 	'extensions-download-dir': { type: 'string' },
 	'builtin-extensions-dir': { type: 'string' },
+	// NOTE@coder: add extra-extensions-dir and extra-builtin-extensions-dir
+	'extra-extensions-dir': { type: 'string[]', cat: 'o', description: 'Path to an extra user extension directory.' },
+	'extra-builtin-extensions-dir': { type: 'string[]', cat: 'o', description: 'Path to an extra builtin extension directory.' },
 	'list-extensions': { type: 'boolean', cat: 'e', description: localize('listExtensions', "List the installed extensions.") },
 	'show-versions': { type: 'boolean', cat: 'e', description: localize('showVersions', "Show versions of installed extensions, when using --list-extensions.") },
 	'category': { type: 'string', cat: 'e', description: localize('category', "Filters installed extensions by provided category, when using --list-extensions."), args: 'category' },

lib/vscode/src/vs/platform/extensionManagement/node/extensionsScanner.ts

@@ -97,7 +97,7 @@ export class ExtensionsScanner extends Disposable {
 	}
 
 	async scanAllUserExtensions(): Promise<ILocalExtension[]> {
-		return this.scanExtensionsInDir(this.extensionsPath, ExtensionType.User);
+		return this.scanExtensionsInDirs([this.extensionsPath, ...this.environmentService.extraExtensionPaths], ExtensionType.User);
 	}
 
 	async extractUserExtension(identifierWithVersion: ExtensionIdentifierWithVersion, zipPath: string, token: CancellationToken): Promise<ILocalExtension> {
@@ -314,7 +314,7 @@ export class ExtensionsScanner extends Disposable {
 	}
 
 	private async scanDefaultSystemExtensions(): Promise<ILocalExtension[]> {
-		const result = await this.scanExtensionsInDir(this.systemExtensionsPath, ExtensionType.System);
+		const result = await this.scanExtensionsInDirs([this.systemExtensionsPath, ...this.environmentService.extraBuiltinExtensionPaths], ExtensionType.System);
 		this.logService.trace('Scanned system extensions:', result.length);
 		return result;
 	}
@@ -418,4 +418,9 @@ export class ExtensionsScanner extends Disposable {
 			}
 		});
 	}
+
+	private async scanExtensionsInDirs(dirs: string[], type: ExtensionType): Promise<ILocalExtension[]>{
+		const results = await Promise.all(dirs.map((path) => this.scanExtensionsInDir(path, type)));
+		return results.reduce((flat, current) => flat.concat(current), []);
+	}
 }