From 482bc15a7053a6580eb1798dc51741e24a73352c Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Thu, 2 Feb 2023 16:56:28 +0100 Subject: [PATCH] [AA] rename from NullAnnotationUseSiteTargetFilter to NoAnnotationUseSiteTargetFilter ^KT-56046 --- .../analysis/api/annotations/AnnotationUseSiteTargetFilter.kt | 4 ++-- .../classes/symbol/annotations/symbolAnnotationsUtils.kt | 4 ++-- .../classes/symbol/fields/SymbolLightFieldForEnumEntry.kt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/annotations/AnnotationUseSiteTargetFilter.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/annotations/AnnotationUseSiteTargetFilter.kt index 0142c25963a..c26d5c3f8b8 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/annotations/AnnotationUseSiteTargetFilter.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/annotations/AnnotationUseSiteTargetFilter.kt @@ -12,7 +12,7 @@ public fun interface AnnotationUseSiteTargetFilter { } public fun AnnotationUseSiteTarget?.toFilter(): AnnotationUseSiteTargetFilter = when (this) { - null -> NullAnnotationUseSiteTargetFilter + null -> NoAnnotationUseSiteTargetFilter AnnotationUseSiteTarget.FIELD -> FieldAnnotationUseSiteTargetFilter AnnotationUseSiteTarget.FILE -> FileAnnotationUseSiteTargetFilter AnnotationUseSiteTarget.PROPERTY -> PropertyAnnotationUseSiteTargetFilter @@ -28,7 +28,7 @@ public object AnyAnnotationUseSiteTargetFilter : AnnotationUseSiteTargetFilter { override fun isAllowed(useSiteTarget: AnnotationUseSiteTarget?): Boolean = true } -public object NullAnnotationUseSiteTargetFilter : AnnotationUseSiteTargetFilter { +public object NoAnnotationUseSiteTargetFilter : AnnotationUseSiteTargetFilter { override fun isAllowed(useSiteTarget: AnnotationUseSiteTarget?): Boolean = useSiteTarget == null } diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/symbolAnnotationsUtils.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/symbolAnnotationsUtils.kt index 685c09ded0f..2dcff1ff6fa 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/symbolAnnotationsUtils.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/symbolAnnotationsUtils.kt @@ -25,9 +25,9 @@ import org.jetbrains.kotlin.name.StandardClassIds import org.jetbrains.kotlin.resolve.deprecation.DeprecationLevelValue internal fun AnnotationUseSiteTarget?.toFilterWithAdditionalNull(): AnnotationUseSiteTargetFilter { - if (this == null) return NullAnnotationUseSiteTargetFilter + if (this == null) return NoAnnotationUseSiteTargetFilter - return annotationUseSiteTargetFilterOf(NullAnnotationUseSiteTargetFilter, toFilter()) + return annotationUseSiteTargetFilterOf(NoAnnotationUseSiteTargetFilter, toFilter()) } internal fun annotationUseSiteTargetFilterOf( diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/SymbolLightFieldForEnumEntry.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/SymbolLightFieldForEnumEntry.kt index 5d28874bb1a..ced75e26324 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/SymbolLightFieldForEnumEntry.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/SymbolLightFieldForEnumEntry.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.light.classes.symbol.fields import com.intellij.psi.* import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.annotations.FieldAnnotationUseSiteTargetFilter -import org.jetbrains.kotlin.analysis.api.annotations.NullAnnotationUseSiteTargetFilter +import org.jetbrains.kotlin.analysis.api.annotations.NoAnnotationUseSiteTargetFilter import org.jetbrains.kotlin.analysis.api.annotations.PropertyAnnotationUseSiteTargetFilter import org.jetbrains.kotlin.analysis.api.symbols.KtEnumEntrySymbol import org.jetbrains.kotlin.analysis.api.symbols.pointers.symbolPointerOfType @@ -46,7 +46,7 @@ internal class SymbolLightFieldForEnumEntry( ktModule = ktModule, annotatedSymbolPointer = enumEntry.symbolPointerOfType(), annotationUseSiteTargetFilter = annotationUseSiteTargetFilterOf( - NullAnnotationUseSiteTargetFilter, + NoAnnotationUseSiteTargetFilter, FieldAnnotationUseSiteTargetFilter, PropertyAnnotationUseSiteTargetFilter, ),