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

[AA] rename from NullAnnotationUseSiteTargetFilter to NoAnnotationUseSiteTargetFilter

Browse Source 
^KT-56046
This commit is contained in:
Dmitrii Gridin
2023-02-02 16:56:28 +01:00
committed by Space Team
parent 197160fbd7
commit 482bc15a70
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/annotations/AnnotationUseSiteTargetFilter.kt
+2 -2
View File
@@ -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
}
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/symbolAnnotationsUtils.kt
+2 -2
View File
@@ -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(
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/SymbolLightFieldForEnumEntry.kt
+2 -2
View File
@@ -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<KtEnumEntrySymbol>(),
annotationUseSiteTargetFilter = annotationUseSiteTargetFilterOf(
NullAnnotationUseSiteTargetFilter,
NoAnnotationUseSiteTargetFilter,
FieldAnnotationUseSiteTargetFilter,
PropertyAnnotationUseSiteTargetFilter,
),