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

Enum entries: add new tests with language feature ON & fix checker

Browse Source
This commit is contained in:
Mikhail Glukhikh
2023-01-24 08:48:54 +01:00
committed by Space Team
parent c534c54a1c
commit 41966a745e
24 changed files with 574 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/CustomEnumEntriesMigrationCallChecker.kt
+8 -2
View File
@@ -32,7 +32,12 @@ object CustomEnumEntriesMigrationCallChecker : CallChecker {
) {
context.trace.report(Errors.DEPRECATED_ACCESS_TO_ENUM_ENTRY_COMPANION_PROPERTY.on(reportOn))
} else if (descriptor.isCallToExternalEntriesInsideEnum(reportOn)) {
context.trace.report(Errors.DEPRECATED_ACCESS_TO_ENTRY_PROPERTY_FROM_ENUM.on(reportOn))
if (context.trace.bindingContext.diagnostics.forElement(reportOn).none {
it.factory == Errors.DEPRECATED_ACCESS_TO_ENTRY_PROPERTY_FROM_ENUM
}
) {
context.trace.report(Errors.DEPRECATED_ACCESS_TO_ENTRY_PROPERTY_FROM_ENUM.on(reportOn))
}
} else if (descriptor.isReferenceToMemberEntriesWithoutExpectedFunctionalType(reportOn, context)) {
context.trace.report(Errors.DEPRECATED_ACCESS_TO_ENUM_ENTRY_PROPERTY_AS_REFERENCE.on(reportOn))
}
@@ -54,8 +59,9 @@ object CustomEnumEntriesMigrationCallChecker : CallChecker {
}
private fun PropertyDescriptor.isCallToExternalEntriesInsideEnum(contextExpression: PsiElement): Boolean {
val parent = contextExpression.parent
return !DescriptorUtils.isEnumClass(this.containingDeclaration) &&
contextExpression.parent !is KtDotQualifiedExpression &&
(parent !is KtDotQualifiedExpression || parent.receiverExpression === contextExpression) &&
contextExpression.parentsWithSelf.any { it is KtClass && it.isEnum() }
}