diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightUtils.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightUtils.kt index ff585a554a7..a3a168dabbf 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightUtils.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightUtils.kt @@ -370,7 +370,7 @@ internal fun KtModifierListOwner.isDeprecated(support: KtUltraLightSupport? = nu val fqName = toQualifiedName(typeElement) ?: continue - if (fqName == deprecatedFqName || fqName == KotlinBuiltIns.FQ_NAMES.deprecatedSinceKotlin) return true + if (fqName == deprecatedFqName) return true if (fqName.asString() == deprecatedName) return true } diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtPsiUtil.java b/compiler/psi/src/org/jetbrains/kotlin/psi/KtPsiUtil.java index e6b60f7315f..67b7a99d193 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtPsiUtil.java +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtPsiUtil.java @@ -178,8 +178,7 @@ public class KtPsiUtil { List annotationEntries = modifierList.getAnnotationEntries(); for (KtAnnotationEntry annotation : annotationEntries) { Name shortName = annotation.getShortName(); - if (KotlinBuiltIns.FQ_NAMES.deprecated.shortName().equals(shortName) || - KotlinBuiltIns.FQ_NAMES.deprecatedSinceKotlin.shortName().equals(shortName)) { + if (KotlinBuiltIns.FQ_NAMES.deprecated.shortName().equals(shortName)) { return true; } } diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java index 50eb9e1d2ef..fcebea1394f 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java @@ -1117,7 +1117,6 @@ public abstract class KotlinBuiltIns { return classFqNameEquals(descriptor, FQ_NAMES.cloneable); } - // TODO: support DeprecatedSinceKotlin public static boolean isDeprecated(@NotNull DeclarationDescriptor declarationDescriptor) { if (declarationDescriptor.getOriginal().getAnnotations().hasAnnotation(FQ_NAMES.deprecated)) return true; diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedCallableAddReplaceWithInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedCallableAddReplaceWithInspection.kt index 27e11d14893..517923b474c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedCallableAddReplaceWithInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedCallableAddReplaceWithInspection.kt @@ -103,7 +103,6 @@ class DeprecatedCallableAddReplaceWithInspection : AbstractApplicabilityBasedIns private fun KtCallableDeclaration.deprecatedAnnotationWithNoReplaceWith(): KtAnnotationEntry? { for (entry in annotationEntries) { - // TODO: support DeprecatedSinceKotlin here if (entry.shortName != DEPRECATED_NAME) continue val bindingContext = entry.analyze() val resolvedCall = entry.calleeExpression.getResolvedCall(bindingContext) ?: continue diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt index 6b227db8d05..e79b5f4e113 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt @@ -79,7 +79,6 @@ abstract class DeprecatedSymbolUsageFixBase( contextElement: KtSimpleNameExpression?, replaceInWholeProject: Boolean ): ReplaceWith? { - // TODO: support DeprecatedSinceKotlin val annotation = descriptor.annotations.findAnnotation(KotlinBuiltIns.FQ_NAMES.deprecated) ?: return null val replaceWithValue = annotation.argumentValue(Deprecated::replaceWith.name)?.safeAs()?.value ?: return null