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

Merge pull request #2379 from github/charisk/move-packaging-files

Browse Source 
Move packaging files
This commit is contained in:
Charis Kyriakou
2023-04-27 12:51:02 +01:00
committed by GitHub
parent 29d04837ab 287a2d1ef2
commit 84f482fcb7
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
extensions/ql-vscode/src/packaging/index.ts Normal file
View File

@@ -0,0 +1 @@
export * from "./packaging";

16
extensions/ql-vscode/src/packaging.ts → extensions/ql-vscode/src/packaging/packaging.ts
View File

@@ -1,20 +1,20 @@
import { CodeQLCliServer } from "./cli";
import { CodeQLCliServer } from "../cli";
import {
getOnDiskWorkspaceFolders,
showAndLogExceptionWithTelemetry,
showAndLogInformationMessage,
} from "./helpers";
} from "../helpers";
import { QuickPickItem, window } from "vscode";
import {
ProgressCallback,
UserCancellationException,
withProgress,
} from "./progress";
import { extLogger } from "./common";
import { asError, getErrorStack } from "./pure/helpers-pure";
import { redactableError } from "./pure/errors";
import { PACKS_BY_QUERY_LANGUAGE } from "./common/query-language";
import { PackagingCommands } from "./common/commands";
} from "../progress";
import { extLogger } from "../common";
import { asError, getErrorStack } from "../pure/helpers-pure";
import { redactableError } from "../pure/errors";
import { PACKS_BY_QUERY_LANGUAGE } from "../common/query-language";
import { PackagingCommands } from "../common/commands";
type PackagingOptions = {
cliServer: CodeQLCliServer;

16
extensions/ql-vscode/test/vscode-tests/cli-integration/packaging.test.ts → extensions/ql-vscode/test/vscode-tests/cli-integration/packaging/packaging.test.ts
View File

@@ -1,16 +1,16 @@
import { window } from "vscode";
import { join } from "path";
import { CodeQLCliServer } from "../../../src/cli";
import { getErrorMessage } from "../../../src/pure/helpers-pure";
import { CodeQLCliServer } from "../../../../src/cli";
import { getErrorMessage } from "../../../../src/pure/helpers-pure";
import * as helpers from "../../../src/helpers";
import * as helpers from "../../../../src/helpers";
import {
handleDownloadPacks,
handleInstallPackDependencies,
} from "../../../src/packaging";
import { mockedQuickPickItem } from "../utils/mocking.helpers";
import { getActivatedExtension } from "../global.helper";
} from "../../../../src/packaging";
import { mockedQuickPickItem } from "../../utils/mocking.helpers";
import { getActivatedExtension } from "../../global.helper";
describe("Packaging commands", () => {
let cli: CodeQLCliServer;
@@ -82,7 +82,7 @@ describe("Packaging commands", () => {
});
it("should install valid workspace pack", async () => {
const rootDir = join(__dirname, "./data");
const rootDir = join(__dirname, "../data");
quickPickSpy.mockResolvedValue(
mockedQuickPickItem([
{
@@ -99,7 +99,7 @@ describe("Packaging commands", () => {
});
it("should throw an error when installing invalid workspace pack", async () => {
const rootDir = join(__dirname, "../data-invalid-pack");
const rootDir = join(__dirname, "../../data-invalid-pack");
quickPickSpy.mockResolvedValue(
mockedQuickPickItem([
{