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

Inline version-specific override code where there is now only one version

Browse Source
This commit is contained in:
Chris Smowton
2025-05-15 12:07:23 +01:00
parent 79171a9232
commit 084222ec58
8 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
View File

@@ -8053,7 +8053,7 @@ open class KotlinFileExtractor(
?.symbol
?.typeWithArguments(listOf(functionNTypeArguments.last()))
else
functionN(pluginContext)(functionNTypeArguments.size - 1)
pluginContext.irBuiltIns.functionN(functionNTypeArguments.size - 1)
.symbol
.typeWithArguments(functionNTypeArguments)

3
java/kotlin-extractor/src/main/kotlin/MetaAnnotationSupport.kt
View File

@@ -2,7 +2,6 @@ package com.github.codeql
import com.github.codeql.utils.versions.copyParameterToFunction
import com.github.codeql.utils.versions.createImplicitParameterDeclarationWithWrappedDescriptor
import com.github.codeql.utils.versions.getAnnotationType
import java.lang.annotation.ElementType
import java.util.HashSet
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
@@ -375,7 +374,7 @@ class MetaAnnotationSupport(
.apply {
createImplicitParameterDeclarationWithWrappedDescriptor()
parent = annotationClass
superTypes = listOf(getAnnotationType(pluginContext))
superTypes = listOf(pluginContext.irBuiltIns.annotationType)
}
val propertyName = Name.identifier("value")

5
java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/FileEntry.kt
View File

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

5
java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/Functions.kt
View File

@@ -1,5 +0,0 @@
package com.github.codeql.utils.versions
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
fun functionN(pluginContext: IrPluginContext) = pluginContext.irBuiltIns::functionN

5
java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/IrBuiltIns.kt
View File

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

5
java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/annotationType.kt
View File

@@ -1,5 +0,0 @@
package com.github.codeql.utils.versions
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
fun getAnnotationType(context: IrPluginContext) = context.irBuiltIns.annotationType

1
java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/typeUtils.kt
View File

@@ -1,6 +1,7 @@
package com.github.codeql.utils.versions
import org.jetbrains.kotlin.ir.types.*
import org.jetbrains.kotlin.ir.IrBuiltIns
fun IrType.isNullableCodeQL(): Boolean =
this.isNullable()

1
java/kotlin-extractor/src/main/kotlin/utils/versions/v_2_1_20-Beta1/typeUtils.kt
View File

@@ -2,6 +2,7 @@ package com.github.codeql.utils.versions
import org.jetbrains.kotlin.ir.types.IrType
import org.jetbrains.kotlin.ir.util.*
import org.jetbrains.kotlin.ir.IrBuiltIns
fun IrType.isNullableCodeQL(): Boolean =
this.isNullable()