Move disposable-object.ts to /common

extensions/ql-vscode/src/common/app.ts

@@ -1,5 +1,5 @@
 import { Credentials } from "./authentication";
-import { Disposable } from "../pure/disposable-object";
+import { Disposable } from "./disposable-object";
 import { AppEventEmitter } from "./events";
 import { NotificationLogger } from "./logging";
 import { Memento } from "./memento";

extensions/ql-vscode/src/common/discovery.ts

@@ -1,4 +1,4 @@
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "./disposable-object";
 import { getErrorMessage } from "../pure/helpers-pure";
 import { Logger } from "./logging";
 

extensions/ql-vscode/src/common/events.ts

@@ -1,4 +1,4 @@
-import { Disposable } from "../pure/disposable-object";
+import { Disposable } from "./disposable-object";
 
 export interface AppEvent<T> {
   (listener: (event: T) => void): Disposable;

extensions/ql-vscode/src/common/logging/vscode/output-channel-logger.ts

@@ -1,6 +1,6 @@
 import { window as Window, OutputChannel, Progress } from "vscode";
 import { Logger, LogOptions } from "../logger";
-import { DisposableObject } from "../../../pure/disposable-object";
+import { DisposableObject } from "../../disposable-object";
 import { NotificationLogger } from "../notification-logger";
 
 /**

extensions/ql-vscode/src/common/vscode/abstract-webview.ts

@@ -9,7 +9,7 @@ import {
 } from "vscode";
 import { join } from "path";
 
-import { DisposableObject, DisposeHandler } from "../../pure/disposable-object";
+import { DisposableObject, DisposeHandler } from "../disposable-object";
 import { tmpDir } from "../../tmp-dir";
 import { getHtmlForWebview, WebviewMessage, WebviewView } from "./webview-html";
 

extensions/ql-vscode/src/common/vscode/multi-file-system-watcher.ts

@@ -1,4 +1,4 @@
-import { DisposableObject } from "../../pure/disposable-object";
+import { DisposableObject } from "../disposable-object";
 import { EventEmitter, Event, Uri, GlobPattern, workspace } from "vscode";
 
 /**

extensions/ql-vscode/src/common/vscode/vscode-app.ts

@@ -1,6 +1,6 @@
 import * as vscode from "vscode";
 import { VSCodeCredentials } from "./authentication";
-import { Disposable } from "../../pure/disposable-object";
+import { Disposable } from "../disposable-object";
 import { App, AppMode, EnvironmentContext } from "../app";
 import { AppEventEmitter } from "../events";
 import { extLogger, NotificationLogger, queryServerLogger } from "../logging";

extensions/ql-vscode/src/config.ts

@@ -1,4 +1,4 @@
-import { DisposableObject } from "./pure/disposable-object";
+import { DisposableObject } from "./common/disposable-object";
 import {
   workspace,
   Event,

extensions/ql-vscode/src/databases/config/db-config-store.ts

@@ -18,7 +18,10 @@ import {
   SelectedDbItemKind,
 } from "./db-config";
 import * as chokidar from "chokidar";
-import { DisposableObject, DisposeHandler } from "../../pure/disposable-object";
+import {
+  DisposableObject,
+  DisposeHandler,
+} from "../../common/disposable-object";
 import { DbConfigValidator } from "./db-config-validator";
 import { App } from "../../common/app";
 import { AppEvent, AppEventEmitter } from "../../common/events";

extensions/ql-vscode/src/databases/db-manager.ts

@@ -1,7 +1,7 @@
 import { App } from "../common/app";
 import { AppEvent, AppEventEmitter } from "../common/events";
 import { ValueResult } from "../common/value-result";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { DbConfigStore } from "./config/db-config-store";
 import {
   DbItem,

extensions/ql-vscode/src/databases/db-module.ts

@@ -1,7 +1,7 @@
 import { window } from "vscode";
 import { App } from "../common/app";
 import { extLogger } from "../common";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { DbConfigStore } from "./config/db-config-store";
 import { DbManager } from "./db-manager";
 import { DbPanel } from "./ui/db-panel";

extensions/ql-vscode/src/databases/local-databases-ui.ts

@@ -1,5 +1,5 @@
 import { join, basename, dirname as path_dirname } from "path";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import {
   Event,
   EventEmitter,

extensions/ql-vscode/src/databases/local-databases/database-manager.ts

@@ -1,7 +1,7 @@
 import vscode, { ExtensionContext } from "vscode";
 import { extLogger, Logger } from "../../common";
 import { showAndLogExceptionWithTelemetry } from "../../common/logging";
-import { DisposableObject } from "../../pure/disposable-object";
+import { DisposableObject } from "../../common/disposable-object";
 import { App } from "../../common/app";
 import { QueryRunner } from "../../query-server";
 import * as cli from "../../codeql-cli/cli";

extensions/ql-vscode/src/databases/ui/db-panel.ts

@@ -14,7 +14,7 @@ import {
   getOwnerFromGitHubUrl,
   isValidGitHubOwner,
 } from "../../common/github-url-identifier-helper";
-import { DisposableObject } from "../../pure/disposable-object";
+import { DisposableObject } from "../../common/disposable-object";
 import {
   DbItem,
   DbItemKind,

extensions/ql-vscode/src/databases/ui/db-tree-data-provider.ts

@@ -8,7 +8,7 @@ import {
 import { createDbTreeViewItemError, DbTreeViewItem } from "./db-tree-view-item";
 import { DbManager } from "../db-manager";
 import { mapDbItemToTreeViewItem } from "./db-item-mapper";
-import { DisposableObject } from "../../pure/disposable-object";
+import { DisposableObject } from "../../common/disposable-object";
 import {
   DbConfigValidationError,
   DbConfigValidationErrorKind,

extensions/ql-vscode/src/debugger/debug-session.ts

@@ -18,7 +18,7 @@ import { CoreQueryResults, CoreQueryRun, QueryRunner } from "../query-server";
 import * as CodeQLProtocol from "./debug-protocol";
 import { QuickEvalContext } from "../run-queries-shared";
 import { getErrorMessage } from "../pure/helpers-pure";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 
 // More complete implementations of `Event` for certain events, because the classes from
 // `@vscode/debugadapter` make it more difficult to provide some of the message values.

extensions/ql-vscode/src/debugger/debugger-factory.ts

@@ -10,7 +10,7 @@ import {
 } from "vscode";
 import { isCanary } from "../config";
 import { LocalQueries } from "../local-queries";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { QueryRunner } from "../query-server";
 import { QLDebugConfigurationProvider } from "./debug-configuration";
 import { QLDebugSession } from "./debug-session";

extensions/ql-vscode/src/debugger/debugger-ui.ts

@@ -9,7 +9,7 @@ import {
 } from "vscode";
 import { DebuggerCommands } from "../common/commands";
 import { DatabaseManager } from "../databases/local-databases";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { CoreQueryResults } from "../query-server";
 import {
   getQuickEvalContext,

extensions/ql-vscode/src/language-support/ast-viewer/ast-viewer.ts

@@ -23,7 +23,7 @@ import {
   isWholeFileLoc,
   isLineColumnLoc,
 } from "../../common/bqrs-utils";
-import { DisposableObject } from "../../pure/disposable-object";
+import { DisposableObject } from "../../common/disposable-object";
 import { asError, getErrorMessage } from "../../pure/helpers-pure";
 import { redactableError } from "../../pure/errors";
 import { AstViewerCommands } from "../../common/commands";

extensions/ql-vscode/src/local-queries/local-queries.ts

@@ -39,7 +39,7 @@ import { asError, getErrorMessage } from "../pure/helpers-pure";
 import { CodeQLCliServer } from "../codeql-cli/cli";
 import { LocalQueryCommands } from "../common/commands";
 import { App } from "../common/app";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { SkeletonQueryWizard } from "../skeleton-query-wizard";
 import { LocalQueryRun } from "./local-query-run";
 import { createMultiSelectionCommand } from "../common/vscode/selection-commands";

extensions/ql-vscode/src/log-insights/log-scanner-service.ts

@@ -1,5 +1,5 @@
 import { Diagnostic, DiagnosticSeverity, languages, Range, Uri } from "vscode";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { QueryHistoryInfo } from "../query-history/query-history-info";
 import {
   EvaluationLogProblemReporter,

extensions/ql-vscode/src/log-insights/summary-language-support.ts

@@ -11,7 +11,7 @@ import {
   window,
   workspace,
 } from "vscode";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { extLogger } from "../common";
 import { getErrorMessage } from "../pure/helpers-pure";
 import { SummaryLanguageSupportCommands } from "../common/commands";

extensions/ql-vscode/src/queries-panel/queries-module.ts

@@ -2,7 +2,7 @@ import { CodeQLCliServer } from "../codeql-cli/cli";
 import { extLogger } from "../common";
 import { App } from "../common/app";
 import { isCanary, showQueriesPanel } from "../config";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { QueriesPanel } from "./queries-panel";
 import { QueryDiscovery } from "./query-discovery";
 import { QueryPackDiscovery } from "./query-pack-discovery";

extensions/ql-vscode/src/queries-panel/queries-panel.ts

@@ -1,5 +1,5 @@
 import * as vscode from "vscode";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { QueryTreeDataProvider } from "./query-tree-data-provider";
 import { QueryDiscovery } from "./query-discovery";
 

extensions/ql-vscode/src/queries-panel/query-tree-data-provider.ts

@@ -1,6 +1,6 @@
 import { Event, EventEmitter, TreeDataProvider, TreeItem } from "vscode";
 import { QueryTreeViewItem } from "./query-tree-view-item";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { FileTreeNode } from "../common/file-tree-nodes";
 
 export interface QueryDiscoverer {

extensions/ql-vscode/src/query-evaluation-logging/eval-log-viewer.ts

@@ -8,7 +8,7 @@ import {
   EventEmitter,
   TreeItemCollapsibleState,
 } from "vscode";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { asError, getErrorMessage } from "../pure/helpers-pure";
 import { redactableError } from "../pure/errors";
 import { EvalLogViewerCommands } from "../common/commands";

extensions/ql-vscode/src/query-history/history-tree-data-provider.ts

@@ -8,7 +8,7 @@ import {
   TreeDataProvider,
   TreeItem,
 } from "vscode";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { assertNever } from "../pure/helpers-pure";
 import { QueryHistoryInfo } from "./query-history-info";
 import { QueryStatus } from "../query-status";

extensions/ql-vscode/src/query-history/query-history-manager.ts

@@ -18,7 +18,7 @@ import {
   showInformationMessageWithAction,
 } from "../common/vscode/dialog";
 import { URLSearchParams } from "url";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { ONE_HOUR_IN_MS, TWO_HOURS_IN_MS } from "../pure/time";
 import { assertNever, getErrorMessage } from "../pure/helpers-pure";
 import { CompletedLocalQueryInfo, LocalQueryInfo } from "../query-results";

extensions/ql-vscode/src/query-server/legacy/query-server-client.ts

@@ -1,6 +1,6 @@
 import { ensureFile } from "fs-extra";
 
-import { DisposableObject } from "../../pure/disposable-object";
+import { DisposableObject } from "../../common/disposable-object";
 import { CancellationToken } from "vscode";
 import { createMessageConnection, RequestType } from "vscode-jsonrpc/node";
 import * as cli from "../../codeql-cli/cli";

extensions/ql-vscode/src/query-server/query-server-client.ts

@@ -1,6 +1,6 @@
 import { ensureFile } from "fs-extra";
 
-import { DisposableObject, DisposeHandler } from "../pure/disposable-object";
+import { DisposableObject, DisposeHandler } from "../common/disposable-object";
 import { CancellationToken } from "vscode";
 import { createMessageConnection, RequestType } from "vscode-jsonrpc/node";
 import * as cli from "../codeql-cli/cli";

extensions/ql-vscode/src/query-testing/test-adapter.ts

@@ -15,7 +15,7 @@ import {
 import { TestAdapterRegistrar } from "vscode-test-adapter-util";
 import { QLTestDiscovery } from "./qltest-discovery";
 import { Event, EventEmitter, CancellationTokenSource } from "vscode";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { CodeQLCliServer, TestCompleted } from "../codeql-cli/cli";
 import { testLogger } from "../common";
 import { TestRunner } from "./test-runner";

extensions/ql-vscode/src/query-testing/test-manager-base.ts

@@ -1,6 +1,6 @@
 import { copy, createFile, lstat, pathExists } from "fs-extra";
 import { TestUICommands } from "../common/commands";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { getActualFile, getExpectedFile } from "./test-adapter";
 import { TestItem, TextDocumentShowOptions, Uri, window } from "vscode";
 import { basename } from "path";

extensions/ql-vscode/src/query-testing/test-manager.ts

@@ -15,7 +15,7 @@ import {
   tests,
   workspace,
 } from "vscode";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { QLTestDiscovery } from "./qltest-discovery";
 import { CodeQLCliServer } from "../codeql-cli/cli";
 import { getErrorMessage } from "../pure/helpers-pure";

extensions/ql-vscode/src/query-testing/test-runner.ts

@@ -10,7 +10,7 @@ import {
   showAndLogExceptionWithTelemetry,
   showAndLogWarningMessage,
 } from "../common/logging";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { telemetryListener } from "../common/vscode/telemetry";
 
 async function isFileAccessible(uri: Uri): Promise<boolean> {

extensions/ql-vscode/src/query-testing/test-ui.ts

@@ -8,7 +8,7 @@ import {
   TestSuiteEvent,
 } from "vscode-test-adapter-api";
 import { TestTreeNode } from "./test-tree-node";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { QLTestAdapter } from "./test-adapter";
 import { App } from "../common/app";
 import { TestManagerBase } from "./test-manager-base";

extensions/ql-vscode/src/status-bar.ts

@@ -11,7 +11,7 @@ import {
   CUSTOM_CODEQL_PATH_SETTING,
   DistributionConfigListener,
 } from "./config";
-import { DisposableObject } from "./pure/disposable-object";
+import { DisposableObject } from "./common/disposable-object";
 
 /**
  * Creates and manages a status bar item for codeql. THis item contains

extensions/ql-vscode/src/variant-analysis/gh-api/mocks/mock-gh-api-server.ts

@@ -2,7 +2,7 @@ import { join, resolve } from "path";
 import { pathExists } from "fs-extra";
 import { setupServer, SetupServer } from "msw/node";
 
-import { DisposableObject } from "../../../pure/disposable-object";
+import { DisposableObject } from "../../../common/disposable-object";
 
 import { Recorder } from "./recorder";
 import { createRequestHandlers } from "./request-handlers";

extensions/ql-vscode/src/variant-analysis/gh-api/mocks/recorder.ts

@@ -8,7 +8,7 @@ import { IsomorphicResponse } from "@mswjs/interceptors";
 import { Headers } from "headers-polyfill";
 import fetch from "node-fetch";
 
-import { DisposableObject } from "../../../pure/disposable-object";
+import { DisposableObject } from "../../../common/disposable-object";
 
 import {
   GetVariantAnalysisRepoResultRequest,

extensions/ql-vscode/src/variant-analysis/gh-api/mocks/vscode-mock-gh-api-server.ts

@@ -5,7 +5,7 @@ import {
   getMockGitHubApiServerScenariosPath,
   MockGitHubApiConfigListener,
 } from "../../../config";
-import { DisposableObject } from "../../../pure/disposable-object";
+import { DisposableObject } from "../../../common/disposable-object";
 import { MockGitHubApiServer } from "./mock-gh-api-server";
 import { MockGitHubApiServerCommands } from "../../../common/commands";
 import { App, AppMode } from "../../../common/app";

extensions/ql-vscode/src/variant-analysis/variant-analysis-manager.ts

@@ -16,7 +16,7 @@ import {
   window as Window,
   workspace,
 } from "vscode";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { VariantAnalysisMonitor } from "./variant-analysis-monitor";
 import {
   getActionsWorkflowRunUrl,

extensions/ql-vscode/src/variant-analysis/variant-analysis-monitor.ts

@@ -10,7 +10,7 @@ import {
 } from "./shared/variant-analysis";
 import { VariantAnalysis as ApiVariantAnalysis } from "./gh-api/variant-analysis";
 import { processUpdatedVariantAnalysis } from "./variant-analysis-processor";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../common/disposable-object";
 import { sleep } from "../pure/time";
 import { getErrorMessage } from "../pure/helpers-pure";
 import { App } from "../common/app";

extensions/ql-vscode/src/variant-analysis/variant-analysis-results-manager.ts

@@ -14,7 +14,7 @@ import {
   VariantAnalysisRepositoryTask,
   VariantAnalysisScannedRepositoryResult,
 } from "./shared/variant-analysis";
-import { DisposableObject, DisposeHandler } from "../pure/disposable-object";
+import { DisposableObject, DisposeHandler } from "../common/disposable-object";
 import { EventEmitter } from "vscode";
 import { unzipFile } from "../pure/zip";
 import { readRepoTask, writeRepoTask } from "./repo-tasks-store";

extensions/ql-vscode/test/__mocks__/appMock.ts

@@ -1,7 +1,7 @@
 import { App, AppMode, EnvironmentContext } from "../../src/common/app";
 import { AppEvent, AppEventEmitter } from "../../src/common/events";
 import { Memento } from "../../src/common/memento";
-import { Disposable } from "../../src/pure/disposable-object";
+import { Disposable } from "../../src/common/disposable-object";
 import { createMockLogger } from "./loggerMock";
 import { createMockMemento } from "../mock-memento";
 import { testCredentialsWithStub } from "../factories/authentication";

extensions/ql-vscode/test/unit-tests/pure/disposable-object.test.ts

@@ -1,4 +1,4 @@
-import { DisposableObject } from "../../../src/pure/disposable-object";
+import { DisposableObject } from "../../../src/common/disposable-object";
 
 describe("DisposableObject and DisposeHandler", () => {
   const disposable1 = {

extensions/ql-vscode/test/vscode-tests/cli-integration/debugger/debug-controller.ts

@@ -8,7 +8,7 @@ import {
   workspace,
 } from "vscode";
 import * as CodeQLProtocol from "../../../../src/debugger/debug-protocol";
-import { DisposableObject } from "../../../../src/pure/disposable-object";
+import { DisposableObject } from "../../../../src/common/disposable-object";
 import { QueryResultType } from "../../../../src/pure/legacy-messages";
 import { CoreCompletedQuery } from "../../../../src/query-server/query-runner";
 import { QueryOutputDir } from "../../../../src/run-queries-shared";

extensions/ql-vscode/test/vscode-tests/disposable-bucket.ts

@@ -1,5 +1,5 @@
 import { Disposable } from "vscode";
-import { DisposableObject } from "../../src/pure/disposable-object";
+import { DisposableObject } from "../../src/common/disposable-object";
 
 /**
  * A simple disposable object that does nothing other than contain a list of disposable objects.

extensions/ql-vscode/test/vscode-tests/test-dispose-handler.ts

@@ -1,5 +1,5 @@
 import { Disposable } from "vscode";
-import { DisposableObject } from "../../src/pure/disposable-object";
+import { DisposableObject } from "../../src/common/disposable-object";
 
 export function testDisposeHandler(disposable: any & Disposable) {
   if (