renamed runTool and progressToken to run and runToken

src/commands.ts

@@ -233,13 +233,13 @@ export namespace ModestCommands {
                 toolName: "mosta (export-to-dot)",
                 constants: [],
                 parameters: parameters,
-                progressToken: runToken
+                runToken: "dot" + runToken
             };
             vscode.window.withProgress({ location: vscode.ProgressLocation.Window, title: `Loading new dot for ${this.fileUri.path.split("/").pop()}` }, async (progress, token) => {
                 await new Promise<null>(async (resolveProgress, _) => {
                     try {
                         let resultHandler = (data: ResultNotification) => {
-                            if (data.progressToken === jsonObject.progressToken) {
+                            if (data.runToken === jsonObject.runToken) {
                                 if (data.data && data.data !== "") {
                                     try {
                                         this.lastDotString = data.data;
@@ -270,15 +270,16 @@ export namespace ModestCommands {
         private dotToSvg(runToken: string, resolveProgress: (value: any | PromiseLike<any>) => void) {
             let jsonObject = {
                 dot: this.lastDotString,
-                runToken: runToken
+                runToken: "svg" + runToken
             };
-
-            client?.sendRequest("modest/cancelRunTool", { progressToken: this.lastRunToken });
+            if (this.lastRunToken) {
+                client?.sendRequest("modest/cancelRun", { runToken: this.lastRunToken });
+            }
             this.lastRunToken = runToken;
 
 
             let resultHandler = (data: ResultNotification) => {
-                if (data.progressToken === runToken) {
+                if (data.runToken === jsonObject.runToken) {
                     if (data.data && data.data !== "") {
                         try {
                             this.lastSvgString = data.data;

src/extension.ts

@@ -129,7 +129,7 @@ function createClient(): LanguageClient | undefined {
     client.onReady().then(() => {
         initializeTools();
         clientReady = true;
-        client.onNotification(new NotificationType<ResultNotification>("modest/toolResult"), result => {
+        client.onNotification(new NotificationType<ResultNotification>("modest/result"), result => {
             resultHandlers.forEach(handler => {
                 handler(result);
             });

src/sidebar.ts

@@ -109,7 +109,7 @@ function runTool(uri: string, toolName: string, constants: { name: string; value
         toolName: toolName,
         constants: constants,
         parameters: serverParameters,
-        progressToken: uri + toolName + JSON.stringify(constants) + JSON.stringify(serverParameters) + Date.now()
+        runToken: uri + toolName + JSON.stringify(constants) + JSON.stringify(serverParameters) + Date.now()
     };
 
     vscode.window.activeTextEditor?.document.save();
@@ -121,12 +121,12 @@ function runTool(uri: string, toolName: string, constants: { name: string; value
                 return;
             }
             try {
-                let progressHandler = client?.onProgress(new ProgressType<ProgressIndication>(), jsonObject.progressToken, indication => {
+                let progressHandler = client?.onProgress(new ProgressType<ProgressIndication>(), jsonObject.runToken, indication => {
                     progress.report({ message: indication.message, increment: indication.progress * 100 });
                 });
                 if (progressHandler) { disposalQueue.push(progressHandler); }
                 let resultHandler = (data: ResultNotification) => {
-                    if (data.progressToken === jsonObject.progressToken) {
+                    if (data.runToken === jsonObject.runToken) {
                         if (data.data && data.data !== "") {
                             try {
                                 analysisResultsProvider.setJsonObject(JSON.parse(data.data.trim()));
@@ -160,7 +160,7 @@ function runTool(uri: string, toolName: string, constants: { name: string; value
                     }
                 });
                 token.onCancellationRequested(_ => {
-                    client?.sendRequest("modest/cancelRunTool", { progressToken: jsonObject.progressToken });
+                    client?.sendRequest("modest/cancelRun", { runToken: jsonObject.runToken });
                 }, null, disposalQueue);
                 await client?.sendRequest<string>("modest/runTool", jsonObject);
             } catch (e) {

src/utils.ts

@@ -24,7 +24,7 @@ export interface ProgressIndication {
 }
 
 export interface ResultNotification {
-    progressToken: string,
+    runToken: string,
     data: string
 }
 //#endregion