Fix dependency cycle with windows store and hash provider factory (#15023)

* Fix dependency cycle with windows store and hash provider factory

* Another cycle

* Fix another cycle

Author: Kartik Raj

src/client/interpreter/contracts.ts

@@ -1,11 +1,8 @@
 import { SemVer } from 'semver';
-import { CodeLensProvider, Disposable, Event, TextDocument, Uri } from 'vscode';
+import { CodeLensProvider, ConfigurationTarget, Disposable, Event, TextDocument, Uri } from 'vscode';
 import { Resource } from '../common/types';
 import { CondaEnvironmentInfo, CondaInfo } from '../pythonEnvironments/discovery/locators/services/conda';
-import { GetInterpreterLocatorOptions } from '../pythonEnvironments/discovery/locators/types';
 import { EnvironmentType, PythonEnvironment } from '../pythonEnvironments/info';
-import { WorkspacePythonPath } from './helpers';
-import { GetInterpreterOptions } from './interpreterService';
 
 export const INTERPRETER_LOCATOR_SERVICE = 'IInterpreterLocatorService';
 export const WINDOWS_REGISTRY_SERVICE = 'WindowsRegistryService';
@@ -146,3 +143,14 @@ export interface IInterpreterStatusbarVisibilityFilter {
     readonly changed?: Event<void>;
     readonly hidden: boolean;
 }
+
+export type WorkspacePythonPath = {
+    folderUri: Uri;
+    configTarget: ConfigurationTarget.Workspace | ConfigurationTarget.WorkspaceFolder;
+};
+
+export type GetInterpreterOptions = {
+    onSuggestion?: boolean;
+};
+
+export type GetInterpreterLocatorOptions = GetInterpreterOptions & { ignoreCache?: boolean };

src/client/interpreter/helpers.ts

@@ -15,17 +15,12 @@ import {
     PythonEnvironment,
     sortInterpreters
 } from '../pythonEnvironments/info';
-import { IComponentAdapter, IInterpreterHelper } from './contracts';
+import { IComponentAdapter, IInterpreterHelper, WorkspacePythonPath } from './contracts';
 import { IInterpreterHashProviderFactory } from './locators/types';
 
 const EXPITY_DURATION = 24 * 60 * 60 * 1000;
 type CachedPythonInterpreter = Partial<PythonEnvironment> & { fileHash: string };
 
-export type WorkspacePythonPath = {
-    folderUri: Uri;
-    configTarget: ConfigurationTarget.Workspace | ConfigurationTarget.WorkspaceFolder;
-};
-
 export function getFirstNonEmptyLineFromMultilineString(stdout: string) {
     if (!stdout) {
         return '';

src/client/interpreter/interpreterService.ts

@@ -25,6 +25,7 @@ import { EnvironmentType, PythonEnvironment } from '../pythonEnvironments/info';
 import { captureTelemetry } from '../telemetry';
 import { EventName } from '../telemetry/constants';
 import {
+    GetInterpreterOptions,
     IComponentAdapter,
     IInterpreterDisplay,
     IInterpreterHelper,
@@ -37,10 +38,6 @@ import { IVirtualEnvironmentManager } from './virtualEnvs/types';
 
 const EXPITY_DURATION = 24 * 60 * 60 * 1000;
 
-export type GetInterpreterOptions = {
-    onSuggestion?: boolean;
-};
-
 // The parts of IComponentAdapter used here.
 interface IComponent {
     getInterpreterDetails(pythonPath: string): Promise<undefined | PythonEnvironment>;

src/client/pythonEnvironments/discovery/locators/index.ts

@@ -17,6 +17,7 @@ import {
     CONDA_ENV_FILE_SERVICE,
     CONDA_ENV_SERVICE,
     CURRENT_PATH_SERVICE,
+    GetInterpreterLocatorOptions,
     GLOBAL_VIRTUAL_ENV_SERVICE,
     IComponentAdapter,
     IInterpreterLocatorHelper,
@@ -41,7 +42,6 @@ import {
 import { LazyResourceBasedLocator } from '../../base/locators/common/resourceBasedLocator';
 import { PythonEnvironment } from '../../info';
 import { isHiddenInterpreter } from './services/interpreterFilter';
-import { GetInterpreterLocatorOptions } from './types';
 
 /**
  * A wrapper around all locators used by the extension.

src/client/pythonEnvironments/discovery/locators/services/cacheableLocatorService.ts

@@ -15,12 +15,11 @@ import { traceDecorators, traceVerbose } from '../../../../common/logger';
 import { IDisposableRegistry, IPersistentStateFactory } from '../../../../common/types';
 import { createDeferred, Deferred } from '../../../../common/utils/async';
 import { StopWatch } from '../../../../common/utils/stopWatch';
-import { IInterpreterLocatorService, IInterpreterWatcher } from '../../../../interpreter/contracts';
+import { GetInterpreterLocatorOptions, IInterpreterLocatorService, IInterpreterWatcher } from '../../../../interpreter/contracts';
 import { IServiceContainer } from '../../../../ioc/types';
 import { sendTelemetryEvent } from '../../../../telemetry';
 import { EventName } from '../../../../telemetry/constants';
 import { PythonEnvironment } from '../../../info';
-import { GetInterpreterLocatorOptions } from '../types';
 
 /**
  * This class exists so that the interpreter fetching can be cached in between tests. Normally

src/client/pythonEnvironments/discovery/locators/services/pipEnvService.ts

@@ -10,13 +10,12 @@ import { IFileSystem, IPlatformService } from '../../../../common/platform/types
 import { IProcessServiceFactory } from '../../../../common/process/types';
 import { IConfigurationService, ICurrentProcess } from '../../../../common/types';
 import { StopWatch } from '../../../../common/utils/stopWatch';
-import { IInterpreterHelper, IPipEnvService } from '../../../../interpreter/contracts';
+import { GetInterpreterLocatorOptions, IInterpreterHelper, IPipEnvService } from '../../../../interpreter/contracts';
 import { IPipEnvServiceHelper } from '../../../../interpreter/locators/types';
 import { IServiceContainer } from '../../../../ioc/types';
 import { sendTelemetryEvent } from '../../../../telemetry';
 import { EventName } from '../../../../telemetry/constants';
 import { EnvironmentType, PythonEnvironment } from '../../../info';
-import { GetInterpreterLocatorOptions } from '../types';
 import { CacheableLocatorService } from './cacheableLocatorService';
 
 const pipEnvFileNameVariable = 'PIPENV_PIPFILE';

src/client/pythonEnvironments/discovery/locators/types.ts

@@ -11,6 +11,7 @@ import {
     CONDA_ENV_FILE_SERVICE,
     CONDA_ENV_SERVICE,
     CURRENT_PATH_SERVICE,
+    GetInterpreterOptions,
     GLOBAL_VIRTUAL_ENV_SERVICE,
     IComponentAdapter,
     ICondaService,
@@ -27,7 +28,6 @@ import {
     WINDOWS_REGISTRY_SERVICE,
     WORKSPACE_VIRTUAL_ENV_SERVICE,
 } from '../interpreter/contracts';
-import { GetInterpreterOptions } from '../interpreter/interpreterService';
 import { IPipEnvServiceHelper, IPythonInPathCommandProvider } from '../interpreter/locators/types';
 import { IServiceManager } from '../ioc/types';
 import { PythonEnvInfo, PythonEnvKind, PythonReleaseLevel } from './base/info';