Move files.ts to /common

robertbrignull · robertbrignull · commit 1ced7a90fd7c · 2023-06-21T09:06:38.000+01:00
diff --git a/extensions/ql-vscode/src/codeql-cli/cli.ts b/extensions/ql-vscode/src/codeql-cli/cli.ts
@@ -22,7 +22,7 @@ import {
   getErrorMessage,
   getErrorStack,
 } from "../pure/helpers-pure";
-import { walkDirectory } from "../pure/files";
+import { walkDirectory } from "../common/files";
 import { QueryMetadata, SortDirection } from "../pure/interface-types";
 import { BaseLogger, Logger, ProgressReporter } from "../common";
 import { CompilationMessage } from "../pure/legacy-messages";
diff --git a/extensions/ql-vscode/src/common/files.ts b/extensions/ql-vscode/src/common/files.ts
diff --git a/extensions/ql-vscode/src/common/vscode/file-path-discovery.ts b/extensions/ql-vscode/src/common/vscode/file-path-discovery.ts
@@ -11,7 +11,7 @@ import { MultiFileSystemWatcher } from "./multi-file-system-watcher";
 import { AppEventEmitter } from "../events";
 import { extLogger } from "..";
 import { lstat } from "fs-extra";
-import { containsPath, isIOError } from "../../pure/files";
+import { containsPath, isIOError } from "../files";
 import {
   getOnDiskWorkspaceFolders,
   getOnDiskWorkspaceFoldersObjects,
diff --git a/extensions/ql-vscode/src/data-extensions-editor/extension-pack-picker.ts b/extensions/ql-vscode/src/data-extensions-editor/extension-pack-picker.ts
@@ -14,7 +14,7 @@ import { getQlPackPath, QLPACK_FILENAMES } from "../pure/ql";
 import { getErrorMessage } from "../pure/helpers-pure";
 import { ExtensionPack, ExtensionPackModelFile } from "./shared/extension-pack";
 import { NotificationLogger, showAndLogErrorMessage } from "../common/logging";
-import { containsPath } from "../pure/files";
+import { containsPath } from "../common/files";
 
 const maxStep = 3;
 
diff --git a/extensions/ql-vscode/src/databases/local-databases/database-item-impl.ts b/extensions/ql-vscode/src/databases/local-databases/database-item-impl.ts
@@ -12,7 +12,7 @@ import {
 import { DatabaseItem, PersistedDatabaseItem } from "./database-item";
 import { isLikelyDatabaseRoot } from "./db-contents-heuristics";
 import { stat } from "fs-extra";
-import { containsPath, pathsEqual } from "../../pure/files";
+import { containsPath, pathsEqual } from "../../common/files";
 import { DatabaseContents } from "./database-contents";
 
 export class DatabaseItemImpl implements DatabaseItem {
diff --git a/extensions/ql-vscode/src/databases/local-databases/database-manager.ts b/extensions/ql-vscode/src/databases/local-databases/database-manager.ts
@@ -26,7 +26,7 @@ import { asError, getErrorMessage } from "../../pure/helpers-pure";
 import { DatabaseItem, PersistedDatabaseItem } from "./database-item";
 import { redactableError } from "../../common/errors";
 import { remove } from "fs-extra";
-import { containsPath } from "../../pure/files";
+import { containsPath } from "../../common/files";
 import { DatabaseChangedEvent, DatabaseEventKind } from "./database-events";
 import { DatabaseResolver } from "./database-resolver";
 import { telemetryListener } from "../../common/vscode/telemetry";
diff --git a/extensions/ql-vscode/src/local-queries/local-queries.ts b/extensions/ql-vscode/src/local-queries/local-queries.ts
@@ -14,7 +14,7 @@ import {
 } from "vscode";
 import { TeeLogger } from "../common";
 import { isCanary, MAX_QUERIES } from "../config";
-import { gatherQlFiles } from "../pure/files";
+import { gatherQlFiles } from "../common/files";
 import { basename } from "path";
 import { showBinaryChoiceDialog } from "../common/vscode/dialog";
 import { getOnDiskWorkspaceFolders } from "../common/vscode/workspace-folders";
diff --git a/extensions/ql-vscode/src/queries-panel/query-discovery.ts b/extensions/ql-vscode/src/queries-panel/query-discovery.ts
@@ -8,7 +8,7 @@ import {
 } from "../common/file-tree-nodes";
 import { QueryDiscoverer } from "./query-tree-data-provider";
 import { FilePathDiscovery } from "../common/vscode/file-path-discovery";
-import { containsPath } from "../pure/files";
+import { containsPath } from "../common/files";
 import { getOnDiskWorkspaceFoldersObjects } from "../common/vscode/workspace-folders";
 import { QueryLanguage } from "../common/query-language";
 
diff --git a/extensions/ql-vscode/src/queries-panel/query-pack-discovery.ts b/extensions/ql-vscode/src/queries-panel/query-pack-discovery.ts
@@ -7,7 +7,7 @@ import { FilePathDiscovery } from "../common/vscode/file-path-discovery";
 import { getErrorMessage } from "../pure/helpers-pure";
 import { extLogger } from "../common";
 import { EOL } from "os";
-import { containsPath } from "../pure/files";
+import { containsPath } from "../common/files";
 import { getOnDiskWorkspaceFolders } from "../common/vscode/workspace-folders";
 
 export interface QueryPack {
diff --git a/extensions/ql-vscode/src/query-history/query-history-scrubber.ts b/extensions/ql-vscode/src/query-history/query-history-scrubber.ts
@@ -3,7 +3,7 @@ import { EOL } from "os";
 import { join } from "path";
 import { Disposable, ExtensionContext } from "vscode";
 import { extLogger } from "../common";
-import { readDirFullPaths } from "../pure/files";
+import { readDirFullPaths } from "../common/files";
 import { QueryHistoryDirs } from "./query-history-dirs";
 import { QueryHistoryManager } from "./query-history-manager";
 
diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/mock-gh-api-server.ts b/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/mock-gh-api-server.ts
@@ -6,7 +6,7 @@ import { DisposableObject } from "../../../common/disposable-object";
 
 import { Recorder } from "./recorder";
 import { createRequestHandlers } from "./request-handlers";
-import { getDirectoryNamesInsidePath } from "../../../pure/files";
+import { getDirectoryNamesInsidePath } from "../../../common/files";
 
 /**
  * Enables mocking of the GitHub API server via HTTP interception, using msw.
diff --git a/extensions/ql-vscode/test/matchers/toEqualPath.ts b/extensions/ql-vscode/test/matchers/toEqualPath.ts
@@ -1,6 +1,6 @@
 import { expect } from "@jest/globals";
 import type { MatcherFunction } from "expect";
-import { pathsEqual } from "../../src/pure/files";
+import { pathsEqual } from "../../src/common/files";
 
 const toEqualPath: MatcherFunction<[expectedPath: unknown]> = function (
   actual,
diff --git a/extensions/ql-vscode/test/unit-tests/pure/files.test.ts b/extensions/ql-vscode/test/unit-tests/pure/files.test.ts
@@ -7,7 +7,7 @@ import {
   pathsEqual,
   readDirFullPaths,
   walkDirectory,
-} from "../../../src/pure/files";
+} from "../../../src/common/files";
 import { DirResult } from "tmp";
 import * as tmp from "tmp";
 import { ensureDirSync, symlinkSync, writeFileSync } from "fs-extra";
diff --git a/extensions/ql-vscode/test/vscode-tests/minimal-workspace/common/vscode/file-path-discovery.test.ts b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/common/vscode/file-path-discovery.test.ts
@@ -10,7 +10,7 @@ import { FilePathDiscovery } from "../../../../../src/common/vscode/file-path-di
 import { basename, dirname, join } from "path";
 import { mkdirSync, readFileSync, rmSync, writeFileSync } from "fs";
 import * as tmp from "tmp";
-import { normalizePath } from "../../../../../src/pure/files";
+import { normalizePath } from "../../../../../src/common/files";
 
 interface TestData {
   path: string;
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/variant-analysis-history.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/variant-analysis-history.test.ts
@@ -11,7 +11,7 @@ import { join } from "path";
 import { ExtensionContext, Uri } from "vscode";
 import { DatabaseManager } from "../../../../src/databases/local-databases";
 import { tmpDir } from "../../../../src/tmp-dir";
-import { walkDirectory } from "../../../../src/pure/files";
+import { walkDirectory } from "../../../../src/common/files";
 import { DisposableBucket } from "../../disposable-bucket";
 import { testDisposeHandler } from "../../test-dispose-handler";
 import { HistoryItemLabelProvider } from "../../../../src/query-history/history-item-label-provider";
