Kotlin: Fix File locations, and fromSource/hasSourceLocation for Kotlin code

igfoo · igfoo · commit 14a10564f3fd · 2022-05-10T18:46:01.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
@@ -166,8 +166,10 @@ class KotlinFileExtractor(val logger: FileLogger, val tw: FileTrapWriter, val fi
     }
 
     fun extractFileContents(id: Label<DbFile>) {
+        val locId = tw.getWholeFileLocation()
         val pkg = file.fqName.asString()
         val pkgId = extractPackage(pkg)
+        tw.writeHasLocation(id, locId)
         tw.writeCupackage(id, pkgId)
         file.declarations.map { extractDeclaration(it) }
         CommentExtractor(this).extract()
@@ -198,7 +200,7 @@ class KotlinFileExtractor(val logger: FileLogger, val tw: FileTrapWriter, val fi
       val qualClassName = if (pkg.isEmpty()) jvmName else "$pkg.$jvmName"
       val label = "@\"class;$qualClassName\""
       val id: Label<DbClass> = tw.getLabelFor(label)
-      val locId = tw.getLocation(-1, -1) // TODO: This should be the whole file
+      val locId = tw.getWholeFileLocation()
       val pkgId = extractPackage(pkg)
       tw.writeClasses(id, jvmName, pkgId, id)
       tw.writeHasLocation(id, locId)
diff --git a/java/kotlin-extractor/src/main/kotlin/TrapWriter.kt b/java/kotlin-extractor/src/main/kotlin/TrapWriter.kt
@@ -77,6 +77,9 @@ class FileTrapWriter (
     fun getLocation(e: IrElement): Label<DbLocation> {
         return getLocation(e.startOffset, e.endOffset)
     }
+    fun getWholeFileLocation(): Label<DbLocation> {
+        return getLocation(fileId, 0, 0, 0, 0)
+    }
     fun getLocation(startOffset: Int, endOffset: Int): Label<DbLocation> {
         // If the compiler doesn't have a location, then start and end are both -1
         val unknownLoc = startOffset == -1 && endOffset == -1
diff --git a/java/ql/lib/semmle/code/Location.qll b/java/ql/lib/semmle/code/Location.qll
@@ -192,7 +192,7 @@ class Location extends @location {
 }
 
 private predicate hasSourceLocation(Top l, Location loc, File f) {
-  hasLocation(l, loc) and f = loc.getFile() and f.getExtension() = "java"
+  hasLocation(l, loc) and f = loc.getFile() and f.getExtension() = ["java", "kt"]
 }
 
 cached
diff --git a/java/ql/lib/semmle/code/java/Element.qll b/java/ql/lib/semmle/code/java/Element.qll
@@ -34,7 +34,7 @@ class Element extends @element, Top {
    * Elements pertaining to source files may include generated elements
    * not visible in source code, such as implicit default constructors.
    */
-  predicate fromSource() { this.getCompilationUnit().getExtension() = "java" }
+  predicate fromSource() { this.getCompilationUnit().getExtension() = ["java", "kt"] }
 
   /** Gets the compilation unit that this element belongs to. */
   CompilationUnit getCompilationUnit() { result = this.getFile() }
diff --git a/java/ql/test/kotlin/library-tests/classes/classes.expected b/java/ql/test/kotlin/library-tests/classes/classes.expected
@@ -1,3 +1,4 @@
+| classes.kt:0:0:0:0 | ClassesKt | ClassesKt |
 | classes.kt:2:1:2:18 | ClassOne | ClassOne |
 | classes.kt:4:1:6:1 | ClassTwo | ClassTwo |
 | classes.kt:8:1:10:1 | ClassThree | ClassThree |
@@ -7,7 +8,6 @@
 | classes.kt:34:1:47:1 | ClassSeven | ClassSeven |
 | file://:0:0:0:0 | Any | kotlin.Any |
 | file://:0:0:0:0 | Boolean | kotlin.Boolean |
-| file://:0:0:0:0 | ClassesKt | ClassesKt |
 | file://:0:0:0:0 | Int | kotlin.Int |
 | file://:0:0:0:0 | String | java.lang.String |
 | file://:0:0:0:0 | String | kotlin.String |
diff --git a/java/ql/test/kotlin/library-tests/multiple_files/classes.expected b/java/ql/test/kotlin/library-tests/multiple_files/classes.expected
@@ -1,10 +1,10 @@
 | file1.kt:2:1:2:16 | Class1 | Class1 |
 | file2.kt:2:1:2:16 | Class2 | Class2 |
+| file3.kt:0:0:0:0 | MyJvmName | MyJvmName |
 | file3.kt:3:1:3:16 | Class3 | Class3 |
 | file://:0:0:0:0 | Any | kotlin.Any |
 | file://:0:0:0:0 | Boolean | kotlin.Boolean |
 | file://:0:0:0:0 | Int | kotlin.Int |
-| file://:0:0:0:0 | MyJvmName | MyJvmName |
 | file://:0:0:0:0 | String | java.lang.String |
 | file://:0:0:0:0 | String | kotlin.String |
 | file://:0:0:0:0 | Unit | kotlin.Unit |

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ class Location extends @location {`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`private predicate hasSourceLocation(Top l, Location loc, File f) {`
`195`		`- hasLocation(l, loc) and f = loc.getFile() and f.getExtension() = "java"`
	`195`	`+ hasLocation(l, loc) and f = loc.getFile() and f.getExtension() = ["java", "kt"]`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`cached`