Kotlin: Add a "generted by" field to the diagnostics table

igfoo · igfoo · commit 8853489f04a3 · 2022-05-10T19:51:01.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/Logger.kt b/java/kotlin-extractor/src/main/kotlin/utils/Logger.kt
@@ -84,7 +84,7 @@ open class Logger(val logCounter: LogCounter, open val tw: TrapWriter) {
                 }
             }
         val ts = timestamp()
-        tw.writeDiagnostics(StarLabel(), severity.sev, "", msg, "$ts $msg\n$suffix", locationId)
+        tw.writeDiagnostics(StarLabel(), "CodeQL Kotlin extractor", severity.sev, "", msg, "$ts $msg\n$suffix", locationId)
         val locStr = if (locationString == null) "" else "At " + locationString + ": "
         print("$ts Warning($warningLocStr): $locStr$msg\n$suffix")
     }
diff --git a/java/ql/consistency-queries/locations.ql b/java/ql/consistency-queries/locations.ql
@@ -20,7 +20,7 @@ Location unusedLocation() {
   not exists(Top t | t.getLocation() = result) and
   not exists(XMLLocatable x | x.getLocation() = result) and
   not exists(ConfigLocatable c | c.getLocation() = result) and
-  not exists(@diagnostic d | diagnostics(d, _, _, _, _, result)) and
+  not exists(@diagnostic d | diagnostics(d, _, _, _, _, _, result)) and
   not (result.getFile().getExtension() = "xml" and
        result.getStartLine() = 0 and
        result.getStartColumn() = 0 and
diff --git a/java/ql/lib/config/semmlecode.dbscheme b/java/ql/lib/config/semmlecode.dbscheme
@@ -140,6 +140,7 @@ compilation_finished(
 
 diagnostics(
     unique int id: @diagnostic,
+    string generated_by: string ref, // TODO: Sync this with CPP?
     int severity: int ref,
     string error_tag: string ref,
     string error_message: string ref,
diff --git a/java/ql/src/Diagnostics/DiagnosticsReporting.qll b/java/ql/src/Diagnostics/DiagnosticsReporting.qll
@@ -12,27 +12,27 @@ private int getWarnSeverity() { result = 1 }
 
 private predicate knownWarnings(@diagnostic d, string msg, int sev) {
   exists(string filename |
-    diagnostics(d, 2, _, "Skipping Lombok-ed source file: " + filename, _, _) and
+    diagnostics(d, _, 2, _, "Skipping Lombok-ed source file: " + filename, _, _) and
     msg = "Use of Lombok detected. Skipping file: " + filename and
     sev = getWarnSeverity()
   )
 }
 
 private predicate knownErrors(@diagnostic d, string msg, int sev) {
   exists(string numErr, Location l |
-    diagnostics(d, 6, _, numErr, _, l) and
+    diagnostics(d, _, 6, _, numErr, _, l) and
     msg = "Frontend errors in file: " + l.getFile().getAbsolutePath() + " (" + numErr + ")" and
     sev = getErrorSeverity()
   )
   or
   exists(string filename, Location l |
-    diagnostics(d, 7, _, "Exception compiling file " + filename, _, l) and
+    diagnostics(d, _, 7, _, "Exception compiling file " + filename, _, l) and
     msg = "Extraction incomplete in file: " + filename and
     sev = getErrorSeverity()
   )
   or
   exists(string errMsg, Location l |
-    diagnostics(d, 8, _, errMsg, _, l) and
+    diagnostics(d, _, 8, _, errMsg, _, l) and
     msg = "Severe error: " + errMsg and
     sev = getErrorSeverity()
   )
@@ -41,7 +41,7 @@ private predicate knownErrors(@diagnostic d, string msg, int sev) {
 private predicate unknownErrors(@diagnostic d, string msg, int sev) {
   not knownErrors(d, _, _) and
   exists(Location l, File f, int diagSev |
-    diagnostics(d, diagSev, _, _, _, l) and l.getFile() = f and diagSev > 3
+    diagnostics(d, _, diagSev, _, _, _, l) and l.getFile() = f and diagSev > 3
   |
     exists(f.getRelativePath()) and
     msg = "Unknown errors in file: " + f.getAbsolutePath() + " (" + diagSev + ")" and
@@ -77,7 +77,7 @@ predicate reportableWarnings(@diagnostic d, string msg, int sev) { knownWarnings
  */
 predicate successfullyExtracted(CompilationUnit f) {
   not exists(@diagnostic d, Location l |
-    reportableDiagnostics(d, _, _) and diagnostics(d, _, _, _, _, l) and l.getFile() = f
+    reportableDiagnostics(d, _, _) and diagnostics(d, _, _, _, _, _, l) and l.getFile() = f
   ) and
   exists(f.getRelativePath()) and
   f.fromSource()

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ open class Logger(val logCounter: LogCounter, open val tw: TrapWriter) {`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`	`val ts = timestamp()`
`87`		`- tw.writeDiagnostics(StarLabel(), severity.sev, "", msg, "$ts $msg\n$suffix", locationId)`
	`87`	`+ tw.writeDiagnostics(StarLabel(), "CodeQL Kotlin extractor", severity.sev, "", msg, "$ts $msg\n$suffix", locationId)`
`88`	`88`	`val locStr = if (locationString == null) "" else "At " + locationString + ": "`
`89`	`89`	`print("$ts Warning($warningLocStr): $locStr$msg\n$suffix")`
`90`	`90`	`}`