Skip to content

Commit 960d1db

Browse files
committed
Kotlin: We can't etract comments for < 1.5.20
We were making our own PsiSourceManager, but that didn't know about any IrFile -> PsiFile mappings.
1 parent 4c68624 commit 960d1db

File tree

3 files changed

+12
-21
lines changed

3 files changed

+12
-21
lines changed

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,15 @@ import com.intellij.psi.PsiElement
55
import org.jetbrains.kotlin.ir.IrElement
66
import org.jetbrains.kotlin.ir.declarations.IrFile
77
import org.jetbrains.kotlin.psi.KtFile
8-
import org.jetbrains.kotlin.psi2ir.PsiSourceManager
98

109
class Psi2Ir(private val logger: FileLogger) : Psi2IrFacade {
11-
companion object {
12-
val psiManager = PsiSourceManager()
13-
}
14-
1510
override fun getKtFile(irFile: IrFile): KtFile? {
16-
return psiManager.getKtFile(irFile)
11+
logger.warn("Comment extraction is not supported for Kotlin < 1.5.20")
12+
return null
1713
}
1814

1915
override fun findPsiElement(irElement: IrElement, irFile: IrFile): PsiElement? {
20-
return psiManager.findPsiElement(irElement, irFile)
16+
logger.error("Attempted comment extraction for Kotlin < 1.5.20")
17+
return null
2118
}
2219
}

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,15 @@ import com.intellij.psi.PsiElement
55
import org.jetbrains.kotlin.ir.IrElement
66
import org.jetbrains.kotlin.ir.declarations.IrFile
77
import org.jetbrains.kotlin.psi.KtFile
8-
import org.jetbrains.kotlin.psi2ir.PsiSourceManager
98

109
class Psi2Ir(private val logger: FileLogger) : Psi2IrFacade {
11-
companion object {
12-
val psiManager = PsiSourceManager()
13-
}
14-
1510
override fun getKtFile(irFile: IrFile): KtFile? {
16-
return psiManager.getKtFile(irFile)
11+
logger.warn("Comment extraction is not supported for Kotlin < 1.5.20")
12+
return null
1713
}
1814

1915
override fun findPsiElement(irElement: IrElement, irFile: IrFile): PsiElement? {
20-
return psiManager.findPsiElement(irElement, irFile)
16+
logger.error("Attempted comment extraction for Kotlin < 1.5.20")
17+
return null
2118
}
2219
}

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,15 @@ import com.intellij.psi.PsiElement
55
import org.jetbrains.kotlin.ir.IrElement
66
import org.jetbrains.kotlin.ir.declarations.IrFile
77
import org.jetbrains.kotlin.psi.KtFile
8-
import org.jetbrains.kotlin.psi2ir.PsiSourceManager
98

109
class Psi2Ir(private val logger: FileLogger) : Psi2IrFacade {
11-
companion object {
12-
val psiManager = PsiSourceManager()
13-
}
14-
1510
override fun getKtFile(irFile: IrFile): KtFile? {
16-
return psiManager.getKtFile(irFile)
11+
logger.warn("Comment extraction is not supported for Kotlin < 1.5.20")
12+
return null
1713
}
1814

1915
override fun findPsiElement(irElement: IrElement, irFile: IrFile): PsiElement? {
20-
return psiManager.findPsiElement(irElement, irFile)
16+
logger.error("Attempted comment extraction for Kotlin < 1.5.20")
17+
return null
2118
}
2219
}

0 commit comments

Comments
 (0)