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

Disallow usages of experimental markers as qualifiers

Browse Source 
Only allow explicit imports of markers, but not of nested classes
declared in them
This commit is contained in:
Alexander Udalov
2018-05-04 17:06:26 +02:00
parent d27657e8f6
commit 143c3ccb95
3 changed files with 47 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ExperimentalUsageChecker.kt
+7 -6
View File
@@ -26,7 +26,6 @@ import org.jetbrains.kotlin.incremental.components.NoLookupLocation
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
import org.jetbrains.kotlin.psi.psiUtil.getTopmostParentQualifiedExpressionForSelector
import org.jetbrains.kotlin.resolve.*
import org.jetbrains.kotlin.resolve.calls.checkers.CallChecker
@@ -246,7 +245,7 @@ class ExperimentalUsageChecker(project: Project) : CallChecker {
else -> null
}
if (targetClass != null && targetClass.loadExperimentalityForMarkerAnnotation() != null) {
if (!element.isUsageAsAnnotationOrQualifier() &&
if (!element.isUsageAsAnnotationOrImport() &&
!element.isUsageAsUseExperimentalArgument(context.trace.bindingContext)
) {
context.trace.report(
@@ -261,12 +260,12 @@ class ExperimentalUsageChecker(project: Project) : CallChecker {
context.trace.report(Errors.EXPERIMENTAL_IS_NOT_ENABLED.on(element))
}
if (!element.isUsageAsAnnotationOrQualifier()) {
if (!element.isUsageAsAnnotationOrImport() && !element.isUsageAsQualifier()) {
context.trace.report(Errors.EXPERIMENTAL_CAN_ONLY_BE_USED_AS_ANNOTATION.on(element))
}
}
private fun PsiElement.isUsageAsAnnotationOrQualifier(): Boolean {
private fun PsiElement.isUsageAsAnnotationOrImport(): Boolean {
val parent = parent
if (parent is KtUserType) {
@@ -275,6 +274,10 @@ class ExperimentalUsageChecker(project: Project) : CallChecker {
parent.parent.parent.parent is KtAnnotationEntry
}
return parent is KtDotQualifiedExpression && parent.parent is KtImportDirective
}
private fun PsiElement.isUsageAsQualifier(): Boolean {
if (this is KtSimpleNameExpression) {
val qualifier = getTopmostParentQualifiedExpressionForSelector() ?: this
if ((qualifier.parent as? KtDotQualifiedExpression)?.receiverExpression == qualifier) {
@@ -282,8 +285,6 @@ class ExperimentalUsageChecker(project: Project) : CallChecker {
}
}
if (getParentOfType<KtImportDirective>(true) != null) return true
return false
}