Skip to content

Commit a8a4e37

Browse files
jriekenjrieken
committed
add workspaceStorageHome and use that in extHostStoragePaths, remove appSettingsHome, microsoft#101857 
1 parent 089e7a5 commit a8a4e37

9 files changed

Lines changed: 11 additions & 10 deletions

File tree

‎src/vs/platform/remote/common/remoteAgentEnvironment.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ export interface IRemoteAgentEnvironment {
1111
pid: number;
1212
connectionToken: string;
1313
appRoot: URI;
14-
appSettingsHome: URI;
1514
settingsPath: URI;
1615
logsPath: URI;
1716
extensionsPath: URI;
1817
extensionHostLogsPath: URI;
1918
globalStorageHome: URI;
19+
workspaceStorageHome: URI;
2020
userHome: URI;
2121
extensions: IExtensionDescription[];
2222
os: OperatingSystem;

‎src/vs/workbench/api/common/extHost.protocol.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ export interface IEnvironment {
6464
appRoot?: URI;
6565
appLanguage: string;
6666
appUriScheme: string;
67-
appSettingsHome?: URI;
6867
extensionDevelopmentLocationURI?: URI[];
6968
extensionTestsLocationURI?: URI;
7069
globalStorageHome: URI;
70+
workspaceStorageHome: URI;
7171
webviewResourceRoot: string;
7272
webviewCspSource: string;
7373
useHostProxy?: boolean;

‎src/vs/workbench/services/extensions/browser/extensionService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ export class ExtensionService extends AbstractExtensionService implements IExten
140140
connectionData: this._remoteAuthorityResolverService.getConnectionData(remoteAgentConnection.remoteAuthority),
141141
pid: remoteEnv.pid,
142142
appRoot: remoteEnv.appRoot,
143-
appSettingsHome: remoteEnv.appSettingsHome,
144143
extensionHostLogsPath: remoteEnv.extensionHostLogsPath,
145144
globalStorageHome: remoteEnv.globalStorageHome,
145+
workspaceStorageHome: remoteEnv.workspaceStorageHome,
146146
extensions: remoteEnv.extensions,
147147
allExtensions: remoteEnv.extensions.concat(localExtensions)
148148
};

‎src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ export class WebWorkerExtensionHost implements IExtensionHost {
153153
extensionDevelopmentLocationURI: this._environmentService.extensionDevelopmentLocationURI,
154154
extensionTestsLocationURI: this._environmentService.extensionTestsLocationURI,
155155
globalStorageHome: this._environmentService.globalStorageHome,
156+
workspaceStorageHome: this._environmentService.workspaceStorageHome,
156157
webviewResourceRoot: this._environmentService.webviewResourceRoot,
157158
webviewCspSource: this._environmentService.webviewCspSource,
158159
},

‎src/vs/workbench/services/extensions/common/extensionHostMain.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,13 @@ export class ExtensionHostMain {
132132
private static _transform(initData: IInitData, rpcProtocol: RPCProtocol): IInitData {
133133
initData.extensions.forEach((ext) => (<any>ext).extensionLocation = URI.revive(rpcProtocol.transformIncomingURIs(ext.extensionLocation)));
134134
initData.environment.appRoot = URI.revive(rpcProtocol.transformIncomingURIs(initData.environment.appRoot));
135-
initData.environment.appSettingsHome = URI.revive(rpcProtocol.transformIncomingURIs(initData.environment.appSettingsHome));
136135
const extDevLocs = initData.environment.extensionDevelopmentLocationURI;
137136
if (extDevLocs) {
138137
initData.environment.extensionDevelopmentLocationURI = extDevLocs.map(url => URI.revive(rpcProtocol.transformIncomingURIs(url)));
139138
}
140139
initData.environment.extensionTestsLocationURI = URI.revive(rpcProtocol.transformIncomingURIs(initData.environment.extensionTestsLocationURI));
141140
initData.environment.globalStorageHome = URI.revive(rpcProtocol.transformIncomingURIs(initData.environment.globalStorageHome));
141+
initData.environment.workspaceStorageHome = URI.revive(rpcProtocol.transformIncomingURIs(initData.environment.workspaceStorageHome));
142142
initData.logsLocation = URI.revive(rpcProtocol.transformIncomingURIs(initData.logsLocation));
143143
initData.logFile = URI.revive(rpcProtocol.transformIncomingURIs(initData.logFile));
144144
initData.workspace = rpcProtocol.transformIncomingURIs(initData.workspace);

‎src/vs/workbench/services/extensions/common/remoteExtensionHost.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ export interface IRemoteExtensionHostInitData {
3636
readonly connectionData: IRemoteConnectionData | null;
3737
readonly pid: number;
3838
readonly appRoot: URI;
39-
readonly appSettingsHome: URI;
4039
readonly extensionHostLogsPath: URI;
4140
readonly globalStorageHome: URI;
41+
readonly workspaceStorageHome: URI;
4242
readonly extensions: IExtensionDescription[];
4343
readonly allExtensions: IExtensionDescription[];
4444
}
@@ -214,13 +214,13 @@ export class RemoteExtensionHost extends Disposable implements IExtensionHost {
214214
environment: {
215215
isExtensionDevelopmentDebug,
216216
appRoot: remoteInitData.appRoot,
217-
appSettingsHome: remoteInitData.appSettingsHome,
218217
appName: this._productService.nameLong,
219218
appUriScheme: this._productService.urlProtocol,
220219
appLanguage: platform.language,
221220
extensionDevelopmentLocationURI: this._environmentService.extensionDevelopmentLocationURI,
222221
extensionTestsLocationURI: this._environmentService.extensionTestsLocationURI,
223222
globalStorageHome: remoteInitData.globalStorageHome,
223+
workspaceStorageHome: remoteInitData.workspaceStorageHome,
224224
webviewResourceRoot: this._environmentService.webviewResourceRoot,
225225
webviewCspSource: this._environmentService.webviewCspSource,
226226
},

‎src/vs/workbench/services/extensions/electron-browser/extensionService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,9 +575,9 @@ export class ExtensionService extends AbstractExtensionService implements IExten
575575
connectionData: this._remoteAuthorityResolverService.getConnectionData(remoteAuthority),
576576
pid: remoteEnv.pid,
577577
appRoot: remoteEnv.appRoot,
578-
appSettingsHome: remoteEnv.appSettingsHome,
579578
extensionHostLogsPath: remoteEnv.extensionHostLogsPath,
580579
globalStorageHome: remoteEnv.globalStorageHome,
580+
workspaceStorageHome: remoteEnv.workspaceStorageHome,
581581
extensions: remoteExtensions,
582582
allExtensions: this._registry.getAllExtensionDescriptions(),
583583
});

‎src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,13 +430,13 @@ export class LocalProcessExtensionHost implements IExtensionHost {
430430
environment: {
431431
isExtensionDevelopmentDebug: this._isExtensionDevDebug,
432432
appRoot: this._environmentService.appRoot ? URI.file(this._environmentService.appRoot) : undefined,
433-
appSettingsHome: this._environmentService.appSettingsHome ? this._environmentService.appSettingsHome : undefined,
434433
appName: this._productService.nameLong,
435434
appUriScheme: this._productService.urlProtocol,
436435
appLanguage: platform.language,
437436
extensionDevelopmentLocationURI: this._environmentService.extensionDevelopmentLocationURI,
438437
extensionTestsLocationURI: this._environmentService.extensionTestsLocationURI,
439438
globalStorageHome: this._environmentService.globalStorageHome,
439+
workspaceStorageHome: this._environmentService.workspaceStorageHome,
440440
webviewResourceRoot: this._environmentService.webviewResourceRoot,
441441
webviewCspSource: this._environmentService.webviewCspSource,
442442
},

‎src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ export interface IRemoteAgentEnvironmentDTO {
2121
pid: number;
2222
connectionToken: string;
2323
appRoot: UriComponents;
24-
appSettingsHome: UriComponents;
2524
settingsPath: UriComponents;
2625
logsPath: UriComponents;
2726
extensionsPath: UriComponents;
2827
extensionHostLogsPath: UriComponents;
2928
globalStorageHome: UriComponents;
29+
workspaceStorageHome: UriComponents;
3030
userHome: UriComponents;
3131
extensions: IExtensionDescription[];
3232
os: platform.OperatingSystem;
@@ -47,12 +47,12 @@ export class RemoteExtensionEnvironmentChannelClient {
4747
pid: data.pid,
4848
connectionToken: data.connectionToken,
4949
appRoot: URI.revive(data.appRoot),
50-
appSettingsHome: URI.revive(data.appSettingsHome),
5150
settingsPath: URI.revive(data.settingsPath),
5251
logsPath: URI.revive(data.logsPath),
5352
extensionsPath: URI.revive(data.extensionsPath),
5453
extensionHostLogsPath: URI.revive(data.extensionHostLogsPath),
5554
globalStorageHome: URI.revive(data.globalStorageHome),
55+
workspaceStorageHome: URI.revive(data.workspaceStorageHome),
5656
userHome: URI.revive(data.userHome),
5757
extensions: data.extensions.map(ext => { (<any>ext).extensionLocation = URI.revive(ext.extensionLocation); return ext; }),
5858
os: data.os

0 commit comments

Comments
 (0)