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

Merge branch 'main' into elenatanasoiu/add-batching-to-download-take-two

Browse Source
This commit is contained in:
Elena Tanasoiu
2022-10-17 16:20:31 +01:00
parent 31a97897c8 4fd9b54c58
commit 25b71e8651
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/ql-vscode/src/remote-queries/variant-analysis-manager.ts
View File

@@ -42,7 +42,7 @@ export class VariantAnalysisManager extends DisposableObject implements VariantA
logger: Logger,
) {
super();
this.variantAnalysisMonitor = this.push(new VariantAnalysisMonitor(ctx, logger));
this.variantAnalysisMonitor = this.push(new VariantAnalysisMonitor(ctx));
this.variantAnalysisMonitor.onVariantAnalysisChange(this.onVariantAnalysisUpdated.bind(this));
this.variantAnalysisResultsManager = this.push(new VariantAnalysisResultsManager(cliServer, storagePath, logger));

4
extensions/ql-vscode/src/remote-queries/variant-analysis-monitor.ts
View File

@@ -1,6 +1,5 @@
import { ExtensionContext, CancellationToken, commands, EventEmitter } from 'vscode';
import { Credentials } from '../authentication';
import { Logger } from '../logging';
import * as ghApiClient from './gh-api/gh-api-client';
import { VariantAnalysis, VariantAnalysisStatus } from './shared/variant-analysis';
@@ -23,7 +22,6 @@ export class VariantAnalysisMonitor extends DisposableObject {
constructor(
private readonly extensionContext: ExtensionContext,
private readonly logger: Logger
) {
super();
}
@@ -74,8 +72,6 @@ export class VariantAnalysisMonitor extends DisposableObject {
this._onVariantAnalysisChange.fire(variantAnalysis);
void this.logger.log('****** Retrieved variant analysis' + JSON.stringify(variantAnalysisSummary));
const downloadedRepos = this.downloadVariantAnalysisResults(variantAnalysisSummary, scannedReposDownloaded);
scannedReposDownloaded.push(...downloadedRepos);

4
extensions/ql-vscode/src/vscode-tests/cli-integration/remote-queries/variant-analysis-monitor.test.ts
View File

@@ -2,7 +2,6 @@ import * as sinon from 'sinon';
import { expect } from 'chai';
import { CancellationTokenSource, commands, extensions } from 'vscode';
import { CodeQLExtensionInterface } from '../../../extension';
import { logger } from '../../../logging';
import * as config from '../../../config';
import * as ghApiClient from '../../../remote-queries/gh-api/gh-api-client';
@@ -34,7 +33,6 @@ describe('Variant Analysis Monitor', async function() {
beforeEach(async () => {
sandbox = sinon.createSandbox();
sandbox.stub(logger, 'log');
sandbox.stub(config, 'isVariantAnalysisLiveResultsEnabled').returns(false);
cancellationTokenSource = new CancellationTokenSource();
@@ -43,7 +41,7 @@ describe('Variant Analysis Monitor', async function() {
try {
extension = await extensions.getExtension<CodeQLExtensionInterface | Record<string, never>>('GitHub.vscode-codeql')!.activate();
variantAnalysisMonitor = new VariantAnalysisMonitor(extension.ctx, logger);
variantAnalysisMonitor = new VariantAnalysisMonitor(extension.ctx);
} catch (e) {
fail(e as Error);
}