Skip to content

Commit e460fa2

Browse files
committed
Tidy up createdDBForScannedLanguages
Now the test is fixed, we can simplify by introducing an async call.
1 parent 6d34731 commit e460fa2

6 files changed

Lines changed: 8 additions & 17 deletions

File tree

lib/analyze.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/analyze.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/analyze.test.js

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/analyze.test.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/analyze.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,6 @@ for (const options of [
509509
await createdDBForScannedLanguages(
510510
codeqlObject,
511511
stubConfig,
512-
false, // Disable Go extraction reconciliation
513512
getRunnerLogger(true),
514513
createFeatureFlags(options.featureFlags)
515514
);

src/analyze.ts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ async function setupPythonExtractor(logger: Logger) {
121121
export async function createdDBForScannedLanguages(
122122
codeql: CodeQL,
123123
config: configUtils.Config,
124-
isGoExtractionReconciliationEnabled: boolean,
125124
logger: Logger,
126125
featureFlags: FeatureFlags
127126
) {
@@ -133,7 +132,7 @@ export async function createdDBForScannedLanguages(
133132
if (
134133
isScannedLanguage(
135134
language,
136-
isGoExtractionReconciliationEnabled,
135+
await util.isGoExtractionReconciliationEnabled(featureFlags),
137136
logger
138137
) &&
139138
!dbIsFinalized(config, language, logger)
@@ -179,13 +178,7 @@ async function finalizeDatabaseCreation(
179178
const codeql = await getCodeQL(config.codeQLCmd);
180179

181180
const extractionStart = performance.now();
182-
await createdDBForScannedLanguages(
183-
codeql,
184-
config,
185-
await util.isGoExtractionReconciliationEnabled(featureFlags),
186-
logger,
187-
featureFlags
188-
);
181+
await createdDBForScannedLanguages(codeql, config, logger, featureFlags);
189182
const extractionTime = performance.now() - extractionStart;
190183

191184
const trapImportStart = performance.now();

0 commit comments

Comments
 (0)