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

[SLC] cover case with invalid java identifier as annotation argument

Browse Source 
^KT-56868 Fixed
^KT-57328
This commit is contained in:
Dmitrii Gridin
2023-03-14 19:33:31 +01:00
committed by Space Team
parent 948c511284
commit 71299f1d13
12 changed files with 93 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/symbolLightUtils.kt
+13 -6
View File
@@ -188,17 +188,24 @@ internal fun KtAnnotationValue.toAnnotationMemberValue(parent: PsiElement): PsiA
}
}
is KtEnumEntryAnnotationValue -> {
val fqName = this.callableId?.asSingleFqName()?.asString() ?: return null
val psiReference = PsiElementFactory.getInstance(parent.project).createReferenceFromText(fqName, parent)
SymbolPsiReference(sourcePsi, parent, psiReference)
}
is KtEnumEntryAnnotationValue -> asPsiReferenceExpression(parent)
KtUnsupportedAnnotationValue -> null
is KtKClassAnnotationValue -> toAnnotationMemberValue(parent)
}
}
private fun KtEnumEntryAnnotationValue.asPsiReferenceExpression(parent: PsiElement): SymbolPsiReference? {
val fqName = this.callableId?.asSingleFqName()?.asString() ?: return null
val elementFactory = PsiElementFactory.getInstance(parent.project)
val psiReference = try {
elementFactory.createReferenceFromText(fqName, parent)
} catch (_: IncorrectOperationException) {
return null
}
return SymbolPsiReference(sourcePsi, parent, psiReference)
}
private fun KtKClassAnnotationValue.toAnnotationMemberValue(parent: PsiElement): PsiExpression? {
val typeString = when (this) {
is KtKClassAnnotationValue.KtNonLocalKClassAnnotationValue -> classId.asSingleFqName().asString()
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTestBase.kt
+23 -7
View File
@@ -23,6 +23,7 @@ import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
import org.jetbrains.kotlin.test.directives.ConfigurationDirectives
import org.jetbrains.kotlin.test.directives.ModuleStructureDirectives
import org.jetbrains.kotlin.test.directives.model.Directive
import org.jetbrains.kotlin.test.directives.model.DirectiveApplicability
import org.jetbrains.kotlin.test.directives.model.SimpleDirectivesContainer
import org.jetbrains.kotlin.test.model.TestModule
@@ -65,7 +66,7 @@ abstract class AbstractSymbolLightClassesTestBase(
val ktFile = ktFiles.first()
val project = ktFile.project
ignoreExceptionIfIgnoreFirPresent(module) {
ignoreExceptionIfIgnoreDirectivePresent(module) {
compareResults(module, testServices) {
getRenderResult(ktFile, ktFiles, testDataPath, module, project)
}
@@ -75,7 +76,7 @@ abstract class AbstractSymbolLightClassesTestBase(
protected fun compareResults(module: TestModule, testServices: TestServices, computeActual: () -> String) {
val actual = computeActual().cleanup()
compareResults(testServices, actual)
removeIgnoreFir(module)
removeIgnoreDirectives(module)
removeDuplicatedFirJava(testServices)
}
@@ -95,13 +96,15 @@ abstract class AbstractSymbolLightClassesTestBase(
project: Project
): String
private inline fun ignoreExceptionIfIgnoreFirPresent(module: TestModule, action: () -> Unit) {
private inline fun ignoreExceptionIfIgnoreDirectivePresent(module: TestModule, action: () -> Unit) {
try {
action()
} catch (e: Throwable) {
if (Directives.IGNORE_FIR in module.directives) {
val directives = module.directives
if (Directives.IGNORE_FIR in directives || stopIfCompilationErrorDirectivePresent && Directives.IGNORE_LIBRARY_EXCEPTIONS in directives) {
return
}
throw e
}
}
@@ -114,10 +117,19 @@ abstract class AbstractSymbolLightClassesTestBase(
testServices.assertions.assertEqualsToFile(path, actual)
}
private fun removeIgnoreFir(module: TestModule) {
if (Directives.IGNORE_FIR in module.directives) {
error("Test is passing. Please, remove `// ${Directives.IGNORE_FIR.name}` directive")
private fun removeIgnoreDirectives(module: TestModule) {
val directives = module.directives
if (Directives.IGNORE_FIR in directives) {
throwTestIsPassingException(Directives.IGNORE_FIR)
}
if (stopIfCompilationErrorDirectivePresent && Directives.IGNORE_LIBRARY_EXCEPTIONS in directives) {
throwTestIsPassingException(Directives.IGNORE_LIBRARY_EXCEPTIONS)
}
}
private fun throwTestIsPassingException(directive: Directive): Nothing {
error("Test is passing. Please, remove `// ${directive.name}` directive")
}
protected fun findLightClass(fqname: String, project: Project): PsiClass? {
@@ -183,5 +195,9 @@ abstract class AbstractSymbolLightClassesTestBase(
description = "Ignore the test for Symbol FIR-based implementation of LC",
applicability = DirectiveApplicability.Global
)
val IGNORE_LIBRARY_EXCEPTIONS by stringDirective(
description = "Ignore the test for decompiled-based implementation of LC"
)
}
}
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByFqNameForLibraryTestGenerated.java
Generated
+6
View File
@@ -186,6 +186,12 @@ public class SymbolLightClassesByFqNameForLibraryTestGenerated extends AbstractS
runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/InlineReified.kt");
}
@Test
@TestMetadata("InvalidJavaIdentifierAsAnnotationArgument.kt")
public void testInvalidJavaIdentifierAsAnnotationArgument() throws Exception {
runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/InvalidJavaIdentifierAsAnnotationArgument.kt");
}
@Test
@TestMetadata("JavaBetween.kt")
public void testJavaBetween() throws Exception {
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesEqualityByFqNameForLibraryTestGenerated.java
Generated
+6
View File
@@ -186,6 +186,12 @@ public class SymbolLightClassesEqualityByFqNameForLibraryTestGenerated extends A
runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/InlineReified.kt");
}
@Test
@TestMetadata("InvalidJavaIdentifierAsAnnotationArgument.kt")
public void testInvalidJavaIdentifierAsAnnotationArgument() throws Exception {
runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/InvalidJavaIdentifierAsAnnotationArgument.kt");
}
@Test
@TestMetadata("JavaBetween.kt")
public void testJavaBetween() throws Exception {
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesParentingByFqNameForLibraryTestGenerated.java
Generated
+6
View File
@@ -186,6 +186,12 @@ public class SymbolLightClassesParentingByFqNameForLibraryTestGenerated extends
runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/InlineReified.kt");
}
@Test
@TestMetadata("InvalidJavaIdentifierAsAnnotationArgument.kt")
public void testInvalidJavaIdentifierAsAnnotationArgument() throws Exception {
runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/InvalidJavaIdentifierAsAnnotationArgument.kt");
}
@Test
@TestMetadata("JavaBetween.kt")
public void testJavaBetween() throws Exception {
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByFqNameForSourceTestGenerated.java
Generated
+6
View File
@@ -186,6 +186,12 @@ public class SymbolLightClassesByFqNameForSourceTestGenerated extends AbstractSy
runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/InlineReified.kt");
}
@Test
@TestMetadata("InvalidJavaIdentifierAsAnnotationArgument.kt")
public void testInvalidJavaIdentifierAsAnnotationArgument() throws Exception {
runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/InvalidJavaIdentifierAsAnnotationArgument.kt");
}
@Test
@TestMetadata("JavaBetween.kt")
public void testJavaBetween() throws Exception {
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesEqualityByFqNameForSourceTestGenerated.java
Generated
+6
View File
@@ -186,6 +186,12 @@ public class SymbolLightClassesEqualityByFqNameForSourceTestGenerated extends Ab
runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/InlineReified.kt");
}
@Test
@TestMetadata("InvalidJavaIdentifierAsAnnotationArgument.kt")
public void testInvalidJavaIdentifierAsAnnotationArgument() throws Exception {
runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/InvalidJavaIdentifierAsAnnotationArgument.kt");
}
@Test
@TestMetadata("JavaBetween.kt")
public void testJavaBetween() throws Exception {
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesParentingByFqNameForSourceTestGenerated.java
Generated
+6
View File
@@ -186,6 +186,12 @@ public class SymbolLightClassesParentingByFqNameForSourceTestGenerated extends A
runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/InlineReified.kt");
}
@Test
@TestMetadata("InvalidJavaIdentifierAsAnnotationArgument.kt")
public void testInvalidJavaIdentifierAsAnnotationArgument() throws Exception {
runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/InvalidJavaIdentifierAsAnnotationArgument.kt");
}
@Test
@TestMetadata("JavaBetween.kt")
public void testJavaBetween() throws Exception {
compiler/testData/asJava/lightClasses/lightClassByFqName/InvalidJavaIdentifierAsAnnotationArgument.descriptors.java
Vendored
+4
View File
@@ -0,0 +1,4 @@
@Sized(value = Size.3x3)
public final class Big /* Big*/ {
public Big();// .ctor()
}
compiler/testData/asJava/lightClasses/lightClassByFqName/InvalidJavaIdentifierAsAnnotationArgument.java
Vendored
+4
View File
@@ -0,0 +1,4 @@
@Sized(value = ?)
public final class Big /* Big*/ {
public Big();// .ctor()
}
compiler/testData/asJava/lightClasses/lightClassByFqName/InvalidJavaIdentifierAsAnnotationArgument.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
// Big
enum class Size { `2x2`, `3x3` }
annotation class Sized(val value: Size)
@Sized(Size.`3x3`)
class Big
// IGNORE_LIBRARY_EXCEPTIONS: KT-57328
compiler/tests-gen/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java
Generated
+5
View File
@@ -164,6 +164,11 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT
runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/InlineReified.kt");
}
@TestMetadata("InvalidJavaIdentifierAsAnnotationArgument.kt")
public void testInvalidJavaIdentifierAsAnnotationArgument() throws Exception {
runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/InvalidJavaIdentifierAsAnnotationArgument.kt");
}
@TestMetadata("JavaBetween.kt")
public void testJavaBetween() throws Exception {
runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/JavaBetween.kt");