Rename some types (#13408)

* Rename InterpreterType to EnvironmentType

* Rename PythonInterpreter to PythonEnvironment

* Rename environment type field from 'type' to 'envType'

* Fix unit tests broken by rename.

* Fix build failure.

Author: karthiknadig

src/client/activation/activationService.ts

@@ -29,7 +29,7 @@ import { LanguageService } from '../common/utils/localize';
 import { noop } from '../common/utils/misc';
 import { IInterpreterService } from '../interpreter/contracts';
 import { IServiceContainer } from '../ioc/types';
-import { PythonInterpreter } from '../pythonEnvironments/info';
+import { PythonEnvironment } from '../pythonEnvironments/info';
 import { sendTelemetryEvent } from '../telemetry';
 import { EventName } from '../telemetry/constants';
 import { Commands } from './commands';
@@ -119,7 +119,7 @@ export class LanguageServerExtensionActivationService
         this.activatedServer.server.activate();
     }
 
-    public async get(resource: Resource, interpreter?: PythonInterpreter): Promise<RefCountedLanguageServer> {
+    public async get(resource: Resource, interpreter?: PythonEnvironment): Promise<RefCountedLanguageServer> {
         // See if we already have it or not
         const key = await this.getKey(resource, interpreter);
         let result: Promise<RefCountedLanguageServer> | undefined = this.cache.get(key);
@@ -212,7 +212,7 @@ export class LanguageServerExtensionActivationService
 
     private async createRefCountedServer(
         resource: Resource,
-        interpreter: PythonInterpreter | undefined,
+        interpreter: PythonEnvironment | undefined,
         key: string
     ): Promise<RefCountedLanguageServer> {
         let serverType = this.getCurrentLanguageServerType();
@@ -293,7 +293,7 @@ export class LanguageServerExtensionActivationService
         }
     }
 
-    private async getKey(resource: Resource, interpreter?: PythonInterpreter): Promise<string> {
+    private async getKey(resource: Resource, interpreter?: PythonEnvironment): Promise<string> {
         const configurationService = this.serviceContainer.get<IConfigurationService>(IConfigurationService);
         const serverType = configurationService.getSettings(this.resource).languageServer;
         if (serverType === LanguageServerType.Node) {

src/client/activation/common/activatorBase.ts

@@ -28,7 +28,7 @@ import { IWorkspaceService } from '../../common/application/types';
 import { traceDecorators } from '../../common/logger';
 import { IFileSystem } from '../../common/platform/types';
 import { IConfigurationService, Resource } from '../../common/types';
-import { PythonInterpreter } from '../../pythonEnvironments/info';
+import { PythonEnvironment } from '../../pythonEnvironments/info';
 import { ILanguageServerActivator, ILanguageServerManager } from '../types';
 
 /**
@@ -49,7 +49,7 @@ export abstract class LanguageServerActivatorBase implements ILanguageServerActi
     ) {}
 
     @traceDecorators.error('Failed to activate language server')
-    public async start(resource: Resource, interpreter?: PythonInterpreter): Promise<void> {
+    public async start(resource: Resource, interpreter?: PythonEnvironment): Promise<void> {
         if (!resource) {
             resource = this.workspace.hasWorkspaceFolders ? this.workspace.workspaceFolders![0].uri : undefined;
         }

src/client/activation/common/analysisOptions.ts

@@ -9,7 +9,7 @@ import { traceDecorators } from '../../common/logger';
 import { IOutputChannel, Resource } from '../../common/types';
 import { debounceSync } from '../../common/utils/decorators';
 import { IEnvironmentVariablesProvider } from '../../common/variables/types';
-import { PythonInterpreter } from '../../pythonEnvironments/info';
+import { PythonEnvironment } from '../../pythonEnvironments/info';
 import { ILanguageServerAnalysisOptions, ILanguageServerOutputChannel } from '../types';
 
 @injectable()
@@ -26,7 +26,7 @@ export abstract class LanguageServerAnalysisOptionsBase implements ILanguageServ
         this.output = lsOutputChannel.channel;
     }
 
-    public async initialize(_resource: Resource, _interpreter: PythonInterpreter | undefined) {
+    public async initialize(_resource: Resource, _interpreter: PythonEnvironment | undefined) {
         const disposable = this.envVarsProvider.onDidEnvironmentVariablesChange(this.onEnvVarChange, this);
         this.disposables.push(disposable);
     }

src/client/activation/jedi.ts

@@ -39,7 +39,7 @@ import { PythonReferenceProvider } from '../providers/referenceProvider';
 import { PythonRenameProvider } from '../providers/renameProvider';
 import { PythonSignatureProvider } from '../providers/signatureProvider';
 import { JediSymbolProvider } from '../providers/symbolProvider';
-import { PythonInterpreter } from '../pythonEnvironments/info';
+import { PythonEnvironment } from '../pythonEnvironments/info';
 import { ITestManagementService } from '../testing/types';
 import { BlockFormatProviders } from '../typeFormatters/blockFormatProvider';
 import { OnTypeFormattingDispatcher } from '../typeFormatters/dispatcher';
@@ -69,7 +69,7 @@ export class JediExtensionActivator implements ILanguageServerActivator {
         this.documentSelector = PYTHON;
     }
 
-    public async start(_resource: Resource, interpreter: PythonInterpreter | undefined): Promise<void> {
+    public async start(_resource: Resource, interpreter: PythonEnvironment | undefined): Promise<void> {
         if (this.jediFactory) {
             throw new Error('Jedi already started');
         }

src/client/activation/languageServer/activator.ts

@@ -8,7 +8,7 @@ import { IWorkspaceService } from '../../common/application/types';
 import { EXTENSION_ROOT_DIR, isTestExecution } from '../../common/constants';
 import { IFileSystem } from '../../common/platform/types';
 import { BANNER_NAME_PROPOSE_LS, IConfigurationService, IPythonExtensionBanner, Resource } from '../../common/types';
-import { PythonInterpreter } from '../../pythonEnvironments/info';
+import { PythonEnvironment } from '../../pythonEnvironments/info';
 import { LanguageServerActivatorBase } from '../common/activatorBase';
 import { ILanguageServerDownloader, ILanguageServerFolderService, ILanguageServerManager } from '../types';
 
@@ -37,7 +37,7 @@ export class DotNetLanguageServerActivator extends LanguageServerActivatorBase {
         super(manager, workspace, fs, configurationService);
     }
 
-    public async start(resource: Resource, interpreter?: PythonInterpreter): Promise<void> {
+    public async start(resource: Resource, interpreter?: PythonEnvironment): Promise<void> {
         if (!isTestExecution()) {
             this.proposePylancePopup.showBanner().ignoreErrors();
         }

src/client/activation/languageServer/analysisOptions.ts

@@ -10,14 +10,14 @@ import { traceDecorators, traceError } from '../../common/logger';
 import { IConfigurationService, IExtensionContext, IPathUtils, Resource } from '../../common/types';
 import { debounceSync } from '../../common/utils/decorators';
 import { IEnvironmentVariablesProvider } from '../../common/variables/types';
-import { PythonInterpreter } from '../../pythonEnvironments/info';
+import { PythonEnvironment } from '../../pythonEnvironments/info';
 import { LanguageServerAnalysisOptionsBase } from '../common/analysisOptions';
 import { ILanguageServerFolderService, ILanguageServerOutputChannel } from '../types';
 
 @injectable()
 export class DotNetLanguageServerAnalysisOptions extends LanguageServerAnalysisOptionsBase {
     private resource: Resource;
-    private interpreter: PythonInterpreter | undefined;
+    private interpreter: PythonEnvironment | undefined;
     private languageServerFolder: string = '';
     private excludedFiles: string[] = [];
     private typeshedPaths: string[] = [];
@@ -34,7 +34,7 @@ export class DotNetLanguageServerAnalysisOptions extends LanguageServerAnalysisO
         super(envVarsProvider, lsOutputChannel);
     }
 
-    public async initialize(resource: Resource, interpreter: PythonInterpreter | undefined) {
+    public async initialize(resource: Resource, interpreter: PythonEnvironment | undefined) {
         await super.initialize(resource, interpreter);
 
         this.resource = resource;

src/client/activation/languageServer/languageClientFactory.ts

@@ -9,7 +9,7 @@ import { EXTENSION_ROOT_DIR, PYTHON_LANGUAGE } from '../../common/constants';
 import { IConfigurationService, Resource } from '../../common/types';
 import { IEnvironmentVariablesProvider } from '../../common/variables/types';
 import { IEnvironmentActivationService } from '../../interpreter/activation/types';
-import { PythonInterpreter } from '../../pythonEnvironments/info';
+import { PythonEnvironment } from '../../pythonEnvironments/info';
 import { ILanguageClientFactory, ILanguageServerFolderService, IPlatformData } from '../types';
 
 // tslint:disable:no-require-imports no-require-imports no-var-requires max-classes-per-file
@@ -25,7 +25,7 @@ export class DotNetDownloadedLanguageClientFactory implements ILanguageClientFac
 
     public async createLanguageClient(
         resource: Resource,
-        _interpreter: PythonInterpreter | undefined,
+        _interpreter: PythonEnvironment | undefined,
         clientOptions: LanguageClientOptions,
         env?: NodeJS.ProcessEnv
     ): Promise<LanguageClient> {
@@ -58,7 +58,7 @@ export class DotNetSimpleLanguageClientFactory implements ILanguageClientFactory
 
     public async createLanguageClient(
         resource: Resource,
-        _interpreter: PythonInterpreter | undefined,
+        _interpreter: PythonEnvironment | undefined,
         clientOptions: LanguageClientOptions,
         env?: NodeJS.ProcessEnv
     ): Promise<LanguageClient> {
@@ -95,7 +95,7 @@ export class DotNetLanguageClientFactory implements ILanguageClientFactory {
 
     public async createLanguageClient(
         resource: Resource,
-        interpreter: PythonInterpreter | undefined,
+        interpreter: PythonEnvironment | undefined,
         clientOptions: LanguageClientOptions
     ): Promise<LanguageClient> {
         const settings = this.configurationService.getSettings(resource);
@@ -113,7 +113,7 @@ export class DotNetLanguageClientFactory implements ILanguageClientFactory {
 
     private async getEnvVars(
         resource: Resource,
-        interpreter: PythonInterpreter | undefined
+        interpreter: PythonEnvironment | undefined
     ): Promise<NodeJS.ProcessEnv> {
         const envVars = await this.environmentActivationService.getActivatedEnvironmentVariables(resource, interpreter);
         if (envVars && Object.keys(envVars).length > 0) {

src/client/activation/languageServer/languageServerProxy.ts

@@ -11,7 +11,7 @@ import { createDeferred, Deferred, sleep } from '../../common/utils/async';
 import { swallowExceptions } from '../../common/utils/decorators';
 import { noop } from '../../common/utils/misc';
 import { LanguageServerSymbolProvider } from '../../providers/symbolProvider';
-import { PythonInterpreter } from '../../pythonEnvironments/info';
+import { PythonEnvironment } from '../../pythonEnvironments/info';
 import { captureTelemetry, sendTelemetryEvent } from '../../telemetry';
 import { EventName } from '../../telemetry/constants';
 import { ITestManagementService } from '../../testing/types';
@@ -55,7 +55,7 @@ export class DotNetLanguageServerProxy implements ILanguageServerProxy {
     @captureTelemetry(EventName.PYTHON_LANGUAGE_SERVER_ENABLED, undefined, true)
     public async start(
         resource: Resource,
-        interpreter: PythonInterpreter | undefined,
+        interpreter: PythonEnvironment | undefined,
         options: LanguageClientOptions
     ): Promise<void> {
         if (!this.languageClient) {

src/client/activation/languageServer/manager.ts

@@ -9,7 +9,7 @@ import { traceDecorators } from '../../common/logger';
 import { IConfigurationService, IDisposable, IExperimentsManager, Resource } from '../../common/types';
 import { debounceSync } from '../../common/utils/decorators';
 import { IServiceContainer } from '../../ioc/types';
-import { PythonInterpreter } from '../../pythonEnvironments/info';
+import { PythonEnvironment } from '../../pythonEnvironments/info';
 import { captureTelemetry } from '../../telemetry';
 import { EventName } from '../../telemetry/constants';
 import { Commands } from '../commands';
@@ -27,7 +27,7 @@ import {
 export class DotNetLanguageServerManager implements ILanguageServerManager {
     private languageServerProxy?: ILanguageServerProxy;
     private resource!: Resource;
-    private interpreter: PythonInterpreter | undefined;
+    private interpreter: PythonEnvironment | undefined;
     private middleware: LanguageClientMiddleware | undefined;
     private disposables: IDisposable[] = [];
     private connected: boolean = false;
@@ -68,7 +68,7 @@ export class DotNetLanguageServerManager implements ILanguageServerManager {
         return this.languageServerProxy;
     }
     @traceDecorators.error('Failed to start language server')
-    public async start(resource: Resource, interpreter: PythonInterpreter | undefined): Promise<void> {
+    public async start(resource: Resource, interpreter: PythonEnvironment | undefined): Promise<void> {
         if (this.languageProxy) {
             throw new Error('Language server already started');
         }

src/client/activation/node/languageClientFactory.ts

@@ -8,7 +8,7 @@ import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind } f
 import { EXTENSION_ROOT_DIR, PYTHON_LANGUAGE } from '../../common/constants';
 import { IFileSystem } from '../../common/platform/types';
 import { Resource } from '../../common/types';
-import { PythonInterpreter } from '../../pythonEnvironments/info';
+import { PythonEnvironment } from '../../pythonEnvironments/info';
 import { ILanguageClientFactory, ILanguageServerFolderService } from '../types';
 import { FileBasedCancellationStrategy } from './cancellationUtils';
 
@@ -24,7 +24,7 @@ export class NodeLanguageClientFactory implements ILanguageClientFactory {
 
     public async createLanguageClient(
         resource: Resource,
-        _interpreter: PythonInterpreter | undefined,
+        _interpreter: PythonEnvironment | undefined,
         clientOptions: LanguageClientOptions
     ): Promise<LanguageClient> {
         // this must exist for node language client

src/client/activation/node/languageServerProxy.ts

@@ -17,7 +17,7 @@ import { createDeferred, Deferred, sleep } from '../../common/utils/async';
 import { swallowExceptions } from '../../common/utils/decorators';
 import { noop } from '../../common/utils/misc';
 import { LanguageServerSymbolProvider } from '../../providers/symbolProvider';
-import { PythonInterpreter } from '../../pythonEnvironments/info';
+import { PythonEnvironment } from '../../pythonEnvironments/info';
 import { captureTelemetry, sendTelemetryEvent } from '../../telemetry';
 import { EventName } from '../../telemetry/constants';
 import { ITestManagementService } from '../../testing/types';
@@ -83,7 +83,7 @@ export class NodeLanguageServerProxy implements ILanguageServerProxy {
     )
     public async start(
         resource: Resource,
-        interpreter: PythonInterpreter | undefined,
+        interpreter: PythonEnvironment | undefined,
         options: LanguageClientOptions
     ): Promise<void> {
         if (!this.languageClient) {

src/client/activation/node/manager.ts

@@ -9,7 +9,7 @@ import { traceDecorators } from '../../common/logger';
 import { IConfigurationService, IDisposable, IExperimentsManager, Resource } from '../../common/types';
 import { debounceSync } from '../../common/utils/decorators';
 import { IServiceContainer } from '../../ioc/types';
-import { PythonInterpreter } from '../../pythonEnvironments/info';
+import { PythonEnvironment } from '../../pythonEnvironments/info';
 import { captureTelemetry } from '../../telemetry';
 import { EventName } from '../../telemetry/constants';
 import { Commands } from '../commands';
@@ -26,7 +26,7 @@ import {
 export class NodeLanguageServerManager implements ILanguageServerManager {
     private languageServerProxy?: ILanguageServerProxy;
     private resource!: Resource;
-    private interpreter: PythonInterpreter | undefined;
+    private interpreter: PythonEnvironment | undefined;
     private middleware: LanguageClientMiddleware | undefined;
     private disposables: IDisposable[] = [];
     private connected: boolean = false;
@@ -68,7 +68,7 @@ export class NodeLanguageServerManager implements ILanguageServerManager {
     }
 
     @traceDecorators.error('Failed to start language server')
-    public async start(resource: Resource, interpreter: PythonInterpreter | undefined): Promise<void> {
+    public async start(resource: Resource, interpreter: PythonEnvironment | undefined): Promise<void> {
         if (this.languageProxy) {
             throw new Error('Language server already started');
         }

src/client/activation/none/activator.ts

@@ -22,7 +22,7 @@ import {
 } from 'vscode';
 import { isTestExecution } from '../../common/constants';
 import { BANNER_NAME_PROPOSE_LS, IPythonExtensionBanner, Resource } from '../../common/types';
-import { PythonInterpreter } from '../../pythonEnvironments/info';
+import { PythonEnvironment } from '../../pythonEnvironments/info';
 import { ILanguageServerActivator } from '../types';
 
 /**
@@ -39,7 +39,7 @@ export class NoLanguageServerExtensionActivator implements ILanguageServerActiva
         @named(BANNER_NAME_PROPOSE_LS)
         private proposePylancePopup: IPythonExtensionBanner
     ) {}
-    public async start(_resource: Resource, _interpreter?: PythonInterpreter): Promise<void> {
+    public async start(_resource: Resource, _interpreter?: PythonEnvironment): Promise<void> {
         if (!isTestExecution()) {
             this.proposePylancePopup.showBanner().ignoreErrors();
         }

src/client/activation/refCountedLanguageServer.ts

@@ -23,7 +23,7 @@ import {
 
 import { Resource } from '../common/types';
 import { noop } from '../common/utils/misc';
-import { PythonInterpreter } from '../pythonEnvironments/info';
+import { PythonEnvironment } from '../pythonEnvironments/info';
 import { ILanguageServerActivator, LanguageServerType } from './types';
 
 export class RefCountedLanguageServer implements ILanguageServerActivator {
@@ -49,7 +49,7 @@ export class RefCountedLanguageServer implements ILanguageServerActivator {
         }
     }
 
-    public start(_resource: Resource, _interpreter: PythonInterpreter | undefined): Promise<void> {
+    public start(_resource: Resource, _interpreter: PythonEnvironment | undefined): Promise<void> {
         throw new Error('Server should have already been started. Do not start the wrapper.');
     }