Java: report any extracted file as successfully extracted

github · Dec 1, 2023 · ad713a7 · ad713a7
1 parent 4ef1fe4
commit ad713a7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/java/ql/src/Diagnostics/DiagnosticsReporting.qll b/java/ql/src/Diagnostics/DiagnosticsReporting.qll
@@ -79,12 +79,16 @@ predicate reportableErrors(Diagnostic d, string msg, int sev) {
  */
 predicate reportableWarnings(Diagnostic d, string msg, int sev) { knownWarnings(d, msg, sev) }
 
+/**
+ * Holds if compilation unit `f` is a source file.
+ */
+predicate extracted(CompilationUnit f) { exists(f.getRelativePath()) and f.fromSource() }
+
 /**
  * Holds if compilation unit `f` is a source file that has
  * no relevant extraction diagnostics associated with it.
  */
 predicate successfullyExtracted(CompilationUnit f) {
- not exists(Diagnostic d | reportableDiagnostics(d, _, _) and d.getLocation().getFile() = f) and
- exists(f.getRelativePath()) and
- f.fromSource()
+ extracted(f) and
+ not exists(Diagnostic d | reportableDiagnostics(d, _, _) and d.getLocation().getFile() = f)
 }
diff --git a/java/ql/src/Diagnostics/SuccessfullyExtractedFiles.ql b/java/ql/src/Diagnostics/SuccessfullyExtractedFiles.ql
@@ -1,7 +1,7 @@
 /**
- * @name Successfully extracted files
+ * @name Extracted files
  * @description A list of all files in the source code directory that
- * were extracted without encountering an error in the file.
+ * were extracted.
  * @kind diagnostic
  * @id java/diagnostics/successfully-extracted-files
  * @tags successfully-extracted-files
@@ -11,5 +11,5 @@ import java
 import DiagnosticsReporting
 
 from CompilationUnit f
-where successfullyExtracted(f)
+where extracted(f)
 select f, ""