remove unneeded edits

Author: eleanorjboyd

src/client/pythonEnvironments/base/locators/common/nativePythonFinder.ts

@@ -114,16 +114,6 @@ class NativePythonFinderImpl extends DisposableBase implements NativePythonFinde
 
     private readonly suppressErrorNotification: IPersistentStorage<boolean>;
 
-    /**
-     * Tracks whether the internal JSON-RPC connection has been closed.
-     * This can happen independently of the finder being disposed.
-     */
-    private _connectionClosed = false;
-
-    public get isConnectionClosed(): boolean {
-        return this._connectionClosed;
-    }
-
     constructor(private readonly cacheDirectory?: Uri, private readonly context?: IExtensionContext) {
         super();
         this.suppressErrorNotification = this.context
@@ -145,21 +135,14 @@ class NativePythonFinderImpl extends DisposableBase implements NativePythonFinde
     }
 
     async *refresh(options?: NativePythonEnvironmentKind | Uri[]): AsyncIterable<NativeEnvInfo> {
-        this.outputChannel.info(
-            `refresh() called: firstRefreshResults=${!!this.firstRefreshResults}, connectionClosed=${
-                this._connectionClosed
-            }, isDisposed=${this.isDisposed}`,
-        );
         if (this.firstRefreshResults) {
             // If this is the first time we are refreshing,
             // Then get the results from the first refresh.
             // Those would have started earlier and cached in memory.
-            this.outputChannel.info('Using firstRefreshResults');
             const results = this.firstRefreshResults();
             this.firstRefreshResults = undefined;
             yield* results;
         } else {
-            this.outputChannel.info('Calling doRefresh');
             const result = this.doRefresh(options);
             let completed = false;
             void result.completed.finally(() => {
@@ -315,8 +298,6 @@ class NativePythonFinderImpl extends DisposableBase implements NativePythonFinde
                 sendNativeTelemetry(data, this.initialRefreshMetrics),
             ),
             connection.onClose(() => {
-                this.outputChannel.info('JSON-RPC connection closed, marking connection as closed');
-                this._connectionClosed = true;
                 disposables.forEach((d) => d.dispose());
             }),
         );
@@ -540,9 +521,6 @@ export function getNativePythonFinder(context?: IExtensionContext): NativePython
             },
         };
     }
-    if (_finder && isFinderDisposed(_finder)) {
-        _finder = undefined;
-    }
     if (!_finder) {
         const cacheDirectory = context ? getCacheDirectory(context) : undefined;
         _finder = new NativePythonFinderImpl(cacheDirectory, context);
@@ -553,18 +531,6 @@ export function getNativePythonFinder(context?: IExtensionContext): NativePython
     return _finder;
 }
 
-function isFinderDisposed(finder: NativePythonFinder): boolean {
-    const finderImpl = finder as { isDisposed?: boolean; isConnectionClosed?: boolean };
-    const disposed = Boolean(finderImpl.isDisposed);
-    const connectionClosed = Boolean(finderImpl.isConnectionClosed);
-    if (disposed || connectionClosed) {
-        traceError(
-            `[NativePythonFinder] Finder needs recreation: isDisposed=${disposed}, isConnectionClosed=${connectionClosed}`,
-        );
-    }
-    return disposed || connectionClosed;
-}
-
 export function getCacheDirectory(context: IExtensionContext): Uri {
     return Uri.joinPath(context.globalStorageUri, 'pythonLocator');
 }
@@ -573,14 +539,3 @@ export async function clearCacheDirectory(context: IExtensionContext): Promise<v
     const cacheDirectory = getCacheDirectory(context);
     await fs.emptyDir(cacheDirectory.fsPath).catch(noop);
 }
-
-/**
- * Clears the singleton finder instance. For testing purposes only.
- * @internal
- */
-export function clearNativePythonFinder(): void {
-    if (_finder) {
-        _finder.dispose();
-        _finder = undefined;
-    }
-}

src/test/pythonEnvironments/nativePythonFinder.unit.test.ts

@@ -6,7 +6,6 @@ import * as sinon from 'sinon';
 import * as typemoq from 'typemoq';
 import { WorkspaceConfiguration } from 'vscode';
 import {
-    clearNativePythonFinder,
     getNativePythonFinder,
     isNativeEnvInfo,
     NativeEnvInfo,
@@ -24,9 +23,6 @@ suite('Native Python Finder', () => {
     let getWorkspaceFolderPathsStub: sinon.SinonStub;
 
     setup(() => {
-        // Clear singleton before each test to ensure fresh state
-        clearNativePythonFinder();
-
         createLogOutputChannelStub = sinon.stub(windowsApis, 'createLogOutputChannel');
         createLogOutputChannelStub.returns(new MockOutputChannel('locator'));
 
@@ -45,14 +41,11 @@ suite('Native Python Finder', () => {
     });
 
     teardown(() => {
-        // Clean up finder before restoring stubs to avoid issues with mock references
-        clearNativePythonFinder();
         sinon.restore();
     });
 
     suiteTeardown(() => {
-        // Final cleanup (finder may already be disposed by teardown)
-        clearNativePythonFinder();
+        finder.dispose();
     });
 
     test('Refresh should return python environments', async () => {