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

Kotlin: drop same-file requirement for overridden parameter labels

Browse Source
This commit is contained in:
Chris Smowton
2022-11-02 19:28:53 +00:00
parent cad268476c
commit 8e240a2e84
6 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
View File

@@ -1622,12 +1622,7 @@ open class KotlinUsesExtractor(
fun getValueParameterLabel(vp: IrValueParameter, parent: Label<out DbCallable>?): String {
val declarationParent = vp.parent
val overriddenParentAttributes = (declarationParent as? IrFunction)?.let {
// Note the check 'vp.fileOrNull?.path == this.filePath' should never actually do anything, since references
// to a value parameter should always come from within the same .kt file.
if (this is KotlinFileExtractor && vp.fileOrNull?.path == this.filePath)
this.declarationStack.findOverriddenAttributes(it)
else
null
(this as? KotlinFileExtractor)?.declarationStack?.findOverriddenAttributes(it)
}
val parentId = parent ?: overriddenParentAttributes?.id ?: useDeclarationParent(declarationParent, false)