chore: cleanup

Author: peternhale

packages/salesforcedx-vscode-apex/src/languageUtils/languageClientManager.ts

@@ -322,8 +322,7 @@ export class LanguageClientManager {
           activationTime: startTime
         });
         await this.indexerDoneHandler(retrieveEnableSyncInitJobs(), languageClient, languageServerStatusBarItem);
-        // Do NOT push client to subscriptions - cleanup is handled only in deactivate() with timeout + force-kill.
-        // Pushing to subscriptions causes client.dispose() to run on shutdown, which can block if LS doesn't exit.
+        extensionContext.subscriptions.push(this.getClientInstance()!);
       } else {
         const errorMessage = nls.localize('unknown');
         this.setStatus(ClientStatus.Error, `${nls.localize('apex_language_server_failed_activate')} - ${errorMessage}`);

packages/salesforcedx-vscode-apex/test/jest/index.test.ts

@@ -251,11 +251,9 @@ describe('index tests', () => {
       stopSpy = jest.fn();
       telemetryServiceMock = new MockTelemetryService();
       (getTelemetryService as jest.Mock).mockReturnValue(telemetryServiceMock);
-      jest.spyOn(languageClientManager, 'getClientInstance').mockReturnValue({
-        stop: stopSpy,
-        dispose: jest.fn(),
-        outputChannel: { dispose: jest.fn() }
-      } as unknown as ApexLanguageClient);
+      jest
+        .spyOn(languageClientManager, 'getClientInstance')
+        .mockReturnValue({ stop: stopSpy } as unknown as ApexLanguageClient);
     });
 
     it('should call stop on the language client', async () => {