hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-24 04:36:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Kotlin: Move extractTypeParameter back to KotlinFileExtractor

Browse Source
This commit is contained in:
Ian Lynagh
2021-11-02 18:24:46 +00:00
parent 118d630125
commit b3a28af319
1 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -661,39 +661,10 @@ class X {
return label
}
// todo: fix this
if (param.origin == IrDeclarationOrigin.IR_EXTERNAL_DECLARATION_STUB ||
param.origin == IrDeclarationOrigin.IR_EXTERNAL_JAVA_DECLARATION_STUB){
return extractTypeParameter(param)
}
logger.warn(Severity.ErrorSevere, "Missing type parameter label")
return tw.getLabelFor(l)
}
// TODO: This should be in KotlinFileExtractor
fun extractTypeParameter(tp: IrTypeParameter): Label<out DbTypevariable> {
val id = tw.getLabelFor<DbTypevariable>(getTypeParameterLabel(tp))
val parentId: Label<out DbClassorinterfaceorcallable> = when (val parent = tp.parent) {
is IrFunction -> useFunction(parent)
is IrClass -> useClassSource(parent)
else -> {
// TODO logger.warnElement(Severity.ErrorSevere, "Unexpected type parameter parent", tp)
logger.warn(Severity.ErrorSevere, "Unexpected type parameter parent")
fakeLabel()
}
}
tw.writeTypeVars(id, tp.name.asString(), tp.index, 0, parentId)
// TODO val locId = tw.getLocation(tp)
// TODO tw.writeHasLocation(id, locId)
// todo: add type bounds
return id
}
fun extractClassCommon(c: IrClass, id: Label<out DbClassorinterface>) {
for(t in c.superTypes) {
when(t) {
@@ -845,6 +816,27 @@ open class KotlinFileExtractor(
}
}
fun extractTypeParameter(tp: IrTypeParameter): Label<out DbTypevariable> {
val id = tw.getLabelFor<DbTypevariable>(getTypeParameterLabel(tp))
val parentId: Label<out DbClassorinterfaceorcallable> = when (val parent = tp.parent) {
is IrFunction -> useFunction(parent)
is IrClass -> useClassSource(parent)
else -> {
logger.warnElement(Severity.ErrorSevere, "Unexpected type parameter parent", tp)
fakeLabel()
}
}
tw.writeTypeVars(id, tp.name.asString(), tp.index, 0, parentId)
val locId = tw.getLocation(tp)
tw.writeHasLocation(id, locId)
// todo: add type bounds
return id
}
fun extractClassSource(c: IrClass): Label<out DbClassorinterface> {
val id = useClassSource(c)
val pkg = c.packageFqName?.asString() ?: ""