Skip to content

Commit 7ce7685

Browse files
committed
Kotlin: FirMetadataSource.File.files has been removed
In new versions, but not old versions, we want FirMetadataSource.File.fir instead.
1 parent 1698ccf commit 7ce7685

File tree

5 files changed

+19
-2
lines changed

5 files changed

+19
-2
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// Nothing to do

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

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

33
import com.github.codeql.*
4+
import com.github.codeql.utils.versions.*
45
import com.intellij.lang.LighterASTNode
56
import com.intellij.util.diff.FlyweightCapableTreeStructure
67
import org.jetbrains.kotlin.fir.backend.FirMetadataSource
@@ -26,7 +27,7 @@ class CommentExtractorLighterAST(
2627
// Returns true if it extracted the comments; false otherwise.
2728
fun extract(): Boolean {
2829
val sourceElement =
29-
(file.metadata as? FirMetadataSource.File)?.files?.elementAtOrNull(0)?.source
30+
(file.metadata as? FirMetadataSource.File)?.firFile?.source
3031
val treeStructure = sourceElement?.treeStructure
3132
if (treeStructure == null) {
3233
return false
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package com.github.codeql.utils.versions
2+
3+
import org.jetbrains.kotlin.fir.backend.FirMetadataSource
4+
import org.jetbrains.kotlin.fir.declarations.FirFile
5+
6+
val FirMetadataSource.File.firFile: FirFile?
7+
get() = this.files.elementAtOrNull(0)

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

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

3+
import com.github.codeql.utils.versions.*
34
import com.intellij.lang.LighterASTNode
45
import com.intellij.util.diff.FlyweightCapableTreeStructure
56
import org.jetbrains.kotlin.KtSourceElement
@@ -14,7 +15,7 @@ class LinesOfCodeLighterAST(val logger: FileLogger, val tw: FileTrapWriter, val
1415

1516
fun linesOfCodeInFile(id: Label<DbFile>): Boolean {
1617
val sourceElement =
17-
(file.metadata as? FirMetadataSource.File)?.files?.elementAtOrNull(0)?.source
18+
(file.metadata as? FirMetadataSource.File)?.firFile?.source
1819
if (sourceElement == null) {
1920
return false
2021
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package com.github.codeql.utils.versions
2+
3+
import org.jetbrains.kotlin.fir.backend.FirMetadataSource
4+
import org.jetbrains.kotlin.fir.declarations.FirFile
5+
6+
val FirMetadataSource.File.firFile: FirFile?
7+
get() = this.fir

0 commit comments

Comments
 (0)