Add kotlin 1.4 support

java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt

@@ -242,6 +242,7 @@ class KotlinSourceFileExtractor(
         CommentExtractor(this).extract()
     }
 
+  @OptIn(kotlin.ExperimentalStdlibApi::class)
   fun extractFileClass(f: IrFile): Label<out DbClass> {
       val fileName = f.fileEntry.name
       val pkg = f.fqName.asString()

java/kotlin-extractor/src/main/kotlin/TrapWriter.kt

@@ -1,9 +1,9 @@
 package com.github.codeql
 
+import com.github.codeql.utils.versions.FileEntry
 import java.io.BufferedWriter
 import java.io.File
 import org.jetbrains.kotlin.ir.IrElement
-import org.jetbrains.kotlin.ir.IrFileEntry
 import org.jetbrains.kotlin.ir.declarations.path
 import org.jetbrains.kotlin.ir.declarations.IrFile
 import org.jetbrains.kotlin.ir.declarations.IrVariable
@@ -82,7 +82,7 @@ open class TrapWriter (val lm: TrapLabelManager, val bw: BufferedWriter) {
      * Gets a FileTrapWriter like this one (using the same label manager, writer etc), but with the given
      * default file used in getLocation etc.
      */
-    fun withTargetFile(filePath: String, fileEntry: IrFileEntry?, populateFileTables: Boolean = true) =
+    fun withTargetFile(filePath: String, fileEntry: FileEntry?, populateFileTables: Boolean = true) =
         FileTrapWriter(lm, bw, filePath, fileEntry, populateFileTables)
 }
 
@@ -104,7 +104,7 @@ open class FileTrapWriter (
     lm: TrapLabelManager,
     bw: BufferedWriter,
     val filePath: String,
-    val sourceFileEntry: IrFileEntry?,
+    val sourceFileEntry: FileEntry?,
     populateFileTables: Boolean = true
 ): TrapWriter (lm, bw) {
     val populateFile = PopulateFile(this)

java/kotlin-extractor/src/main/kotlin/comments/CommentExtractor.kt

@@ -2,9 +2,9 @@ package com.github.codeql.comments
 
 import com.github.codeql.*
 import com.github.codeql.utils.IrVisitorLookup
+import com.github.codeql.utils.versions.Psi2Ir
 import com.intellij.psi.PsiComment
 import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.backend.jvm.ir.getKtFile
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.declarations.path
 import org.jetbrains.kotlin.kdoc.psi.api.KDoc
@@ -17,7 +17,7 @@ class CommentExtractor(private val fileExtractor: KotlinSourceFileExtractor) {
     private val file = fileExtractor.file
     private val tw = fileExtractor.tw
     private val logger = fileExtractor.logger
-    private val ktFile = file.getKtFile()
+    private val ktFile = Psi2Ir().getKtFile(file)
 
     init {
         if (ktFile == null) {

java/kotlin-extractor/src/main/kotlin/utils/IrVisitorLookup.kt

@@ -1,7 +1,7 @@
 package com.github.codeql.utils
 
+import com.github.codeql.utils.versions.Psi2Ir
 import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.backend.common.psi.PsiSourceManager
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.declarations.IrFile
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
@@ -19,7 +19,7 @@ class IrVisitorLookup(private val psi: PsiElement, private val file: IrFile) :
         }
 
         if (location.contains(elementLocation)) {
-            val psiElement = PsiSourceManager.findPsiElement(element, file)
+            val psiElement = Psi2Ir().findPsiElement(element, file)
             if (psiElement == psi) {
                 // There can be multiple IrElements that match the same PSI element.
                 data.add(element)

java/kotlin-extractor/src/main/kotlin/utils/versions/Psi2IrFacade.kt

@@ -0,0 +1,11 @@
+package com.github.codeql.utils.versions
+
+import com.intellij.psi.PsiElement
+import org.jetbrains.kotlin.ir.IrElement
+import org.jetbrains.kotlin.ir.declarations.IrFile
+import org.jetbrains.kotlin.psi.KtFile
+
+interface Psi2IrFacade {
+    fun getKtFile(irFile: IrFile): KtFile?
+    fun findPsiElement(irElement: IrElement, irFile: IrFile): PsiElement?
+}

java/kotlin-extractor/src/main/kotlin/utils/versions/default/FileEntry.kt

@@ -0,0 +1,5 @@
+package com.github.codeql.utils.versions
+
+import org.jetbrains.kotlin.ir.IrFileEntry
+
+typealias FileEntry = IrFileEntry

java/kotlin-extractor/src/main/kotlin/utils/versions/default/Psi2Ir.kt

@@ -0,0 +1,18 @@
+package com.github.codeql.utils.versions
+
+import com.intellij.psi.PsiElement
+import org.jetbrains.kotlin.backend.common.psi.PsiSourceManager
+import org.jetbrains.kotlin.backend.jvm.ir.getKtFile
+import org.jetbrains.kotlin.ir.IrElement
+import org.jetbrains.kotlin.ir.declarations.IrFile
+import org.jetbrains.kotlin.psi.KtFile
+
+class Psi2Ir: Psi2IrFacade {
+    override fun getKtFile(irFile: IrFile): KtFile? {
+        return irFile.getKtFile()
+    }
+
+    override fun findPsiElement(irElement: IrElement, irFile: IrFile): PsiElement? {
+        return PsiSourceManager.findPsiElement(irElement, irFile)
+    }
+}

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4/FileEntry.kt

@@ -0,0 +1,5 @@
+package com.github.codeql.utils.versions
+
+import org.jetbrains.kotlin.ir.SourceManager
+
+typealias FileEntry = SourceManager.FileEntry

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4/Psi2Ir.kt

@@ -0,0 +1,21 @@
+package com.github.codeql.utils.versions
+
+import com.intellij.psi.PsiElement
+import org.jetbrains.kotlin.ir.IrElement
+import org.jetbrains.kotlin.ir.declarations.IrFile
+import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.psi2ir.PsiSourceManager
+
+class Psi2Ir : Psi2IrFacade {
+    companion object {
+        val psiManager = PsiSourceManager()
+    }
+
+    override fun getKtFile(irFile: IrFile): KtFile? {
+        return psiManager.getKtFile(irFile)
+    }
+
+    override fun findPsiElement(irElement: IrElement, irFile: IrFile): PsiElement? {
+        return psiManager.findPsiElement(irElement, irFile)
+    }
+}