From 139c4555d9919ff74965b40eb057afd23bfd603a Mon Sep 17 00:00:00 2001
From: Koen Vlaswinkel <koesie10@github.com>
Date: Wed, 27 Mar 2024 10:43:31 +0100
Subject: [PATCH] Use Disposable type instead of isDisposable function

---
 extensions/ql-vscode/src/common/disposable-object.ts |  4 ----
 .../ql-vscode/src/local-queries/local-query-run.ts   | 12 ++++--------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/extensions/ql-vscode/src/common/disposable-object.ts b/extensions/ql-vscode/src/common/disposable-object.ts
index 4b8e20180..8c4cfd495 100644
--- a/extensions/ql-vscode/src/common/disposable-object.ts
+++ b/extensions/ql-vscode/src/common/disposable-object.ts
@@ -88,7 +88,3 @@ export class DisposableObject implements Disposable {
     }
   }
 }
-
-export function isDisposable(obj: unknown): obj is Disposable {
-  return obj !== undefined && typeof (obj as Disposable).dispose === "function";
-}
diff --git a/extensions/ql-vscode/src/local-queries/local-query-run.ts b/extensions/ql-vscode/src/local-queries/local-query-run.ts
index 436153953..3f43f1195 100644
--- a/extensions/ql-vscode/src/local-queries/local-query-run.ts
+++ b/extensions/ql-vscode/src/local-queries/local-query-run.ts
@@ -25,7 +25,7 @@ import { redactableError } from "../common/errors";
 import type { LocalQueries } from "./local-queries";
 import { tryGetQueryMetadata } from "../codeql-cli/query-metadata";
 import { telemetryListener } from "../common/vscode/telemetry";
-import { isDisposable } from "../common/disposable-object";
+import type { Disposable } from "../common/disposable-object";
 
 function formatResultMessage(result: CoreQueryResults): string {
   switch (result.resultType) {
@@ -66,7 +66,7 @@ export class LocalQueryRun {
      * The logger is only available while the query is running and will be disposed of when the
      * query completes.
      */
-    public readonly logger: Logger, // Public so that other clients, like the debug adapter, know where to send log output
+    public readonly logger: Logger & Disposable, // Public so that other clients, like the debug adapter, know where to send log output
     private readonly queryHistoryManager: QueryHistoryManager,
     private readonly cliServer: CodeQLCliServer,
   ) {}
@@ -98,9 +98,7 @@ export class LocalQueryRun {
     // display and sorting might depend on the number of results
     await this.queryHistoryManager.refreshTreeView();
 
-    if (isDisposable(this.logger)) {
-      this.logger.dispose();
-    }
+    this.logger.dispose();
   }
 
   /**
@@ -120,9 +118,7 @@ export class LocalQueryRun {
     this.queryInfo.failureReason = err.message;
     await this.queryHistoryManager.refreshTreeView();
 
-    if (isDisposable(this.logger)) {
-      this.logger.dispose();
-    }
+    this.logger.dispose();
   }
 
   /**