azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR] JavaTypeParameterStack: allow nullable return from get

Browse Source 
It is not always possible to have the correct mapping,
at least on the Analysis API side

^KT-66530 Fixed
This commit is contained in:
Dmitrii Gridin
2024-03-12 16:42:20 +01:00
committed by Space Team
parent eb8054ac1e
commit 675bf36049
16 changed files with 182 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/psiTypeProvider/AbstractAnalysisApiKtTypeByPsiTypeProviderTest.kt
+30 -9
View File
@@ -5,13 +5,13 @@
package org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.psiTypeProvider
import com.intellij.psi.PsiJavaFile
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiMethod
import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedTest
import org.jetbrains.kotlin.analysis.test.framework.project.structure.ktModuleProvider
import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
import org.jetbrains.kotlin.analysis.test.framework.utils.executeOnPooledThreadInReadAction
import org.jetbrains.kotlin.analysis.utils.printer.parentOfType
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
@@ -21,19 +21,14 @@ import org.jetbrains.kotlin.types.Variance
abstract class AbstractAnalysisApiKtTypeByPsiTypeProviderTest : AbstractAnalysisApiBasedTest() {
override fun doTestByMainFile(mainFile: KtFile, mainModule: TestModule, testServices: TestServices) {
val psiMethod = testServices.moduleStructure.modules.map { module ->
val psiFiles = testServices.ktModuleProvider.getModuleFiles(module).filterIsInstance<PsiJavaFile>()
val javaFile = psiFiles.first()
val offset = testServices.expressionMarkerProvider.getCaretPosition(javaFile)
PsiTreeUtil.getParentOfType(javaFile.findElementAt(offset), PsiMethod::class.java)
}.single()!!
val (psiMethod, useSitePosition) = getTestDataContext(testServices)
val actual = buildString {
executeOnPooledThreadInReadAction {
analyseForTest(mainFile) {
val returnType = psiMethod.returnType
testServices.assertions.assertNotNull(returnType)
val asKtTypeSuper = returnType!!.asKtType(psiMethod)!!
val asKtTypeSuper = returnType!!.asKtType(useSitePosition ?: psiMethod)!!
appendLine("PsiType: $returnType")
appendLine("KtType: ${asKtTypeSuper.render(position = Variance.OUT_VARIANCE)}")
}
@@ -43,3 +38,29 @@ abstract class AbstractAnalysisApiKtTypeByPsiTypeProviderTest : AbstractAnalysis
testServices.assertions.assertEqualsToTestDataFileSibling(actual)
}
}
private data class TestDataContext(val targetMethod: PsiMethod, val useSitePosition: PsiElement?)
private fun getTestDataContext(testServices: TestServices): TestDataContext {
var psiMethod: PsiMethod? = null
var useSitePosition: PsiElement? = null
testServices.moduleStructure.modules.forEach { module ->
val psiFiles = testServices.ktModuleProvider.getModuleFiles(module)
for (psiFile in psiFiles) {
val targetOffset = testServices.expressionMarkerProvider.getCaretPositionOrNull(psiFile)
if (targetOffset != null) {
if (psiMethod != null) error("Only one target method is expected")
psiMethod = psiFile.findElementAt(targetOffset)?.parentOfType<PsiMethod>(withSelf = true)
}
val useSiteOffset = testServices.expressionMarkerProvider.getCaretPositionOrNull(psiFile, caretTag = "useSite")
if (useSiteOffset != null) {
if (useSitePosition != null) error("Only one target method is expected")
useSitePosition = psiFile.findElementAt(useSiteOffset)?.parentOfType<PsiElement>(withSelf = true)
}
}
}
return TestDataContext(psiMethod ?: error("Target method is not found"), useSitePosition)
}