Use MultiCancellationToken in model evaluator

Author: koesie10

extensions/ql-vscode/src/model-editor/model-evaluator.ts

@@ -18,6 +18,7 @@ import type { CancellationToken } from "vscode";
 import { CancellationTokenSource } from "vscode";
 import type { QlPackDetails } from "../variant-analysis/ql-pack-details";
 import type { App } from "../common/app";
+import { MultiCancellationToken } from "../common/vscode/multi-cancellation-token";
 import { ModelAlertsView } from "./model-alerts/model-alerts-view";
 
 export class ModelEvaluator extends DisposableObject {
@@ -68,11 +69,11 @@ export class ModelEvaluator extends DisposableObject {
 
     // Submit variant analysis and monitor progress
     return withProgress(
-      (progress) =>
+      (progress, token) =>
         this.runVariantAnalysis(
           qlPack,
           progress,
-          this.cancellationSource.token,
+          new MultiCancellationToken(token, this.cancellationSource.token),
         ),
       {
         title: "Run model evaluation",