hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 19:26:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add kotlin 1.4 support

Browse Source
This commit is contained in:
Tamas Vajk
2021-11-15 15:20:36 +01:00
committed by Ian Lynagh
parent 3939a2a47c
commit c4ad2f3463
13 changed files with 90 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/kotlin-extractor/build.gradle
View File

@@ -18,6 +18,15 @@ repositories {
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
kotlinOptions {
jvmTarget = "1.8"
freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
}
}
sourceSets {
main {
kotlin {
excludes = ["utils/versions/v_1_4/*.kt"]
}
}
}

14
java/kotlin-extractor/build.py
View File

@@ -119,7 +119,7 @@ def transform_to_embeddable(srcs):
f.write(content)
def compile(jars, java_jars, dependency_folder, transform_to_embeddable, output, tmp_dir):
def compile(jars, java_jars, dependency_folder, transform_to_embeddable, output, tmp_dir, version):
classpath = patterns_to_classpath(dependency_folder, jars)
java_classpath = patterns_to_classpath(dependency_folder, java_jars)
@@ -127,6 +127,12 @@ def compile(jars, java_jars, dependency_folder, transform_to_embeddable, output,
if os.path.exists(tmp_dir):
shutil.rmtree(tmp_dir)
shutil.copytree('src', tmp_dir)
if version.startswith('1.4'):
shutil.rmtree(tmp_dir + '/main/kotlin/utils/versions/default')
else:
shutil.rmtree(tmp_dir + '/main/kotlin/utils/versions/v_1_4')
srcs = find_sources(tmp_dir)
transform_to_embeddable(srcs)
@@ -143,7 +149,8 @@ def compile_embeddable(version):
kotlin_dependency_folder,
transform_to_embeddable,
'codeql-extractor-kotlin-embeddable-%s.jar' % (version),
'build/temp_src')
'build/temp_src',
version)
def compile_standalone(version):
@@ -152,7 +159,8 @@ def compile_standalone(version):
kotlin_dependency_folder,
lambda srcs: None,
'codeql-extractor-kotlin-standalone-%s.jar' % (version),
'build/temp_src')
'build/temp_src',
version)
for version in kotlin_plugin_versions.versions:

2
java/kotlin-extractor/generate_dbscheme.py
View File

@@ -171,7 +171,7 @@ with open('src/main/kotlin/KotlinExtractorDbScheme.kt', 'w') as kt:
genTable(kt, relname, columns, enum, kind, num, typ)
for typ in sorted(supertypes):
kt.write('sealed interface Db' + upperFirst(typ))
kt.write('interface Db' + upperFirst(typ))
# Sorting makes the output deterministic.
names = sorted(supertypes[typ])
if names:

2
java/kotlin-extractor/kotlin_plugin_versions.py
View File

@@ -1 +1 @@
versions = ['1.5.31', '1.6.0-RC2']
versions = [ '1.4.32', '1.5.31', '1.6.0-RC2' ]

1
java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
View File

@@ -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()

6
java/kotlin-extractor/src/main/kotlin/TrapWriter.kt
View File

@@ -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)

4
java/kotlin-extractor/src/main/kotlin/comments/CommentExtractor.kt
View File

@@ -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) {

4
java/kotlin-extractor/src/main/kotlin/utils/IrVisitorLookup.kt
View File

@@ -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)

11
java/kotlin-extractor/src/main/kotlin/utils/versions/Psi2IrFacade.kt Normal file
View File

@@ -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?
}

5
java/kotlin-extractor/src/main/kotlin/utils/versions/default/FileEntry.kt Normal file
View File

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

18
java/kotlin-extractor/src/main/kotlin/utils/versions/default/Psi2Ir.kt Normal file
View File

@@ -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)
}
}

5
java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4/FileEntry.kt Normal file
View File

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

21
java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4/Psi2Ir.kt Normal file
View File

@@ -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)
}
}