diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts index f3b72ee538f..b73cbe2cfb5 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -8191,6 +8191,11 @@ declare module 'vscode' { */ export const appRoot: string; + /** + * The environment in which the app is hosted in. i.e. 'desktop', 'codespaces', 'web'. + */ + export const appHost: string; + /** * The custom uri scheme the editor registers to in the operating system. */ diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts index 47c83cfd8e2..1fec9f34151 100644 --- a/src/vs/vscode.proposed.d.ts +++ b/src/vs/vscode.proposed.d.ts @@ -2889,17 +2889,6 @@ declare module 'vscode' { //#endregion - //#region https://github.com/microsoft/vscode/issues/129053 - - export namespace env { - /** - * The environment in which the app is embedded in. i.e. 'desktop', 'codespaces', 'web'. - */ - export const embedderIdentifier: string; - } - - //#endregion - //#region https://github.com/microsoft/vscode/issues/88716 export interface QuickPickItem { buttons?: QuickInputButton[]; diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts index bf22402b631..3568792ff6a 100644 --- a/src/vs/workbench/api/common/extHost.api.impl.ts +++ b/src/vs/workbench/api/common/extHost.api.impl.ts @@ -292,7 +292,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I get language() { return initData.environment.appLanguage; }, get appName() { return initData.environment.appName; }, get appRoot() { return initData.environment.appRoot?.fsPath ?? ''; }, - get embedderIdentifier() { return initData.environment.embedderIdentifier; }, + get appHost() { return initData.environment.appHost; }, get uriScheme() { return initData.environment.appUriScheme; }, get clipboard(): vscode.Clipboard { return extHostClipboard.value; }, get shell() { diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts index 88be737bcaf..d8a28c2000d 100644 --- a/src/vs/workbench/api/common/extHost.protocol.ts +++ b/src/vs/workbench/api/common/extHost.protocol.ts @@ -72,7 +72,7 @@ import * as search from 'vs/workbench/services/search/common/search'; export interface IEnvironment { isExtensionDevelopmentDebug: boolean; appName: string; - embedderIdentifier: string; + appHost: string; appRoot?: URI; appLanguage: string; appUriScheme: string; diff --git a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts index 5bfa3e8fb66..8dfc7052947 100644 --- a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts +++ b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts @@ -383,7 +383,7 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost environment: { isExtensionDevelopmentDebug: this._environmentService.debugRenderer, appName: this._productService.nameLong, - embedderIdentifier: this._productService.embedderIdentifier || 'web', + appHost: this._productService.embedderIdentifier || 'web', appUriScheme: this._productService.urlProtocol, appLanguage: platform.language, extensionDevelopmentLocationURI: this._environmentService.extensionDevelopmentLocationURI, diff --git a/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts b/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts index 75dfe905b59..c0bd87065a2 100644 --- a/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts +++ b/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts @@ -231,7 +231,7 @@ export class RemoteExtensionHost extends Disposable implements IExtensionHost { isExtensionDevelopmentDebug, appRoot: remoteInitData.appRoot, appName: this._productService.nameLong, - embedderIdentifier: this._productService.embedderIdentifier || 'desktop', + appHost: this._productService.embedderIdentifier || 'desktop', appUriScheme: this._productService.urlProtocol, appLanguage: platform.language, extensionDevelopmentLocationURI: this._environmentService.extensionDevelopmentLocationURI, diff --git a/src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts b/src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts index 4b107a2c885..482aca0aaf9 100644 --- a/src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts +++ b/src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts @@ -471,7 +471,7 @@ export class LocalProcessExtensionHost implements IExtensionHost { isExtensionDevelopmentDebug: this._isExtensionDevDebug, appRoot: this._environmentService.appRoot ? URI.file(this._environmentService.appRoot) : undefined, appName: this._productService.nameLong, - embedderIdentifier: this._productService.embedderIdentifier || 'desktop', + appHost: this._productService.embedderIdentifier || 'desktop', appUriScheme: this._productService.urlProtocol, appLanguage: platform.language, extensionDevelopmentLocationURI: this._environmentService.extensionDevelopmentLocationURI,