Use updated API to fetch scoped env collection

package.json

@@ -46,7 +46,7 @@
         "theme": "dark"
     },
     "engines": {
-        "vscode": "^1.79.0-20230526"
+        "vscode": "^1.81.0-20230808"
     },
     "enableTelemetry": false,
     "keywords": [
@@ -2151,7 +2151,7 @@
         "@types/stack-trace": "0.0.29",
         "@types/tmp": "^0.0.33",
         "@types/uuid": "^8.3.4",
-        "@types/vscode": "^1.75.0",
+        "@types/vscode": "^1.81.0",
         "@types/which": "^2.0.1",
         "@types/winreg": "^1.2.30",
         "@types/xml2js": "^0.4.2",

src/client/interpreter/activation/terminalEnvVarCollectionService.ts

@@ -3,14 +3,7 @@
 
 import * as path from 'path';
 import { inject, injectable } from 'inversify';
-import {
-    ProgressOptions,
-    ProgressLocation,
-    MarkdownString,
-    WorkspaceFolder,
-    EnvironmentVariableCollection,
-    EnvironmentVariableScope,
-} from 'vscode';
+import { ProgressOptions, ProgressLocation, MarkdownString, WorkspaceFolder } from 'vscode';
 import { pathExists } from 'fs-extra';
 import { IExtensionActivationService } from '../../activation/types';
 import { IApplicationShell, IApplicationEnvironment, IWorkspaceService } from '../../common/application/types';
@@ -111,7 +104,7 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
     public async _applyCollection(resource: Resource, shell = this.applicationEnvironment.shell): Promise<void> {
         const workspaceFolder = this.getWorkspaceFolder(resource);
         const settings = this.configurationService.getSettings(resource);
-        const envVarCollection = this.getEnvironmentVariableCollection(workspaceFolder);
+        const envVarCollection = this.context.getEnvironmentVariableCollection({ workspaceFolder });
         // Clear any previously set env vars from collection.
         envVarCollection.clear();
         if (!settings.terminal.activateEnvironment) {
@@ -170,22 +163,13 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
         envVarCollection.description = description;
     }
 
-    private getEnvironmentVariableCollection(workspaceFolder?: WorkspaceFolder) {
-        const envVarCollection = this.context.environmentVariableCollection as EnvironmentVariableCollection & {
-            getScopedEnvironmentVariableCollection(scope: EnvironmentVariableScope): EnvironmentVariableCollection;
-        };
-        return workspaceFolder
-            ? envVarCollection.getScopedEnvironmentVariableCollection({ workspaceFolder })
-            : envVarCollection;
-    }
-
     private async handleMicroVenv(resource: Resource) {
         const workspaceFolder = this.getWorkspaceFolder(resource);
         const interpreter = await this.interpreterService.getActiveInterpreter(resource);
         if (interpreter?.envType === EnvironmentType.Venv) {
             const activatePath = path.join(path.dirname(interpreter.path), 'activate');
             if (!(await pathExists(activatePath))) {
-                const envVarCollection = this.getEnvironmentVariableCollection(workspaceFolder);
+                const envVarCollection = this.context.getEnvironmentVariableCollection({ workspaceFolder });
                 const pathVarName = getSearchPathEnvVarNames()[0];
                 envVarCollection.replace(
                     'PATH',

types/vscode.proposed.envCollectionWorkspace.d.ts

@@ -7,28 +7,27 @@ declare module 'vscode' {
 
 	// https://github.com/microsoft/vscode/issues/182069
 
-	// export interface ExtensionContext {
-	// 	/**
-	// 	 * Gets the extension's environment variable collection for this workspace, enabling changes
-	// 	 * to be applied to terminal environment variables.
-	// 	 *
-	// 	 * @param scope The scope to which the environment variable collection applies to.
-	// 	 */
-	// 	readonly environmentVariableCollection: EnvironmentVariableCollection & { getScopedEnvironmentVariableCollection(scope: EnvironmentVariableScope): EnvironmentVariableCollection };
-	// }
+	export interface ExtensionContext {
+		/**
+		 * Gets the extension's environment variable collection for this workspace, enabling changes
+		 * to be applied to terminal environment variables.
+		 *
+		 * @deprecated Use {@link getEnvironmentVariableCollection} instead.
+		 */
+		readonly environmentVariableCollection: EnvironmentVariableCollection;
+		/**
+		 * Gets the extension's environment variable collection for this workspace, enabling changes
+		 * to be applied to terminal environment variables.
+		 *
+		 * @param scope The scope to which the environment variable collection applies to.
+		 */
+		getEnvironmentVariableCollection(scope?: EnvironmentVariableScope): EnvironmentVariableCollection;
+	}
 
 	export type EnvironmentVariableScope = {
 		/**
 		* Any specific workspace folder to get collection for. If unspecified, collection applicable to all workspace folders is returned.
 		*/
 		workspaceFolder?: WorkspaceFolder;
 	};
-
-	export interface EnvironmentVariableCollection extends Iterable<[variable: string, mutator: EnvironmentVariableMutator]> {
-		/**
-		 * A description for the environment variable collection, this will be used to describe the
-		 * changes in the UI.
-		 */
-		description: string | MarkdownString | undefined;
-	}
 }