Merge pull request #14018 from igfoo/igfoo/extractor_information_kotlin1

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

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"]
+

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

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

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

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

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

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

java/ql/src/Telemetry/ExtractorInformation.ql

@@ -87,7 +87,7 @@ predicate extractorTotalDiagnostics(string key, int value) {
 
 from string key, int value
 where
-  not extractorInformationSkipKey(key) and
+  not exists(string pattern | extractorInformationSkipKey(pattern) and key.matches(pattern)) and
   (
     compilationInfo(key, value) or
     fileCount(key, value) or