a
/
code-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix error when passing empty extra extension dir flag

This commit is contained in:
Asher 2019-08-12 14:27:11 -05:00
parent 90e8714e71
commit c11d5fe9e6
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/vscode.patch
View File

@ -234,7 +234,7 @@ index a6c9eb9d11..3f8995b727 100644
+ extraBuiltinExtensionPaths: string[]; + extraBuiltinExtensionPaths: string[];
} }
diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts
index 9373b22383..33ebcfc081 100644 index 9373b22383..a98ff4723c 100644
--- a/src/vs/platform/environment/node/environmentService.ts --- a/src/vs/platform/environment/node/environmentService.ts
+++ b/src/vs/platform/environment/node/environmentService.ts +++ b/src/vs/platform/environment/node/environmentService.ts
@@ -277,6 +277,15 @@ export class EnvironmentService implements IEnvironmentService { @@ -277,6 +277,15 @@ export class EnvironmentService implements IEnvironmentService {
@ -248,7 +248,7 @@ index 9373b22383..33ebcfc081 100644
+ return this.arrayify(this._args['extra-builtin-extensions-dir']).map((p) => <string>parsePathArg(p, process)); + return this.arrayify(this._args['extra-builtin-extensions-dir']).map((p) => <string>parsePathArg(p, process));
+ } + }
+ private arrayify<T>(arg: T | T[] = []): T[] { + private arrayify<T>(arg: T | T[] = []): T[] {
+ return (Array.isArray(arg) ? arg : [arg]); + return (Array.isArray(arg) ? arg : [arg]).filter((p) => !!p);
+ } + }
constructor(private _args: ParsedArgs, private _execPath: string) { constructor(private _args: ParsedArgs, private _execPath: string) {