hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-24 04:36:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Kotlin: Remove an unused argument

Browse Source
This commit is contained in:
Ian Lynagh
2022-11-23 18:47:53 +00:00
parent 92ee0aa7ae
commit 5b8b9044a5
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/kotlin-extractor/src/main/kotlin/LinesOfCode.kt
View File

@@ -16,7 +16,7 @@ class LinesOfCode(
val tw: FileTrapWriter, val tw: FileTrapWriter,
val file: IrFile val file: IrFile
) { ) {
val psi2Ir = getPsi2Ir(logger).also { val psi2Ir = getPsi2Ir().also {
if (it == null) { if (it == null) {
logger.warn("Lines of code will not be populated as Kotlin version is too old (${KotlinCompilerVersion.getVersion()})") logger.warn("Lines of code will not be populated as Kotlin version is too old (${KotlinCompilerVersion.getVersion()})")
} }

2
java/kotlin-extractor/src/main/kotlin/comments/CommentExtractor.kt
View File

@@ -25,7 +25,7 @@ class CommentExtractor(private val fileExtractor: KotlinFileExtractor, private v
private val logger = fileExtractor.logger private val logger = fileExtractor.logger
fun extract() { fun extract() {
val psi2Ir = getPsi2Ir(logger) val psi2Ir = getPsi2Ir()
if (psi2Ir == null) { if (psi2Ir == null) {
logger.warn("Comments will not be extracted as Kotlin version is too old (${KotlinCompilerVersion.getVersion()})") logger.warn("Comments will not be extracted as Kotlin version is too old (${KotlinCompilerVersion.getVersion()})")
return return

4
java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/Psi2Ir.kt
View File

@@ -1,5 +1,3 @@
package com.github.codeql.utils.versions package com.github.codeql.utils.versions
import com.github.codeql.FileLogger fun getPsi2Ir(): Psi2IrFacade? = null
fun getPsi2Ir(@Suppress("UNUSED_PARAMETER") logger: FileLogger): Psi2IrFacade? = null

5
java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_20/Psi2Ir.kt
View File

@@ -1,6 +1,5 @@
package com.github.codeql.utils.versions package com.github.codeql.utils.versions
import com.github.codeql.FileLogger
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.backend.common.psi.PsiSourceManager import org.jetbrains.kotlin.backend.common.psi.PsiSourceManager
import org.jetbrains.kotlin.backend.jvm.ir.getKtFile import org.jetbrains.kotlin.backend.jvm.ir.getKtFile
@@ -8,9 +7,9 @@ import org.jetbrains.kotlin.ir.IrElement
import org.jetbrains.kotlin.ir.declarations.IrFile import org.jetbrains.kotlin.ir.declarations.IrFile
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
fun getPsi2Ir(logger: FileLogger): Psi2IrFacade? = Psi2Ir(logger) fun getPsi2Ir(): Psi2IrFacade? = Psi2Ir()
private class Psi2Ir(private val logger: FileLogger): Psi2IrFacade { private class Psi2Ir(): Psi2IrFacade {
override fun getKtFile(irFile: IrFile): KtFile? { override fun getKtFile(irFile: IrFile): KtFile? {
return irFile.getKtFile() return irFile.getKtFile()
} }