mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-01-31 01:25:38 -05:00
Merge from vscode 4d91d96e5e121b38d33508cdef17868bab255eae
This commit is contained in:
committed by
AzureDataStudio
parent
a971aee5bd
commit
5e7071e466
@@ -36,7 +36,7 @@ export interface INativeEnvironmentService extends IEnvironmentService {
|
||||
installSourcePath: string;
|
||||
|
||||
extensionsPath?: string;
|
||||
extensionsDownloadPath?: string;
|
||||
extensionsDownloadPath: string;
|
||||
builtinExtensionsPath: string;
|
||||
|
||||
globalStorageHome: string;
|
||||
@@ -50,7 +50,7 @@ export interface INativeEnvironmentService extends IEnvironmentService {
|
||||
|
||||
export class EnvironmentService implements INativeEnvironmentService {
|
||||
|
||||
_serviceBrand: undefined;
|
||||
declare readonly _serviceBrand: undefined;
|
||||
|
||||
get args(): ParsedArgs { return this._args; }
|
||||
|
||||
@@ -151,8 +151,13 @@ export class EnvironmentService implements INativeEnvironmentService {
|
||||
}
|
||||
}
|
||||
|
||||
get extensionsDownloadPath(): string | undefined {
|
||||
return parsePathArg(this._args['extensions-download-dir'], process);
|
||||
get extensionsDownloadPath(): string {
|
||||
const fromArgs = parsePathArg(this._args['extensions-download-dir'], process);
|
||||
if (fromArgs) {
|
||||
return fromArgs;
|
||||
} else {
|
||||
return path.join(this.userDataPath, 'CachedExtensionVSIXs');
|
||||
}
|
||||
}
|
||||
|
||||
@memoize
|
||||
|
||||
Reference in New Issue
Block a user