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

[LL FIR] getSelectedElement should return PsiElement

Browse Source 
^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
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/callResolver/AbstractResolveCallTest.kt
+1 -2
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.callResolver 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.KtAnalysisSession
import org.jetbrains.kotlin.analysis.api.calls.KtCallInfo import org.jetbrains.kotlin.analysis.api.calls.KtCallInfo
import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.stringRepresentation 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() { abstract class AbstractResolveCallTest : AbstractAnalysisApiBasedSingleModuleTest() {
override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) {
val ktFile = ktFiles.first() val ktFile = ktFiles.first()
val expression = testServices.expressionMarkerProvider.getSelectedElement(ktFile) val expression = testServices.expressionMarkerProvider.getSelectedElementOfType<KtElement>(ktFile)
val actual = executeOnPooledThreadInReadAction { val actual = executeOnPooledThreadInReadAction {
analyseForTest(expression) { analyseForTest(expression) {
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/callResolver/AbstractResolveCandidatesTest.kt
+1 -1
View File
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.test.services.assertions
abstract class AbstractResolveCandidatesTest : AbstractAnalysisApiBasedSingleModuleTest() { abstract class AbstractResolveCandidatesTest : AbstractAnalysisApiBasedSingleModuleTest() {
override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) { override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) {
val ktFile = ktFiles.first() val ktFile = ktFiles.first()
val expression = testServices.expressionMarkerProvider.getSelectedElement(ktFile) val expression = testServices.expressionMarkerProvider.getSelectedElementOfType<KtElement>(ktFile)
val actual = executeOnPooledThreadInReadAction { val actual = executeOnPooledThreadInReadAction {
analyseForTest(expression) { analyseForTest(expression) {
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/AbstractReferenceShortenerTest.kt
+2 -1
View File
@@ -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.base.AbstractAnalysisApiBasedSingleModuleTest
import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
import org.jetbrains.kotlin.analysis.test.framework.utils.executeOnPooledThreadInReadAction 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.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
@@ -22,7 +23,7 @@ import org.jetbrains.kotlin.test.services.assertions
*/ */
abstract class AbstractReferenceShortenerTest : AbstractAnalysisApiBasedSingleModuleTest() { abstract class AbstractReferenceShortenerTest : AbstractAnalysisApiBasedSingleModuleTest() {
override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) { 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 { val shortenings = executeOnPooledThreadInReadAction {
analyseForTest(element) { analyseForTest(element) {
analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/ExpressionMarkersSourceFilePreprocessor.kt
+4 -5
View File
@@ -124,14 +124,13 @@ class ExpressionMarkerProvider : TestService {
} }
fun getSelectedElement(file: KtFile): KtElement { fun getSelectedElement(file: KtFile): PsiElement {
val range = selected[file.name] val range = selected[file.name] ?: error("No selected expression found in file")
?: error("No selected expression found in file")
val elements = file.elementsInRange(range).trimWhitespaces() val elements = file.elementsInRange(range).trimWhitespaces()
if (elements.size != 1) { if (elements.size != 1) {
error("Expected one element at rage but found ${elements.size} [${elements.joinToString { it::class.simpleName + ": " + it.text }}]") error("Expected one element at rage but found ${elements.size} [${elements.joinToString { it::class.simpleName + ": " + it.text }}]")
} }
return elements.single() as KtElement return elements.single()
} }
fun getSelectedElementOfTypeByDirective(ktFile: KtFile, module: TestModule): PsiElement { fun getSelectedElementOfTypeByDirective(ktFile: KtFile, module: TestModule): PsiElement {
@@ -150,7 +149,7 @@ class ExpressionMarkerProvider : TestService {
inline fun <reified E : KtElement> getSelectedElementOfType(file: KtFile): E { inline fun <reified E : KtElement> getSelectedElementOfType(file: KtFile): E {
return when (val selected = getSelectedElement(file)) { return when (val selected = getSelectedElement(file)) {
is E -> selected is E -> selected
else -> generateSequence(selected as PsiElement) { current -> else -> generateSequence(selected) { current ->
current.children.singleOrNull()?.takeIf { it.textRange == current.textRange } current.children.singleOrNull()?.takeIf { it.textRange == current.textRange }
}.firstIsInstance() }.firstIsInstance()
} }