From 9bc6d6ae924e24492aa292c3521e7ac0564c9566 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 23 Sep 2016 14:05:35 +0300 Subject: [PATCH] Remove recursion workaround from DeprecatedClassifierUsageChecker --- .../resolve/DeprecatedClassifierUsageChecker.kt | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeprecatedClassifierUsageChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeprecatedClassifierUsageChecker.kt index 418d2f1ae7c..a7249f815a8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeprecatedClassifierUsageChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeprecatedClassifierUsageChecker.kt @@ -18,20 +18,9 @@ package org.jetbrains.kotlin.resolve import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.ClassifierDescriptor -import org.jetbrains.kotlin.psi.KtAnnotationEntry -import org.jetbrains.kotlin.psi.KtStubbedPsiUtil -import org.jetbrains.kotlin.psi.KtSuperTypeCallEntry class DeprecatedClassifierUsageChecker : ClassifierUsageChecker { override fun check(targetDescriptor: ClassifierDescriptor, trace: BindingTrace, element: PsiElement) { - // Do not check types in annotation entries to prevent cycles in resolve, rely on call message - val annotationEntry = KtStubbedPsiUtil.getPsiOrStubParent(element, KtAnnotationEntry::class.java, true) - if (annotationEntry != null && annotationEntry.calleeExpression!!.constructorReferenceExpression == element) return - - // Do not check types in calls to super constructor in extends list, rely on call message - val superExpression = KtStubbedPsiUtil.getPsiOrStubParent(element, KtSuperTypeCallEntry::class.java, true) - if (superExpression != null && superExpression.calleeExpression.constructorReferenceExpression == element) return - val deprecation = targetDescriptor.getDeprecation() if (deprecation != null) { trace.report(createDeprecationDiagnostic(element, deprecation))