mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Charis Kyriakou
2023-04-28 07:47:17 +00:00
parent d1db456e2e
commit 8500f20c2b
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/ql-vscode/src/archive-filesystem-provider.ts → extensions/ql-vscode/src/common/vscode/archive-filesystem-provider.ts
View File

@@ -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.

2
extensions/ql-vscode/src/databases/local-databases.ts
View File

@@ -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";

2
extensions/ql-vscode/src/extension.ts
View File

@@ -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,

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

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

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

@@ -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";

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

@@ -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";

18
extensions/ql-vscode/test/vscode-tests/no-workspace/archive-filesystem-provider.test.ts → extensions/ql-vscode/test/vscode-tests/no-workspace/common/vscode/archive-filesystem-provider.test.ts
View File

@@ -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",
});