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

Don't perform additional lookups for DeprecatedSinceKotlin annotation

Browse Source 
There is no need to check it as `DeprecatedSinceKotlin` can be used
 only along with `Deprecated` annotation
This commit is contained in:
Mikhail Zarechenskiy
2020-06-17 18:59:01 +03:00
parent 158013ef3a
commit 0f2c96c64d
5 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightUtils.kt
+1 -1
View File
@@ -370,7 +370,7 @@ internal fun KtModifierListOwner.isDeprecated(support: KtUltraLightSupport? = nu
val fqName = toQualifiedName(typeElement) ?: continue 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 if (fqName.asString() == deprecatedName) return true
} }
compiler/psi/src/org/jetbrains/kotlin/psi/KtPsiUtil.java
+1 -2
View File
@@ -178,8 +178,7 @@ public class KtPsiUtil {
List<KtAnnotationEntry> annotationEntries = modifierList.getAnnotationEntries(); List<KtAnnotationEntry> annotationEntries = modifierList.getAnnotationEntries();
for (KtAnnotationEntry annotation : annotationEntries) { for (KtAnnotationEntry annotation : annotationEntries) {
Name shortName = annotation.getShortName(); Name shortName = annotation.getShortName();
if (KotlinBuiltIns.FQ_NAMES.deprecated.shortName().equals(shortName) || if (KotlinBuiltIns.FQ_NAMES.deprecated.shortName().equals(shortName)) {
KotlinBuiltIns.FQ_NAMES.deprecatedSinceKotlin.shortName().equals(shortName)) {
return true; return true;
} }
} }
core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
-1
View File
@@ -1117,7 +1117,6 @@ public abstract class KotlinBuiltIns {
return classFqNameEquals(descriptor, FQ_NAMES.cloneable); return classFqNameEquals(descriptor, FQ_NAMES.cloneable);
} }
// TODO: support DeprecatedSinceKotlin
public static boolean isDeprecated(@NotNull DeclarationDescriptor declarationDescriptor) { public static boolean isDeprecated(@NotNull DeclarationDescriptor declarationDescriptor) {
if (declarationDescriptor.getOriginal().getAnnotations().hasAnnotation(FQ_NAMES.deprecated)) return true; if (declarationDescriptor.getOriginal().getAnnotations().hasAnnotation(FQ_NAMES.deprecated)) return true;
idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedCallableAddReplaceWithInspection.kt
-1
View File
@@ -103,7 +103,6 @@ class DeprecatedCallableAddReplaceWithInspection : AbstractApplicabilityBasedIns
private fun KtCallableDeclaration.deprecatedAnnotationWithNoReplaceWith(): KtAnnotationEntry? { private fun KtCallableDeclaration.deprecatedAnnotationWithNoReplaceWith(): KtAnnotationEntry? {
for (entry in annotationEntries) { for (entry in annotationEntries) {
// TODO: support DeprecatedSinceKotlin here
if (entry.shortName != DEPRECATED_NAME) continue if (entry.shortName != DEPRECATED_NAME) continue
val bindingContext = entry.analyze() val bindingContext = entry.analyze()
val resolvedCall = entry.calleeExpression.getResolvedCall(bindingContext) ?: continue val resolvedCall = entry.calleeExpression.getResolvedCall(bindingContext) ?: continue
idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt
-1
View File
@@ -79,7 +79,6 @@ abstract class DeprecatedSymbolUsageFixBase(
contextElement: KtSimpleNameExpression?, contextElement: KtSimpleNameExpression?,
replaceInWholeProject: Boolean replaceInWholeProject: Boolean
): ReplaceWith? { ): ReplaceWith? {
// TODO: support DeprecatedSinceKotlin
val annotation = descriptor.annotations.findAnnotation(KotlinBuiltIns.FQ_NAMES.deprecated) ?: return null val annotation = descriptor.annotations.findAnnotation(KotlinBuiltIns.FQ_NAMES.deprecated) ?: return null
val replaceWithValue = val replaceWithValue =
annotation.argumentValue(Deprecated::replaceWith.name)?.safeAs<AnnotationValue>()?.value ?: return null annotation.argumentValue(Deprecated::replaceWith.name)?.safeAs<AnnotationValue>()?.value ?: return null