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

Merge pull request #2272 from github/robertbrignull/splitCommand/codeQL.monitorVariantAnalysis

Browse Source 
Split up codeQL.monitorVariantAnalysis command
This commit is contained in:
Robert
2023-04-05 15:35:21 +01:00
committed by GitHub
parent 1b43e989ab 3b7861edfc
commit e455e57124
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/ql-vscode/src/common/commands.ts
View File

@@ -198,7 +198,10 @@ export type VariantAnalysisCommands = {
variantAnalysisId: number, variantAnalysisId: number,
repositoryFullName: string, repositoryFullName: string,
) => Promise<VariantAnalysisScannedRepositoryResult>; ) => Promise<VariantAnalysisScannedRepositoryResult>;
"codeQL.monitorVariantAnalysis": ( "codeQL.monitorNewVariantAnalysis": (
variantAnalysis: VariantAnalysis,
) => Promise<void>;
"codeQL.monitorRehydratedVariantAnalysis": (
variantAnalysis: VariantAnalysis, variantAnalysis: VariantAnalysis,
) => Promise<void>; ) => Promise<void>;
"codeQL.openVariantAnalysisLogs": ( "codeQL.openVariantAnalysisLogs": (

9
extensions/ql-vscode/src/variant-analysis/variant-analysis-manager.ts
View File

@@ -140,7 +140,10 @@ export class VariantAnalysisManager
"codeQL.copyVariantAnalysisRepoList": "codeQL.copyVariantAnalysisRepoList":
this.copyRepoListToClipboard.bind(this), this.copyRepoListToClipboard.bind(this),
"codeQL.loadVariantAnalysisRepoResults": this.loadResults.bind(this), "codeQL.loadVariantAnalysisRepoResults": this.loadResults.bind(this),
"codeQL.monitorVariantAnalysis": this.monitorVariantAnalysis.bind(this), "codeQL.monitorNewVariantAnalysis":
this.monitorVariantAnalysis.bind(this),
"codeQL.monitorRehydratedVariantAnalysis":
this.monitorVariantAnalysis.bind(this),
"codeQL.openVariantAnalysisLogs": this.openVariantAnalysisLogs.bind(this), "codeQL.openVariantAnalysisLogs": this.openVariantAnalysisLogs.bind(this),
"codeQL.openVariantAnalysisView": this.showView.bind(this), "codeQL.openVariantAnalysisView": this.showView.bind(this),
"codeQL.runVariantAnalysis": "codeQL.runVariantAnalysis":
@@ -248,7 +251,7 @@ export class VariantAnalysisManager
processedVariantAnalysis.id, processedVariantAnalysis.id,
); );
void this.app.commands.execute( void this.app.commands.execute(
"codeQL.monitorVariantAnalysis", "codeQL.monitorNewVariantAnalysis",
processedVariantAnalysis, processedVariantAnalysis,
); );
} }
@@ -278,7 +281,7 @@ export class VariantAnalysisManager
)) ))
) { ) {
void this.app.commands.execute( void this.app.commands.execute(
"codeQL.monitorVariantAnalysis", "codeQL.monitorRehydratedVariantAnalysis",
variantAnalysis, variantAnalysis,
); );
} }

2
extensions/ql-vscode/test/vscode-tests/activated-extension/variant-analysis/variant-analysis-manager.test.ts
View File

@@ -516,7 +516,7 @@ describe("Variant Analysis Manager", () => {
variantAnalysis, variantAnalysis,
); );
expect(executeCommandSpy).toHaveBeenCalledWith( expect(executeCommandSpy).toHaveBeenCalledWith(
"codeQL.monitorVariantAnalysis", "codeQL.monitorRehydratedVariantAnalysis",
expect.anything(), expect.anything(),
); );
}); });

8
extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-manager.test.ts
View File

@@ -128,7 +128,7 @@ describe("Variant Analysis Manager", () => {
); );
expect(executeCommandSpy).toBeCalledWith( expect(executeCommandSpy).toBeCalledWith(
"codeQL.monitorVariantAnalysis", "codeQL.monitorNewVariantAnalysis",
expect.objectContaining({ expect.objectContaining({
id: mockApiResponse.id, id: mockApiResponse.id,
status: VariantAnalysisStatus.InProgress, status: VariantAnalysisStatus.InProgress,
@@ -149,7 +149,7 @@ describe("Variant Analysis Manager", () => {
); );
expect(executeCommandSpy).toBeCalledWith( expect(executeCommandSpy).toBeCalledWith(
"codeQL.monitorVariantAnalysis", "codeQL.monitorNewVariantAnalysis",
expect.objectContaining({ expect.objectContaining({
id: mockApiResponse.id, id: mockApiResponse.id,
status: VariantAnalysisStatus.InProgress, status: VariantAnalysisStatus.InProgress,
@@ -170,7 +170,7 @@ describe("Variant Analysis Manager", () => {
); );
expect(executeCommandSpy).toBeCalledWith( expect(executeCommandSpy).toBeCalledWith(
"codeQL.monitorVariantAnalysis", "codeQL.monitorNewVariantAnalysis",
expect.objectContaining({ expect.objectContaining({
id: mockApiResponse.id, id: mockApiResponse.id,
status: VariantAnalysisStatus.InProgress, status: VariantAnalysisStatus.InProgress,
@@ -293,7 +293,7 @@ describe("Variant Analysis Manager", () => {
expect(mockSubmitVariantAnalysis).toBeCalledTimes(1); expect(mockSubmitVariantAnalysis).toBeCalledTimes(1);
expect(executeCommandSpy).toBeCalledWith( expect(executeCommandSpy).toBeCalledWith(
"codeQL.monitorVariantAnalysis", "codeQL.monitorNewVariantAnalysis",
expect.objectContaining({ expect.objectContaining({
query: expect.objectContaining({ filePath: fileUri.fsPath }), query: expect.objectContaining({ filePath: fileUri.fsPath }),
}), }),