Apply code review changes

Author: tamasvajk

java/kotlin-extractor/build.gradle

@@ -30,8 +30,8 @@ sourceSets {
             // change the excludes for building with other versions.
             // Currently 1.7.0 is configured:
             excludes = [
-                    // For 1.7.20-Beta, the below two files should be included, and the corresponding v_1_7_20-Beta ones should be excluded.
-                    //"utils/versions/v_1_4_32/allOverridden.kt",
+                    // 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.
+                    //"utils/versions/v_1_4_32/allOverriddenIncludingSelf.kt",
                     //"utils/versions/v_1_4_32/createImplicitParameterDeclarationWithWrappedDescriptor.kt",
                     "utils/versions/v_1_4_32/Descriptors.kt",
                     "utils/versions/v_1_4_32/FileEntry.kt",
@@ -45,7 +45,7 @@ sourceSets {
                     "utils/versions/v_1_6_0/Descriptors.kt",
 
                     "utils/versions/v_1_7_20-Beta/createImplicitParameterDeclarationWithWrappedDescriptor.kt",
-                    "utils/versions/v_1_7_20-Beta/allOverridden.kt",
+                    "utils/versions/v_1_7_20-Beta/allOverriddenIncludingSelf.kt",
             ]
         }
     }

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

@@ -1,6 +1,6 @@
 package com.github.codeql.utils
 
-import com.github.codeql.utils.versions.allOverridden
+import com.github.codeql.utils.versions.allOverriddenIncludingSelf
 import org.jetbrains.kotlin.builtins.StandardNames
 import org.jetbrains.kotlin.ir.declarations.IrAnnotationContainer
 import org.jetbrains.kotlin.ir.declarations.IrClass
@@ -59,7 +59,7 @@ private val specialFunctionShortNames = specialFunctions.keys.map { it.functionN
 
 private fun getSpecialJvmName(f: IrFunction): String? {
     if (specialFunctionShortNames.contains(f.name) && f is IrSimpleFunction) {
-        f.allOverridden(true).forEach { overriddenFunc ->
+        f.allOverriddenIncludingSelf().forEach { overriddenFunc ->
             overriddenFunc.parentClassOrNull?.fqNameWhenAvailable?.let { parentFqName ->
                 specialFunctions[MethodKey(parentFqName, f.name)]?.let {
                     return it

…utils/versions/v_1_4_32/allOverridden.kt …s/v_1_4_32/allOverriddenIncludingSelf.ktjava/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 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

@@ -3,4 +3,4 @@ package com.github.codeql.utils.versions
 import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
 import org.jetbrains.kotlin.backend.common.ir.allOverridden
 
-fun IrSimpleFunction.allOverridden(includeSelf: Boolean = false) = this.allOverridden(includeSelf)
+fun IrSimpleFunction.allOverriddenIncludingSelf() = this.allOverridden(includeSelf = true)

…/versions/v_1_7_20-Beta/allOverridden.kt …_7_20-Beta/allOverriddenIncludingSelf.ktjava/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 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

@@ -3,4 +3,4 @@ package com.github.codeql.utils.versions
 import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
 import org.jetbrains.kotlin.ir.util.allOverridden
 
-fun IrSimpleFunction.allOverridden(includeSelf: Boolean = false) = this.allOverridden(includeSelf)
+fun IrSimpleFunction.allOverriddenIncludingSelf() = this.allOverridden(includeSelf = true)