moves client disposal into deactivate method (#891)

* moves client disposal into deactivate method Signed-off-by: Lukas Bockstaller <[email protected]> * increment extension version Signed-off-by: Lukas Bockstaller <[email protected]> --------- Signed-off-by: Lukas Bockstaller <[email protected]> Co-authored-by: Zabil Cheriya Maliackal <[email protected]>
getgauge · Oct 31, 2023 · 2a02753 · 2a02753
1 parent 0c88370
commit 2a02753
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
   "description": "Gauge support for VScode.",
   "author": "ThoughtWorks",
   "license": "MIT",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "publisher": "getgauge",
   "engines": {
     "vscode": "^1.83.1"

diff --git a/src/extension.ts b/src/extension.ts
@@ -11,9 +11,12 @@ import { ProjectInitializer } from './init/projectInit';
 import { ProjectFactory } from './project/projectFactory';
 import { hasActiveGaugeDocument } from './util';
 import { showInstallGaugeNotification, showWelcomeNotification } from './welcomeNotifications';
+import { GaugeClients as GaugeProjectClientMap } from './gaugeClients';
 
 const MINIMUM_SUPPORTED_GAUGE_VERSION = '0.9.6';
 
+const clientsMap: GaugeProjectClientMap = new GaugeProjectClientMap();
+
 export async function activate(context: ExtensionContext) {
     let cli = CLI.instance();
     if (!cli) {
@@ -28,10 +31,7 @@ export async function activate(context: ExtensionContext) {
     }
     showWelcomeNotification(context);
     languages.setLanguageConfiguration('gauge', { wordPattern: /^(?:[*])([^*].*)$/g });
-
-    let gaugeWorkspace = new GaugeWorkspace(new GaugeState(context), cli);
-
-    let clientsMap = gaugeWorkspace.getClientsMap();
+    let gaugeWorkspace = new GaugeWorkspace(new GaugeState(context), cli, clientsMap);
 
     context.subscriptions.push(
         gaugeWorkspace,
@@ -46,3 +46,12 @@ export async function activate(context: ExtensionContext) {
             })
     );
 }
+
+export function deactivate(): Thenable<void> {
+    const promises: Thenable<void>[] = [];
+
+    for (const {client} of clientsMap.values()) {
+        promises.push(client.stop());
+    }
+    return Promise.all(promises).then(() => undefined);
+}
diff --git a/src/gaugeWorkspace.ts b/src/gaugeWorkspace.ts
@@ -30,15 +30,18 @@ const REFERENCE_CONFIG = 'reference';
 export class GaugeWorkspace extends Disposable {
     private readonly _fileProvider: SpecificationProvider;
     private _executor: GaugeExecutor;
-    private _clientsMap: GaugeProjectClientMap = new GaugeProjectClientMap();
+    private _clientsMap: GaugeProjectClientMap;
     private _clientLanguageMap: Map<string, string> = new Map();
     private _outputChannel: OutputChannel = window.createOutputChannel('gauge');
     private _launchConfig: WorkspaceConfiguration;
     private _codeLensConfig: WorkspaceConfiguration;
     private _disposable: Disposable;
     private _specNodeProvider: SpecNodeProvider;
-    constructor(private state: GaugeState, private cli: CLI) {
+
+    constructor(private state: GaugeState, private cli: CLI, clientsMap: GaugeProjectClientMap) {
         super(() => this.dispose());
+
+        this._clientsMap = clientsMap
         this._executor = new GaugeExecutor(this, cli);
 
         if (workspace.workspaceFolders) {
@@ -227,13 +230,5 @@ export class GaugeWorkspace extends Disposable {
         });
     }
 
-    dispose(): Thenable<void> {
-        let promises: Thenable<void>[] = [];
-        for (let cp of this._clientsMap.values()) {
-            promises.push(cp.client.stop());
-        }
-        return Promise.all(promises).then((f) => {
-            this._disposable.dispose();
-        });
-    }
+
 }