Merge branch 'main' into redsun82/kotlin

java/kotlin-extractor/kotlin_plugin_versions.py

@@ -46,7 +46,7 @@ def version_string_to_version(version):
 # Version number used by CI.
 ci_version = '1.9.0'
 
-many_versions = [ '1.5.0', '1.5.10', '1.5.20', '1.5.30', '1.6.0', '1.6.20', '1.7.0', '1.7.20', '1.8.0', '1.9.0-Beta', '1.9.20-Beta', '2.0.0-Beta4', '2.0.255-SNAPSHOT' ]
+many_versions = [ '1.5.0', '1.5.10', '1.5.20', '1.5.30', '1.6.0', '1.6.20', '1.7.0', '1.7.20', '1.8.0', '1.9.0-Beta', '1.9.20-Beta', '2.0.0-RC1' ]
 
 many_versions_versions = [version_string_to_version(v) for v in many_versions]
 many_versions_versions_asc  = sorted(many_versions_versions, key = lambda v: v.toTupleWithTag())

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

@@ -1,6 +1,7 @@
 package com.github.codeql.comments
 
 import com.github.codeql.*
+import com.github.codeql.utils.versions.*
 import com.intellij.lang.LighterASTNode
 import com.intellij.util.diff.FlyweightCapableTreeStructure
 import org.jetbrains.kotlin.fir.backend.FirMetadataSource
@@ -26,7 +27,7 @@ class CommentExtractorLighterAST(
     // Returns true if it extracted the comments; false otherwise.
     fun extract(): Boolean {
         val sourceElement =
-            (file.metadata as? FirMetadataSource.File)?.files?.elementAtOrNull(0)?.source
+            (file.metadata as? FirMetadataSource.File)?.firFile?.source
         val treeStructure = sourceElement?.treeStructure
         if (treeStructure == null) {
             return false

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

@@ -0,0 +1,7 @@
+package com.github.codeql.utils.versions
+
+import org.jetbrains.kotlin.fir.backend.FirMetadataSource
+import org.jetbrains.kotlin.fir.declarations.FirFile
+
+val FirMetadataSource.File.firFile: FirFile?
+    get() = this.files.elementAtOrNull(0)

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

@@ -1,5 +1,6 @@
 package com.github.codeql
 
+import com.github.codeql.utils.versions.*
 import com.intellij.lang.LighterASTNode
 import com.intellij.util.diff.FlyweightCapableTreeStructure
 import org.jetbrains.kotlin.KtSourceElement
@@ -14,7 +15,7 @@ class LinesOfCodeLighterAST(val logger: FileLogger, val tw: FileTrapWriter, val
 
     fun linesOfCodeInFile(id: Label<DbFile>): Boolean {
         val sourceElement =
-            (file.metadata as? FirMetadataSource.File)?.files?.elementAtOrNull(0)?.source
+            (file.metadata as? FirMetadataSource.File)?.firFile?.source
         if (sourceElement == null) {
             return false
         }

java/kotlin-extractor/src/main/kotlin/utils/versions/v_2_0_0-RC1/FirMetadataSourceFirFile.kt

@@ -0,0 +1,7 @@
+package com.github.codeql.utils.versions
+
+import org.jetbrains.kotlin.fir.backend.FirMetadataSource
+import org.jetbrains.kotlin.fir.declarations.FirFile
+
+val FirMetadataSource.File.firFile: FirFile?
+    get() = this.fir

java/kotlin-extractor/src/main/kotlin/utils/versions/v_2_0_0-RC1/parents.kt

@@ -0,0 +1 @@
+// Nothing to do