Kotlin: Return more precise types from PopulateFile.java

igfoo · igfoo · commit 1990b68c212b · 2022-05-10T19:51:05.000+01:00
diff --git a/java/kotlin-extractor/src/main/java/com/semmle/extractor/java/PopulateFile.java b/java/kotlin-extractor/src/main/java/com/semmle/extractor/java/PopulateFile.java
@@ -5,6 +5,7 @@
 import java.util.Map;
 
 import com.github.codeql.Label;
+import com.github.codeql.DbFile;
 import com.github.codeql.TrapWriter;
 import com.github.codeql.KotlinExtractorDbSchemeKt;
 import com.semmle.util.exception.CatastrophicError;
@@ -75,7 +76,7 @@ public Label populateFile(File absoluteFile) {
         return getFileLabel(absoluteFile, true);
     }
 
-    public Label getFileLabel(File absoluteFile, boolean populateTables) {
+    public Label<DbFile> getFileLabel(File absoluteFile, boolean populateTables) {
         String databasePath = transformer.fileAsDatabaseString(absoluteFile);
         Label result = tw.getLabelFor("@\"" + escapeKey(databasePath) + ";sourcefile" + "\"");
         // Ensure the rewritten path is used from now on.
@@ -113,7 +114,7 @@ public Label relativeFileId(File jarFile, String pathWithinJar) {
         return getFileInJarLabel(jarFile, pathWithinJar, true);
     }
 
-	public Label getFileInJarLabel(File jarFile, String pathWithinJar, boolean populateTables) {
+	public Label<DbFile> getFileInJarLabel(File jarFile, String pathWithinJar, boolean populateTables) {
 		if (pathWithinJar.contains("\\"))
 			throw new CatastrophicError("Invalid jar path: '" + pathWithinJar + "' should not contain '\\'.");
 
@@ -148,4 +149,4 @@ public Label getFileInJarLabel(File jarFile, String pathWithinJar, boolean popul
 		return current;
 	}
 
-}
+}
diff --git a/java/kotlin-extractor/src/main/kotlin/TrapWriter.kt b/java/kotlin-extractor/src/main/kotlin/TrapWriter.kt
@@ -163,13 +163,11 @@ open class FileTrapWriter (
 ): TrapWriter (lm, bw) {
     val populateFile = PopulateFile(this)
     val splitFilePath = filePath.split("!/")
-    @Suppress("UNCHECKED_CAST")
     val fileId =
-        (if(splitFilePath.size == 1)
+        if(splitFilePath.size == 1)
             populateFile.getFileLabel(File(filePath), populateFileTables)
          else
             populateFile.getFileInJarLabel(File(splitFilePath.get(0)), splitFilePath.get(1), populateFileTables)
-        ) as Label<DbFile>
 
     fun getLocation(e: IrElement): Label<DbLocation> {
         return getLocation(e.startOffset, e.endOffset)
