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

Revert extracting this and this@TYPE parameters

Browse Source
This commit is contained in:
Tamas Vajk
2021-09-23 11:14:27 +02:00
committed by Ian Lynagh
parent d6ec230e2f
commit bf4fb13326
5 changed files with 11 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -413,8 +413,9 @@ class KotlinFileExtractor(val logger: FileLogger, val tw: FileTrapWriter, val fi
@Suppress("UNCHECKED_CAST")
val parentId: Label<out DbMethod> = useDeclarationParent(vp.parent) as Label<out DbMethod>
var idx = vp.index
if (isQualifiedThisFunction(vp)) {
idx = -2
if (idx < 0) {
// We're not extracting this and this@TYPE parameters of functions:
logger.warnElement(Severity.ErrorSevere, "Unexpected negative index for parameter", vp)
}
val label = "@\"params;{$parentId};$idx\""
return label
@@ -470,17 +471,10 @@ class KotlinFileExtractor(val logger: FileLogger, val tw: FileTrapWriter, val fi
extractValueParameter(vp, id, i)
}
var index = -1
val extReceiver = f.extensionReceiverParameter
if (extReceiver != null) {
extractValueParameter(extReceiver, id, index--)
tw.writeKtExtensionFunctions(id)
}
val dispReceiver = f.dispatchReceiverParameter
if (dispReceiver != null) {
extractValueParameter(dispReceiver, id, index)
val extendedType = useType(extReceiver.type)
tw.writeKtExtensionFunctions(id, extendedType)
}
}