[LL FIR] getSelectedElement should return PsiElement

^KT-60518
This commit is contained in:
Dmitrii Gridin
2023-07-18 15:23:00 +02:00
committed by Space Team
parent 5f1e2764c3
commit c2fd245ca1
4 changed files with 8 additions and 9 deletions
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.callResolver
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
import org.jetbrains.kotlin.analysis.api.calls.KtCallInfo
import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.stringRepresentation
@@ -20,7 +19,7 @@ import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractResolveCallTest : AbstractAnalysisApiBasedSingleModuleTest() {
override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) {
val ktFile = ktFiles.first()
val expression = testServices.expressionMarkerProvider.getSelectedElement(ktFile)
val expression = testServices.expressionMarkerProvider.getSelectedElementOfType<KtElement>(ktFile)
val actual = executeOnPooledThreadInReadAction {
analyseForTest(expression) {
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractResolveCandidatesTest : AbstractAnalysisApiBasedSingleModuleTest() {
override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) {
val ktFile = ktFiles.first()
val expression = testServices.expressionMarkerProvider.getSelectedElement(ktFile)
val expression = testServices.expressionMarkerProvider.getSelectedElementOfType<KtElement>(ktFile)
val actual = executeOnPooledThreadInReadAction {
analyseForTest(expression) {
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.references.Shorten
import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedSingleModuleTest
import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
import org.jetbrains.kotlin.analysis.test.framework.utils.executeOnPooledThreadInReadAction
import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
@@ -22,7 +23,7 @@ import org.jetbrains.kotlin.test.services.assertions
*/
abstract class AbstractReferenceShortenerTest : AbstractAnalysisApiBasedSingleModuleTest() {
override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) {
val element = testServices.expressionMarkerProvider.getSelectedElement(ktFiles.first())
val element = testServices.expressionMarkerProvider.getSelectedElementOfType<KtElement>(ktFiles.first())
val shortenings = executeOnPooledThreadInReadAction {
analyseForTest(element) {