add IInterpreterHashProviderFactory to the (#13632)

ioc container
microsoft · Aug 27, 2020 · c37c79d · c37c79d
1 parent 67c95c6
commit c37c79d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/client/interpreter/locators/types.ts b/src/client/interpreter/locators/types.ts
@@ -22,6 +22,7 @@ export interface IPipEnvServiceHelper {
  * @export
  * @interface IInterpreterHashProviderFactory
  */
+export const IInterpreterHashProviderFactory = Symbol('IInterpreterHashProviderFactory');
 export interface IInterpreterHashProviderFactory {
     create(options: { pythonPath: string } | { resource: Uri }): Promise<IInterpreterHashProvider>;
 }

diff --git a/src/client/pythonEnvironments/discovery/locators/services/hashProviderFactory.ts b/src/client/pythonEnvironments/discovery/locators/services/hashProviderFactory.ts
@@ -24,8 +24,9 @@ export class InterpeterHashProviderFactory implements IInterpreterHashProviderFa
     ) {}
 
     public async create(options: { pythonPath: string } | { resource: Uri }): Promise<IInterpreterHashProvider> {
-        const pythonPath =
-            'pythonPath' in options ? options.pythonPath : this.configService.getSettings(options.resource).pythonPath;
+        const pythonPath = 'pythonPath' in options
+            ? options.pythonPath
+            : this.configService.getSettings(options.resource).pythonPath;
         return this.windowsStoreInterpreter.isWindowsStoreInterpreter(pythonPath)
             ? this.windowsStoreHashProvider
             : this.hashProvider;

diff --git a/src/test/datascience/dataScienceIocContainer.ts b/src/test/datascience/dataScienceIocContainer.ts
@@ -368,11 +368,13 @@ import {
 import { ShebangCodeLensProvider } from '../../client/interpreter/display/shebangCodeLensProvider';
 import { InterpreterHelper } from '../../client/interpreter/helpers';
 import { InterpreterVersionService } from '../../client/interpreter/interpreterVersion';
+import { IInterpreterHashProviderFactory } from '../../client/interpreter/locators/types';
 import { registerInterpreterTypes } from '../../client/interpreter/serviceRegistry';
 import { VirtualEnvironmentManager } from '../../client/interpreter/virtualEnvs';
 import { IVirtualEnvironmentManager } from '../../client/interpreter/virtualEnvs/types';
 import { ProposePylanceBanner } from '../../client/languageServices/proposeLanguageServerBanner';
 import { CacheableLocatorPromiseCache } from '../../client/pythonEnvironments/discovery/locators/services/cacheableLocatorService';
+import { InterpeterHashProviderFactory } from '../../client/pythonEnvironments/discovery/locators/services/hashProviderFactory';
 import { EnvironmentType, PythonEnvironment } from '../../client/pythonEnvironments/info';
 import { registerForIOC } from '../../client/pythonEnvironments/legacyIOC';
 import { CodeExecutionHelper } from '../../client/terminals/codeExecution/helper';
@@ -583,6 +585,10 @@ export class DataScienceIocContainer extends UnitTestIocContainer {
                 instance(this.webPanelProvider)
             );
         }
+        this.serviceManager.addSingleton<IInterpreterHashProviderFactory>(
+            IInterpreterHashProviderFactory,
+            InterpeterHashProviderFactory
+        );
         this.serviceManager.addSingleton<IExportManager>(IExportManager, ExportManager);
         this.serviceManager.addSingleton<ExportDependencyChecker>(ExportDependencyChecker, ExportDependencyChecker);
         this.serviceManager.addSingleton<ExportFileOpener>(ExportFileOpener, ExportFileOpener);