Rust: restrict line and file counts to include only extracted source files

aibaars · aibaars · commit 62d0cf7e0d92 · 2025-05-28T19:55:13.000+02:00
diff --git a/rust/ql/src/queries/summary/NumberOfFilesExtractedWithErrors.ql b/rust/ql/src/queries/summary/NumberOfFilesExtractedWithErrors.ql
@@ -10,7 +10,7 @@
 
 import codeql.files.FileSystem
 
-select count(File f |
+select count(ExtractedFile f |
     exists(f.getRelativePath()) and
     not f instanceof SuccessfullyExtractedFile
   )
diff --git a/rust/ql/src/queries/summary/Stats.qll b/rust/ql/src/queries/summary/Stats.qll
@@ -35,7 +35,7 @@ int getLinesOfCode() { result = sum(File f | f.fromSource() | f.getNumberOfLines
  * Gets a count of the total number of lines of code from the source code directory in the database.
  */
 int getLinesOfUserCode() {
-  result = sum(File f | exists(f.getRelativePath()) | f.getNumberOfLinesOfCode())
+  result = sum(File f | f.fromSource() and exists(f.getRelativePath()) | f.getNumberOfLinesOfCode())
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`import codeql.files.FileSystem`
`12`	`12`
`13`		`-select count(File f \|`
	`13`	`+select count(ExtractedFile f \|`
`14`	`14`	`exists(f.getRelativePath()) and`
`15`	`15`	`not f instanceof SuccessfullyExtractedFile`
`16`	`16`	`)`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ int getLinesOfCode() { result = sum(File f \| f.fromSource() \| f.getNumberOfLines`
`35`	`35`	`* Gets a count of the total number of lines of code from the source code directory in the database.`
`36`	`36`	`*/`
`37`	`37`	`int getLinesOfUserCode() {`
`38`		`- result = sum(File f \| exists(f.getRelativePath()) \| f.getNumberOfLinesOfCode())`
	`38`	`+ result = sum(File f \| f.fromSource() and exists(f.getRelativePath()) \| f.getNumberOfLinesOfCode())`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`/**`