From f08ce02836b8e826c6b0cf352471ef4049586a66 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Tue, 7 Jul 2020 16:01:39 +0200 Subject: [PATCH] debt - remove unused userHome from extHost env, also some todos --- src/vs/workbench/api/common/extHost.api.impl.ts | 2 +- src/vs/workbench/api/common/extHost.protocol.ts | 1 - .../services/extensions/browser/extensionService.ts | 1 - .../services/extensions/browser/webWorkerExtensionHost.ts | 5 ++--- .../services/extensions/common/extensionHostMain.ts | 1 - .../services/extensions/common/remoteExtensionHost.ts | 2 -- .../services/extensions/electron-browser/extensionService.ts | 1 - .../extensions/electron-browser/localProcessExtensionHost.ts | 1 - 8 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts index 967b210d0ae..a5d3522a8c1 100644 --- a/src/vs/workbench/api/common/extHost.api.impl.ts +++ b/src/vs/workbench/api/common/extHost.api.impl.ts @@ -266,7 +266,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I get sessionId() { return initData.telemetryInfo.sessionId; }, get language() { return initData.environment.appLanguage; }, get appName() { return initData.environment.appName; }, - get appRoot() { return initData.environment.appRoot?.fsPath ?? ''; }, + get appRoot() { return initData.environment.appRoot?.fsPath ?? ''; }, // todo@jrieken web get uriScheme() { return initData.environment.appUriScheme; }, get logLevel() { checkProposedApiEnabled(extension); diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts index bbd1e894057..4980ed479ba 100644 --- a/src/vs/workbench/api/common/extHost.protocol.ts +++ b/src/vs/workbench/api/common/extHost.protocol.ts @@ -68,7 +68,6 @@ export interface IEnvironment { extensionDevelopmentLocationURI?: URI[]; extensionTestsLocationURI?: URI; globalStorageHome: URI; - userHome: URI; webviewResourceRoot: string; webviewCspSource: string; useHostProxy?: boolean; diff --git a/src/vs/workbench/services/extensions/browser/extensionService.ts b/src/vs/workbench/services/extensions/browser/extensionService.ts index afcf8322e31..b33f73d5971 100644 --- a/src/vs/workbench/services/extensions/browser/extensionService.ts +++ b/src/vs/workbench/services/extensions/browser/extensionService.ts @@ -143,7 +143,6 @@ export class ExtensionService extends AbstractExtensionService implements IExten appSettingsHome: remoteEnv.appSettingsHome, extensionHostLogsPath: remoteEnv.extensionHostLogsPath, globalStorageHome: remoteEnv.globalStorageHome, - userHome: remoteEnv.userHome, extensions: remoteEnv.extensions, allExtensions: remoteEnv.extensions.concat(localExtensions) }; diff --git a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts index ad196030788..606ba797b08 100644 --- a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts +++ b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts @@ -146,14 +146,13 @@ export class WebWorkerExtensionHost implements IExtensionHost { version: this._productService.version, parentPid: -1, environment: { - isExtensionDevelopmentDebug: false, + isExtensionDevelopmentDebug: false, //todo@jrieken web appName: this._productService.nameLong, appUriScheme: this._productService.urlProtocol, appLanguage: platform.language, extensionDevelopmentLocationURI: this._environmentService.extensionDevelopmentLocationURI, extensionTestsLocationURI: this._environmentService.extensionTestsLocationURI, - globalStorageHome: URI.parse('fake:globalStorageHome'), //todo@joh URI.file(this._environmentService.globalStorageHome), - userHome: URI.parse('fake:userHome'), //todo@joh URI.file(this._environmentService.userHome), + globalStorageHome: URI.parse('fake:globalStorageHome'), //todo@jrieken URI.file(this._environmentService.globalStorageHome), webviewResourceRoot: this._environmentService.webviewResourceRoot, webviewCspSource: this._environmentService.webviewCspSource, }, diff --git a/src/vs/workbench/services/extensions/common/extensionHostMain.ts b/src/vs/workbench/services/extensions/common/extensionHostMain.ts index 93d9a1d107d..873170dc454 100644 --- a/src/vs/workbench/services/extensions/common/extensionHostMain.ts +++ b/src/vs/workbench/services/extensions/common/extensionHostMain.ts @@ -139,7 +139,6 @@ export class ExtensionHostMain { } initData.environment.extensionTestsLocationURI = URI.revive(rpcProtocol.transformIncomingURIs(initData.environment.extensionTestsLocationURI)); initData.environment.globalStorageHome = URI.revive(rpcProtocol.transformIncomingURIs(initData.environment.globalStorageHome)); - initData.environment.userHome = URI.revive(rpcProtocol.transformIncomingURIs(initData.environment.userHome)); initData.logsLocation = URI.revive(rpcProtocol.transformIncomingURIs(initData.logsLocation)); initData.logFile = URI.revive(rpcProtocol.transformIncomingURIs(initData.logFile)); initData.workspace = rpcProtocol.transformIncomingURIs(initData.workspace); diff --git a/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts b/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts index f91d97e80d8..33197d80108 100644 --- a/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts +++ b/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts @@ -39,7 +39,6 @@ export interface IRemoteExtensionHostInitData { readonly appSettingsHome: URI; readonly extensionHostLogsPath: URI; readonly globalStorageHome: URI; - readonly userHome: URI; readonly extensions: IExtensionDescription[]; readonly allExtensions: IExtensionDescription[]; } @@ -222,7 +221,6 @@ export class RemoteExtensionHost extends Disposable implements IExtensionHost { extensionDevelopmentLocationURI: this._environmentService.extensionDevelopmentLocationURI, extensionTestsLocationURI: this._environmentService.extensionTestsLocationURI, globalStorageHome: remoteInitData.globalStorageHome, - userHome: remoteInitData.userHome, webviewResourceRoot: this._environmentService.webviewResourceRoot, webviewCspSource: this._environmentService.webviewCspSource, }, diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts index 1438fdeabd4..2903d293aea 100644 --- a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts +++ b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts @@ -578,7 +578,6 @@ export class ExtensionService extends AbstractExtensionService implements IExten appSettingsHome: remoteEnv.appSettingsHome, extensionHostLogsPath: remoteEnv.extensionHostLogsPath, globalStorageHome: remoteEnv.globalStorageHome, - userHome: remoteEnv.userHome, extensions: remoteExtensions, allExtensions: this._registry.getAllExtensionDescriptions(), }); diff --git a/src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts b/src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts index 172a8c6817f..44ab817e4e0 100644 --- a/src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts +++ b/src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts @@ -437,7 +437,6 @@ export class LocalProcessExtensionHost implements IExtensionHost { extensionDevelopmentLocationURI: this._environmentService.extensionDevelopmentLocationURI, extensionTestsLocationURI: this._environmentService.extensionTestsLocationURI, globalStorageHome: URI.file(this._environmentService.globalStorageHome), - userHome: this._environmentService.userHome, webviewResourceRoot: this._environmentService.webviewResourceRoot, webviewCspSource: this._environmentService.webviewCspSource, }, -- GitLab