hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-01-06 03:00:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

JS: Add shouldExtract predicate

Browse Source
This commit is contained in:
Asger Feldthaus
2020-06-26 13:04:54 +01:00
parent 164a18f02d
commit ea6b99e726
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
View File

@@ -29,6 +29,7 @@ import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -609,7 +610,8 @@ public class AutoBuild {
// extract remaining files
extractFiles(
filesToExtract, extractedFiles, defaultExtractor, customExtractors, hasTypeScriptFiles);
filesToExtract, extractedFiles, defaultExtractor, customExtractors,
f -> !(hasTypeScriptFiles && isFileDerivedFromTypeScriptFile(f, extractedFiles)));
}
private void extractFiles(
@@ -617,12 +619,12 @@ public class AutoBuild {
Set<Path> extractedFiles,
FileExtractor defaultExtractor,
Map<String, FileExtractor> customExtractors,
boolean hasTypeScriptFiles) {
Predicate<Path> shouldExtract) {
for (Path f : filesToExtract) {
if (extractedFiles.contains(f))
continue;
if (hasTypeScriptFiles && isFileDerivedFromTypeScriptFile(f, extractedFiles)) {
if (!shouldExtract.test(f)) {
continue;
}
extractedFiles.add(f);