hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-22 19:56:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Kotlin: We can't etract comments for < 1.5.20

Browse Source 
We were making our own PsiSourceManager, but that didn't know about any
IrFile -> PsiFile mappings.
This commit is contained in:
Ian Lynagh
2022-07-11 19:36:43 +01:00
parent 4c68624b00
commit 960d1dba8a
3 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,18 +5,15 @@ import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.ir.IrElement 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
import org.jetbrains.kotlin.psi2ir.PsiSourceManager
class Psi2Ir(private val logger: FileLogger) : Psi2IrFacade { class Psi2Ir(private val logger: FileLogger) : Psi2IrFacade {
companion object {
val psiManager = PsiSourceManager()
}
override fun getKtFile(irFile: IrFile): KtFile? { override fun getKtFile(irFile: IrFile): KtFile? {
return psiManager.getKtFile(irFile) logger.warn("Comment extraction is not supported for Kotlin < 1.5.20")
return null
} }
override fun findPsiElement(irElement: IrElement, irFile: IrFile): PsiElement? { override fun findPsiElement(irElement: IrElement, irFile: IrFile): PsiElement? {
return psiManager.findPsiElement(irElement, irFile) logger.error("Attempted comment extraction for Kotlin < 1.5.20")
return null
} }
} }

11
java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/Psi2Ir.kt
View File

@@ -5,18 +5,15 @@ import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.ir.IrElement 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
import org.jetbrains.kotlin.psi2ir.PsiSourceManager
class Psi2Ir(private val logger: FileLogger) : Psi2IrFacade { class Psi2Ir(private val logger: FileLogger) : Psi2IrFacade {
companion object {
val psiManager = PsiSourceManager()
}
override fun getKtFile(irFile: IrFile): KtFile? { override fun getKtFile(irFile: IrFile): KtFile? {
return psiManager.getKtFile(irFile) logger.warn("Comment extraction is not supported for Kotlin < 1.5.20")
return null
} }
override fun findPsiElement(irElement: IrElement, irFile: IrFile): PsiElement? { override fun findPsiElement(irElement: IrElement, irFile: IrFile): PsiElement? {
return psiManager.findPsiElement(irElement, irFile) logger.error("Attempted comment extraction for Kotlin < 1.5.20")
return null
} }
} }

11
java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_10/Psi2Ir.kt
View File

@@ -5,18 +5,15 @@ import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.ir.IrElement 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
import org.jetbrains.kotlin.psi2ir.PsiSourceManager
class Psi2Ir(private val logger: FileLogger) : Psi2IrFacade { class Psi2Ir(private val logger: FileLogger) : Psi2IrFacade {
companion object {
val psiManager = PsiSourceManager()
}
override fun getKtFile(irFile: IrFile): KtFile? { override fun getKtFile(irFile: IrFile): KtFile? {
return psiManager.getKtFile(irFile) logger.warn("Comment extraction is not supported for Kotlin < 1.5.20")
return null
} }
override fun findPsiElement(irElement: IrElement, irFile: IrFile): PsiElement? { override fun findPsiElement(irElement: IrElement, irFile: IrFile): PsiElement? {
return psiManager.findPsiElement(irElement, irFile) logger.error("Attempted comment extraction for Kotlin < 1.5.20")
return null
} }
} }