Ensure native finder is disposed correctly (microsoft#24432)

karthiknadig · web-flow · commit 3e30f9d65d35 · 2024-11-12T15:26:05.000-08:00
diff --git a/src/client/pythonEnvironments/base/locators/common/nativePythonFinder.ts b/src/client/pythonEnvironments/base/locators/common/nativePythonFinder.ts
@@ -463,6 +463,9 @@ export function getNativePythonFinder(context?: IExtensionContext): NativePython
     if (!_finder) {
         const cacheDirectory = context ? getCacheDirectory(context) : undefined;
         _finder = new NativePythonFinderImpl(cacheDirectory);
+        if (context) {
+            context.subscriptions.push(_finder);
+        }
     }
     return _finder;
 }
diff --git a/src/client/pythonEnvironments/index.ts b/src/client/pythonEnvironments/index.ts
@@ -60,7 +60,6 @@ export async function initialize(ext: ExtensionState): Promise<IDiscoveryAPI> {
 
     if (shouldUseNativeLocator()) {
         const finder = getNativePythonFinder(ext.context);
-        ext.disposables.push(finder);
         const api = createNativeEnvironmentsApi(finder);
         ext.disposables.push(api);
         registerNewDiscoveryForIOC(

Original file line number	Diff line number	Diff line change
`@@ -463,6 +463,9 @@ export function getNativePythonFinder(context?: IExtensionContext): NativePython`
`463`	`463`	`if (!_finder) {`
`464`	`464`	`const cacheDirectory = context ? getCacheDirectory(context) : undefined;`
`465`	`465`	`_finder = new NativePythonFinderImpl(cacheDirectory);`
	`466`	`+ if (context) {`
	`467`	`+ context.subscriptions.push(_finder);`
	`468`	`+ }`
`466`	`469`	`}`
`467`	`470`	`return _finder;`
`468`	`471`	`}`