From 89dbc4daec61e71070e37b78dbd297f6a20c2c8a Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Thu, 4 May 2023 19:48:44 +0200 Subject: [PATCH] [Analysis API] tests: add possibility to avoid FqName for Kt psi classes in ExpressionMarkerProvider --- .../services/ExpressionMarkersSourceFilePreprocessor.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/ExpressionMarkersSourceFilePreprocessor.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/ExpressionMarkersSourceFilePreprocessor.kt index 93a1059223d..7ec65db84a7 100644 --- a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/ExpressionMarkersSourceFilePreprocessor.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/ExpressionMarkersSourceFilePreprocessor.kt @@ -137,7 +137,9 @@ class ExpressionMarkerProvider : TestService { fun getSelectedElementOfTypeByDirective(ktFile: KtFile, module: TestModule): PsiElement { val selectedElement = getSelectedElement(ktFile) val expectedType = module.directives[Directives.LOOK_UP_FOR_ELEMENT_OF_TYPE].firstOrNull() ?: return selectedElement - @Suppress("UNCHECKED_CAST") val expectedClass = Class.forName(expectedType) as Class + val ktPsiPackage = "org.jetbrains.kotlin.psi." + val expectedTypeFqName = ktPsiPackage + expectedType.removePrefix(ktPsiPackage) + @Suppress("UNCHECKED_CAST") val expectedClass = Class.forName(expectedTypeFqName) as Class if (expectedClass.isInstance(selectedElement)) return selectedElement return selectedElement.collectDescendantsOfType {