Merge pull request #14018 from igfoo/igfoo/extractor_information_kotlin1

Kotlin: Write usesK2 ("uses Kotlin 2") information to the database

Author: igfoo

java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt

@@ -20,6 +20,7 @@ import java.nio.file.Files
 import java.nio.file.Paths
 import java.util.zip.GZIPInputStream
 import java.util.zip.GZIPOutputStream
+import com.github.codeql.utils.versions.usesK2
 import com.semmle.util.files.FileUtil
 import kotlin.system.exitProcess
 
@@ -97,6 +98,7 @@ class KotlinExtractorExtension(
 
     private fun runExtractor(moduleFragment: IrModuleFragment, pluginContext: IrPluginContext) {
         val startTimeMs = System.currentTimeMillis()
+        val usesK2 = usesK2(pluginContext)
         // This default should be kept in sync with com.semmle.extractor.java.interceptors.KotlinInterceptor.initializeExtractionContext
         val trapDir = File(System.getenv("CODEQL_EXTRACTOR_JAVA_TRAP_DIR").takeUnless { it.isNullOrEmpty() } ?: "kotlin-extractor/trap")
         val compression_env_var = "CODEQL_EXTRACTOR_JAVA_OPTION_TRAP_COMPRESSION"
@@ -134,6 +136,7 @@ class KotlinExtractorExtension(
             tw.writeCompilation_info(compilation, "Kotlin Compiler Version", KotlinCompilerVersion.getVersion() ?: "<unknown>")
             val extractor_name = this::class.java.getResource("extractor.name")?.readText() ?: "<unknown>"
             tw.writeCompilation_info(compilation, "Kotlin Extractor Name", extractor_name)
+            tw.writeCompilation_info(compilation, "Uses Kotlin 2", usesK2.toString())
             if (compilationStartTime != null) {
                 tw.writeCompilation_compiler_times(compilation, -1.0, (System.currentTimeMillis()-compilationStartTime)/1000.0)
             }

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/UsesK2.kt

@@ -0,0 +1,7 @@
+package com.github.codeql.utils.versions
+
+import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
+
+fun usesK2(@Suppress("UNUSED_PARAMETER") pluginContext: IrPluginContext): Boolean {
+    return false
+}

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_9_0-Beta/UsesK2.kt

@@ -0,0 +1,7 @@
+package com.github.codeql.utils.versions
+
+import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
+
+fun usesK2(pluginContext: IrPluginContext): Boolean {
+    return pluginContext.languageVersionSettings.languageVersion.usesK2
+}

java/ql/integration-tests/all-platforms/kotlin/extractor_information_kotlin1/ExtractorInformation.expected

@@ -0,0 +1,7 @@
+| Number of files with extension jar | 1 |
+| Number of files with extension kt | 1 |
+| Number of lines of code | 2 |
+| Number of lines of code with extension kt | 2 |
+| Total number of lines | 3 |
+| Total number of lines with extension kt | 3 |
+| Uses Kotlin 2: false | 1 |

java/ql/integration-tests/all-platforms/kotlin/extractor_information_kotlin1/ExtractorInformation.ext.yml

@@ -0,0 +1,13 @@
+extensions:
+  - addsTo:
+      pack: codeql/java-queries
+      extensible: extractorInformationSkipKey
+    data:
+      # These will have unstable values, as they are dependent on the
+      # JDK that the test is run with, so filter them out:
+      - ["Number of files"]
+      - ["Number of files with extension class"]
+      # These depend on the Kotlin version you have installed
+      - ["Kotlin Compiler Version: %"]
+      - ["Kotlin Extractor Name: %"]
+

java/ql/integration-tests/all-platforms/kotlin/extractor_information_kotlin1/ExtractorInformation.qlref

@@ -0,0 +1 @@
+Telemetry/ExtractorInformation.ql

java/ql/integration-tests/all-platforms/kotlin/extractor_information_kotlin1/SomeClass.kt

@@ -0,0 +1,2 @@
+class SomeClass {
+}

java/ql/integration-tests/all-platforms/kotlin/extractor_information_kotlin1/test.py

@@ -0,0 +1,3 @@
+from create_database_utils import *
+
+run_codeql_database_create(["kotlinc SomeClass.kt"], lang="java")

java/ql/integration-tests/all-platforms/kotlin/extractor_information_kotlin2/ExtractorInformation.expected

@@ -0,0 +1,3 @@
+| Number of files with extension jar | 1 |
+| Number of files with extension kt | 1 |
+| Uses Kotlin 2: true | 1 |

java/ql/integration-tests/all-platforms/kotlin/extractor_information_kotlin2/ExtractorInformation.ext.yml

@@ -0,0 +1,17 @@
+extensions:
+  - addsTo:
+      pack: codeql/java-queries
+      extensible: extractorInformationSkipKey
+    data:
+      # These will have unstable values, as they are dependent on the
+      # JDK that the test is run with, so filter them out:
+      - ["Number of files"]
+      - ["Number of files with extension class"]
+      # These depend on the Kotlin version you have installed
+      - ["Kotlin Compiler Version: %"]
+      - ["Kotlin Extractor Name: %"]
+      # Currently we get some diagnostics as Kotlin 2 support isn't complete.
+      # Ignore these, as the number probably isn't stable.
+      - ["Number of diagnostics from CodeQL Kotlin extractor with severity %"]
+      - ["Total number of diagnostics from CodeQL Kotlin extractor"]
+