Move archive-filesystem-provider.ts to /common/vscode/archive-filesystem-provider.ts

Author: charisk

…scode/src/archive-filesystem-provider.ts …on/vscode/archive-filesystem-provider.tsextensions/ql-vscode/src/archive-filesystem-provider.ts renamed to extensions/ql-vscode/src/common/vscode/archive-filesystem-provider.ts extensions/ql-vscode/src/archive-filesystem-provider.ts renamed to extensions/ql-vscode/src/common/vscode/archive-filesystem-provider.ts

@@ -1,7 +1,7 @@
 import { pathExists } from "fs-extra";
 import * as unzipper from "unzipper";
 import * as vscode from "vscode";
-import { extLogger } from "./common";
+import { extLogger } from "..";
 
 // All path operations in this file must be on paths *within* the zip
 // archive.

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

@@ -19,7 +19,7 @@ import {
   encodeArchiveBasePath,
   decodeSourceArchiveUri,
   encodeSourceArchiveUri,
-} from "../archive-filesystem-provider";
+} from "../common/vscode/archive-filesystem-provider";
 import { DisposableObject } from "../pure/disposable-object";
 import { Logger, extLogger } from "../common";
 import { asError, getErrorMessage } from "../pure/helpers-pure";

extensions/ql-vscode/src/extension.ts

@@ -23,7 +23,7 @@ import { watch } from "chokidar";
 import {
   activate as archiveFilesystemProvider_activate,
   zipArchiveScheme,
-} from "./archive-filesystem-provider";
+} from "./common/vscode/archive-filesystem-provider";
 import { CodeQLCliServer } from "./codeql-cli/cli";
 import {
   CliConfigListener,

extensions/ql-vscode/src/language-support/contextual/location-finder.ts

@@ -1,7 +1,7 @@
 import {
   decodeSourceArchiveUri,
   encodeArchiveBasePath,
-} from "../../archive-filesystem-provider";
+} from "../../common/vscode/archive-filesystem-provider";
 import {
   ColumnKindCode,
   EntityValue,

extensions/ql-vscode/src/language-support/contextual/template-provider.ts

@@ -14,7 +14,7 @@ import {
   decodeSourceArchiveUri,
   encodeArchiveBasePath,
   zipArchiveScheme,
-} from "../../archive-filesystem-provider";
+} from "../../common/vscode/archive-filesystem-provider";
 import { CodeQLCliServer } from "../../codeql-cli/cli";
 import { DatabaseManager } from "../../databases/local-databases";
 import { CachedOperation } from "../../helpers";

extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-databases.test.ts

@@ -18,7 +18,7 @@ import { CodeQLCliServer, DbInfo } from "../../../src/codeql-cli/cli";
 import {
   encodeArchiveBasePath,
   encodeSourceArchiveUri,
-} from "../../../src/archive-filesystem-provider";
+} from "../../../src/common/vscode/archive-filesystem-provider";
 import { testDisposeHandler } from "../test-dispose-handler";
 import { QueryRunner } from "../../../src/query-server/query-runner";
 import * as helpers from "../../../src/helpers";

…pace/archive-filesystem-provider.test.ts …code/archive-filesystem-provider.test.tsextensions/ql-vscode/test/vscode-tests/no-workspace/archive-filesystem-provider.test.ts renamed to extensions/ql-vscode/test/vscode-tests/no-workspace/common/vscode/archive-filesystem-provider.test.ts extensions/ql-vscode/test/vscode-tests/no-workspace/archive-filesystem-provider.test.ts renamed to extensions/ql-vscode/test/vscode-tests/no-workspace/common/vscode/archive-filesystem-provider.test.ts

@@ -7,7 +7,7 @@ import {
   decodeSourceArchiveUri,
   ZipFileReference,
   zipArchiveScheme,
-} from "../../../src/archive-filesystem-provider";
+} from "../../../../../src/common/vscode/archive-filesystem-provider";
 import { FileType, FileSystemError, Uri } from "vscode";
 
 describe("archive-filesystem-provider", () => {
@@ -16,7 +16,7 @@ describe("archive-filesystem-provider", () => {
     const uri = encodeSourceArchiveUri({
       sourceArchiveZipPath: resolve(
         __dirname,
-        "data/archive-filesystem-provider-test/single_file.zip",
+        "../../data/archive-filesystem-provider-test/single_file.zip",
       ),
       pathWithinSourceArchive: "/aFileName.txt",
     });
@@ -29,7 +29,7 @@ describe("archive-filesystem-provider", () => {
     const uri = encodeSourceArchiveUri({
       sourceArchiveZipPath: resolve(
         __dirname,
-        "data/archive-filesystem-provider-test/zip_with_folder.zip",
+        "../../data/archive-filesystem-provider-test/zip_with_folder.zip",
       ),
       pathWithinSourceArchive: "folder1/textFile.txt",
     });
@@ -42,7 +42,7 @@ describe("archive-filesystem-provider", () => {
     const uri = encodeSourceArchiveUri({
       sourceArchiveZipPath: resolve(
         __dirname,
-        "data/archive-filesystem-provider-test/zip_with_folder.zip",
+        "../../data/archive-filesystem-provider-test/zip_with_folder.zip",
       ),
       pathWithinSourceArchive: "folder1",
     });
@@ -59,7 +59,7 @@ describe("archive-filesystem-provider", () => {
     const uri = encodeSourceArchiveUri({
       sourceArchiveZipPath: resolve(
         __dirname,
-        "data/archive-filesystem-provider-test/zip_with_folder.zip",
+        "../../data/archive-filesystem-provider-test/zip_with_folder.zip",
       ),
       pathWithinSourceArchive: "folder1/not-here",
     });
@@ -76,7 +76,7 @@ describe("archive-filesystem-provider", () => {
     const uri = encodeSourceArchiveUri({
       sourceArchiveZipPath: resolve(
         __dirname,
-        "data/archive-filesystem-provider-test/zip_with_folder.zip",
+        "../../data/archive-filesystem-provider-test/zip_with_folder.zip",
       ),
       pathWithinSourceArchive: "folder1/not-here",
     });
@@ -93,7 +93,7 @@ describe("archive-filesystem-provider", () => {
     const uri = encodeSourceArchiveUri({
       sourceArchiveZipPath: resolve(
         __dirname,
-        "data/archive-filesystem-provider-test/zip_with_folder.zip",
+        "../../data/archive-filesystem-provider-test/zip_with_folder.zip",
       ),
       pathWithinSourceArchive: "folder1/textFile.txt",
     });
@@ -110,7 +110,7 @@ describe("archive-filesystem-provider", () => {
     const uri = encodeSourceArchiveUri({
       sourceArchiveZipPath: resolve(
         __dirname,
-        "data/archive-filesystem-provider-test/zip_with_folder.zip",
+        "../../data/archive-filesystem-provider-test/zip_with_folder.zip",
       ),
       pathWithinSourceArchive: "folder1/folder2",
     });
@@ -127,7 +127,7 @@ describe("archive-filesystem-provider", () => {
     const uri = encodeSourceArchiveUri({
       sourceArchiveZipPath: resolve(
         __dirname,
-        "data/archive-filesystem-provider-test/zip_with_folder.zip",
+        "../../data/archive-filesystem-provider-test/zip_with_folder.zip",
       ),
       pathWithinSourceArchive: "folder1/folder2",
     });