Merge pull request #2226 from codefori/feature/cancel_connectirng

codefori · Aug 26, 2024 · 360778b · 360778b
2 parents 9fdb3ea + af6e7d6
commit 360778b
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/api/IBMi.ts b/src/api/IBMi.ts
@@ -134,14 +134,19 @@ export default class IBMi {
         return await vscode.window.withProgress({
           location: vscode.ProgressLocation.Notification,
           title: `Connecting`,
-        }, async progress => {
+          cancellable: true
+        }, async (progress, cancelToken) => {
           progress.report({
             message: `Connecting via SSH.`
           });
           const delayedOperations: Function[] = [...onConnectedOperations];
 
           await this.client.connect(connectionObject as node_ssh.Config);
 
+          cancelToken.onCancellationRequested(() => {
+            this.end();
+          });
+
           this.currentConnectionName = connectionObject.name;
           this.currentHost = connectionObject.host;
           this.currentPort = connectionObject.port;
@@ -917,7 +922,7 @@ export default class IBMi {
             //Compute the maximum admited length of a command's arguments. Source: Googling and https://www.in-ulm.de/~mascheck/various/argmax/#effectively_usable
             this.maximumArgsLength = Number((await this.sendCommand({ command: "/QOpenSys/usr/bin/expr `/QOpenSys/usr/bin/getconf ARG_MAX` - `env|wc -c` - `env|wc -l` \\* 4 - 2048" })).stdout);
           }
-          else{
+          else {
             this.maximumArgsLength = cachedServerSettings.maximumArgsLength;
           }