Merge pull request #16904 from igfoo/igfoo/shouldExtract

erik-krogh · web-flow · commit 1c0c51faaf2c · 2024-07-04T12:44:54.000+02:00
JS: Remove call to shouldExtract
diff --git a/javascript/extractor/src/com/semmle/js/extractor/Main.java b/javascript/extractor/src/com/semmle/js/extractor/Main.java
@@ -527,7 +527,6 @@ private void collectFiles(File root, boolean explicit) {
       // extract files that are supported, match the layout (if any), pass the includeMatcher,
       // and do not pass the excludeMatcher
       if (fileExtractor.supports(root)
-          && extractorOutputConfig.shouldExtract(root)
           && (explicit || includeMatcher.matches(path) && !excludeMatcher.matches(path))) {
         files.add(normalizeFile(root));
       }

Original file line number	Diff line number	Diff line change
`@@ -527,7 +527,6 @@ private void collectFiles(File root, boolean explicit) {`
`527`	`527`	`// extract files that are supported, match the layout (if any), pass the includeMatcher,`
`528`	`528`	`// and do not pass the excludeMatcher`
`529`	`529`	`if (fileExtractor.supports(root)`
`530`		`- && extractorOutputConfig.shouldExtract(root)`
`531`	`530`	`&& (explicit \|\| includeMatcher.matches(path) && !excludeMatcher.matches(path))) {`
`532`	`531`	`files.add(normalizeFile(root));`
`533`	`532`	`}`