Skip to content

Commit fb9a348

Browse files
committed
Apply code review changes
1 parent 5d01653 commit fb9a348

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

java/kotlin-extractor/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ sourceSets {
3030
// change the excludes for building with other versions.
3131
// Currently 1.7.0 is configured:
3232
excludes = [
33-
// For 1.7.20-Beta, the below two files should be included, and the corresponding v_1_7_20-Beta ones should be excluded.
34-
//"utils/versions/v_1_4_32/allOverridden.kt",
33+
// For 1.7.20-Beta, the below two files should be included, and the corresponding v_1_7_20-Beta ones should be excluded from this list.
34+
//"utils/versions/v_1_4_32/allOverriddenIncludingSelf.kt",
3535
//"utils/versions/v_1_4_32/createImplicitParameterDeclarationWithWrappedDescriptor.kt",
3636
"utils/versions/v_1_4_32/Descriptors.kt",
3737
"utils/versions/v_1_4_32/FileEntry.kt",
@@ -45,7 +45,7 @@ sourceSets {
4545
"utils/versions/v_1_6_0/Descriptors.kt",
4646

4747
"utils/versions/v_1_7_20-Beta/createImplicitParameterDeclarationWithWrappedDescriptor.kt",
48-
"utils/versions/v_1_7_20-Beta/allOverridden.kt",
48+
"utils/versions/v_1_7_20-Beta/allOverriddenIncludingSelf.kt",
4949
]
5050
}
5151
}

java/kotlin-extractor/src/main/kotlin/utils/JvmNames.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.codeql.utils
22

3-
import com.github.codeql.utils.versions.allOverridden
3+
import com.github.codeql.utils.versions.allOverriddenIncludingSelf
44
import org.jetbrains.kotlin.builtins.StandardNames
55
import org.jetbrains.kotlin.ir.declarations.IrAnnotationContainer
66
import org.jetbrains.kotlin.ir.declarations.IrClass
@@ -59,7 +59,7 @@ private val specialFunctionShortNames = specialFunctions.keys.map { it.functionN
5959

6060
private fun getSpecialJvmName(f: IrFunction): String? {
6161
if (specialFunctionShortNames.contains(f.name) && f is IrSimpleFunction) {
62-
f.allOverridden(true).forEach { overriddenFunc ->
62+
f.allOverriddenIncludingSelf().forEach { overriddenFunc ->
6363
overriddenFunc.parentClassOrNull?.fqNameWhenAvailable?.let { parentFqName ->
6464
specialFunctions[MethodKey(parentFqName, f.name)]?.let {
6565
return it

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/allOverridden.kt renamed to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/allOverriddenIncludingSelf.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ package com.github.codeql.utils.versions
33
import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
44
import org.jetbrains.kotlin.backend.common.ir.allOverridden
55

6-
fun IrSimpleFunction.allOverridden(includeSelf: Boolean = false) = this.allOverridden(includeSelf)
6+
fun IrSimpleFunction.allOverriddenIncludingSelf() = this.allOverridden(includeSelf = true)

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_7_20-Beta/allOverridden.kt renamed to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_7_20-Beta/allOverriddenIncludingSelf.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ package com.github.codeql.utils.versions
33
import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
44
import org.jetbrains.kotlin.ir.util.allOverridden
55

6-
fun IrSimpleFunction.allOverridden(includeSelf: Boolean = false) = this.allOverridden(includeSelf)
6+
fun IrSimpleFunction.allOverriddenIncludingSelf() = this.allOverridden(includeSelf = true)

0 commit comments

Comments
 (0)