diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirDeprecationChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirDeprecationChecker.kt index 5bfdb975156..b604c9c9dcb 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirDeprecationChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirDeprecationChecker.kt @@ -5,6 +5,8 @@ package org.jetbrains.kotlin.fir.analysis.checkers.expression +import org.jetbrains.kotlin.descriptors.Deprecation +import org.jetbrains.kotlin.descriptors.DeprecationLevelValue import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.FirRealSourceElementKind @@ -14,8 +16,6 @@ import org.jetbrains.kotlin.fir.analysis.checkers.toRegularClassSymbol import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn -import org.jetbrains.kotlin.fir.declarations.Deprecation -import org.jetbrains.kotlin.fir.declarations.DeprecationLevelValue import org.jetbrains.kotlin.fir.declarations.getDeprecation import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/declarations/deprecationUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/declarations/deprecationUtils.kt index 1849f14c1fe..1f675d8bb9b 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/declarations/deprecationUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/declarations/deprecationUtils.kt @@ -7,6 +7,8 @@ package org.jetbrains.kotlin.fir.declarations import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.config.ApiVersion +import org.jetbrains.kotlin.descriptors.Deprecation +import org.jetbrains.kotlin.descriptors.DeprecationLevelValue import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.fir.FirAnnotationContainer import org.jetbrains.kotlin.fir.FirElement @@ -79,7 +81,7 @@ fun List.getDeprecationInfosFromAnnotations(currentVersion: A return DeprecationsPerUseSite.fromMap(deprecationByUseSite) } -private fun FirBasedSymbol<*>.getDeprecationForCallSite( +fun FirBasedSymbol<*>.getDeprecationForCallSite( vararg sites: AnnotationUseSiteTarget ): Deprecation? { val deprecations = when (this) { diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionStages.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionStages.kt index 495673e709a..b685448281b 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionStages.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionStages.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.fir.resolve.calls +import org.jetbrains.kotlin.descriptors.DeprecationLevelValue import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.fir.FirVisibilityChecker import org.jetbrains.kotlin.fir.declarations.* diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/FirDiagnostics.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/FirDiagnostics.kt index ebb8da3a224..f7e05c028c6 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/FirDiagnostics.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/FirDiagnostics.kt @@ -6,13 +6,11 @@ package org.jetbrains.kotlin.fir.resolve.diagnostics import kotlinx.collections.immutable.ImmutableList +import org.jetbrains.kotlin.descriptors.Deprecation import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.declarations.Deprecation import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration -import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.declarations.FirVariable import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnosticWithSource import org.jetbrains.kotlin.fir.render import org.jetbrains.kotlin.fir.resolve.calls.Candidate diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/deprecations.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/deprecations.kt index 0fe02817788..ab41c0b2378 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/deprecations.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/deprecations.kt @@ -1,5 +1,6 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.descriptors.Deprecation import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.utils.keysToMap import org.jetbrains.kotlin.utils.keysToMapExceptNulls @@ -81,23 +82,4 @@ class DeprecationsPerUseSite( } -data class Deprecation( - val level: DeprecationLevelValue, - val inheritable: Boolean, - val message: String? = null -) : Comparable { - override fun compareTo(other: Deprecation): Int { - val lr = level.compareTo(other.level) - //to prefer inheritable deprecation - return if (lr == 0 && !inheritable && other.inheritable) 1 - else lr - } -} - -// values from kotlin.DeprecationLevel -enum class DeprecationLevelValue { - WARNING, ERROR, HIDDEN -} - val EmptyDeprecationsPerUseSite = DeprecationsPerUseSite(null, null) - diff --git a/core/compiler.common/src/org/jetbrains/kotlin/descriptors/Deprecation.kt b/core/compiler.common/src/org/jetbrains/kotlin/descriptors/Deprecation.kt new file mode 100644 index 00000000000..d94ebe25fb8 --- /dev/null +++ b/core/compiler.common/src/org/jetbrains/kotlin/descriptors/Deprecation.kt @@ -0,0 +1,27 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.descriptors + +data class Deprecation( + val level: DeprecationLevelValue, + val inheritable: Boolean, + val message: String? = null +) : Comparable { + override fun compareTo(other: Deprecation): Int { + val lr = level.compareTo(other.level) + //to prefer inheritable deprecation + return if (lr == 0 && !inheritable && other.inheritable) 1 + else lr + } +} + +/** + * This corresponds to [DeprecationLevel] in Kotlin standard library. A symbol annotated with [java.lang.Deprecated] is considered a + * warning. + */ +enum class DeprecationLevelValue { + WARNING, ERROR, HIDDEN +} diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/KtAnalysisSession.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/KtAnalysisSession.kt index 61c53c010af..8254cda4b12 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/KtAnalysisSession.kt +++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/KtAnalysisSession.kt @@ -6,10 +6,13 @@ package org.jetbrains.kotlin.idea.frontend.api import org.jetbrains.kotlin.idea.frontend.api.components.* -import org.jetbrains.kotlin.idea.frontend.api.symbols.* +import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol +import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbolProvider +import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbolProviderMixIn import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.idea.frontend.api.tokens.ValidityToken -import org.jetbrains.kotlin.psi.* +import org.jetbrains.kotlin.psi.KtElement +import org.jetbrains.kotlin.psi.KtFile /** * The entry point into all frontend-related work. Has the following contracts: @@ -36,6 +39,7 @@ public abstract class KtAnalysisSession(final override val token: ValidityToken) KtTypeInfoProviderMixIn, KtSymbolProviderMixIn, KtSymbolContainingDeclarationProviderMixIn, + KtSymbolInfoProviderMixIn, KtSubtypingComponentMixIn, KtExpressionInfoProviderMixIn, KtCompileTimeConstantProviderMixIn, @@ -112,6 +116,9 @@ public abstract class KtAnalysisSession(final override val token: ValidityToken) internal val inheritorsProvider: KtInheritorsProvider get() = inheritorsProviderImpl protected abstract val inheritorsProviderImpl: KtInheritorsProvider + internal val symbolInfoProvider: KtSymbolInfoProvider get() = symbolInfoProviderImpl + protected abstract val symbolInfoProviderImpl: KtSymbolInfoProvider + @PublishedApi internal val typesCreator: KtTypeCreator get() = typesCreatorImpl diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSymbolInfoProvider.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSymbolInfoProvider.kt new file mode 100644 index 00000000000..57300e7b037 --- /dev/null +++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSymbolInfoProvider.kt @@ -0,0 +1,36 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.idea.frontend.api.components + +import org.jetbrains.kotlin.descriptors.Deprecation +import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPropertySymbol +import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol + +public abstract class KtSymbolInfoProvider : KtAnalysisSessionComponent() { + public abstract fun getDeprecation(symbol: KtSymbol): Deprecation? + public abstract fun getGetterDeprecation(symbol: KtPropertySymbol): Deprecation? + public abstract fun getSetterDeprecation(symbol: KtPropertySymbol): Deprecation? +} + +public interface KtSymbolInfoProviderMixIn : KtAnalysisSessionMixIn { + /** + * Gets the deprecation status of the given symbol. Returns null if the symbol it not deprecated. + */ + public val KtSymbol.deprecationStatus: Deprecation? get() = analysisSession.symbolInfoProvider.getDeprecation(this) + + /** + * Gets the deprecation status of the getter of this property symbol. Returns null if the getter it not deprecated. + */ + public val KtPropertySymbol.getterDeprecationStatus: Deprecation? + get() = analysisSession.symbolInfoProvider.getGetterDeprecation(this) + + /** + * Gets the deprecation status of the setter of this property symbol. Returns null if the setter it not deprecated or the property does + * not have a setter. + */ + public val KtPropertySymbol.setterDeprecationStatus: Deprecation? + get() = analysisSession.symbolInfoProvider.getSetterDeprecation(this) +} \ No newline at end of file diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/DebugSymbolRenderer.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/DebugSymbolRenderer.kt index 0bc8fb4f33e..306af19e554 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/DebugSymbolRenderer.kt +++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/DebugSymbolRenderer.kt @@ -5,6 +5,9 @@ package org.jetbrains.kotlin.idea.frontend.api.symbols +import org.jetbrains.kotlin.descriptors.Deprecation +import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession +import org.jetbrains.kotlin.idea.frontend.api.components.KtSymbolInfoProviderMixIn import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.* import org.jetbrains.kotlin.idea.frontend.api.types.KtType import org.jetbrains.kotlin.name.CallableId @@ -12,7 +15,10 @@ import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import java.lang.reflect.InvocationTargetException +import kotlin.reflect.KClass import kotlin.reflect.KProperty +import kotlin.reflect.KProperty2 +import kotlin.reflect.full.declaredMemberExtensionProperties import kotlin.reflect.jvm.javaGetter public object DebugSymbolRenderer { @@ -25,6 +31,23 @@ public object DebugSymbolRenderer { } public fun render(symbol: KtSymbol): String = buildString { + renderImpl(symbol) + } + + public fun KtAnalysisSession.renderExtra(symbol: KtSymbol): String = buildString { + renderImpl(symbol) + KtSymbolInfoProviderMixIn::class.declaredMemberExtensionProperties.forEach { prop -> + val symbolClass = prop.parameters[1].type.classifier as? KClass<*> ?: return@forEach + if (symbolClass.isInstance(symbol)) { + @Suppress("UNCHECKED_CAST") + val value = (prop as KProperty2).invoke(this@renderExtra, symbol) + val stringValue = renderValue(value) + appendLine(INDENT, "${prop.name}: $stringValue") + } + } + } + + private fun StringBuilder.renderImpl(symbol: KtSymbol) { val klass = symbol::class appendLine("${klass.simpleName}:") klass.members.filterIsInstance>().sortedBy { it.name }.forEach { property -> @@ -79,6 +102,7 @@ public object DebugSymbolRenderer { append(INDENT, "psi: ${renderValue(value.psi)}") } is KtTypeAndAnnotations -> "${renderValue(value.annotations)} ${renderValue(value.type)}" + is Deprecation -> value.toString() else -> value::class.simpleName!! } diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSession.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSession.kt index ffd0c9a9642..8bf648dba18 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSession.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSession.kt @@ -11,7 +11,8 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.moduleData import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider import org.jetbrains.kotlin.fir.resolve.symbolProvider -import org.jetbrains.kotlin.idea.fir.low.level.api.api.* +import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState +import org.jetbrains.kotlin.idea.fir.low.level.api.api.LowLevelFirApiFacadeForResolveOnAir import org.jetbrains.kotlin.idea.frontend.api.InvalidWayOfUsingAnalysisSession import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession import org.jetbrains.kotlin.idea.frontend.api.components.* @@ -82,6 +83,8 @@ private constructor( override val inheritorsProviderImpl: KtInheritorsProvider = KtFirInheritorsProvider(this, token) + override val symbolInfoProviderImpl: KtSymbolInfoProvider = KtFirSymbolInfoProvider(this, token) + override val typesCreatorImpl: KtTypeCreator = KtFirTypeCreator(this, token) override fun createContextDependentCopy(originalKtFile: KtFile, elementToReanalyze: KtElement): KtAnalysisSession { diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSymbolInfoProvider.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSymbolInfoProvider.kt new file mode 100644 index 00000000000..15839c79d09 --- /dev/null +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSymbolInfoProvider.kt @@ -0,0 +1,50 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.idea.frontend.api.fir.components + +import org.jetbrains.kotlin.descriptors.Deprecation +import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget +import org.jetbrains.kotlin.fir.declarations.getDeprecationForCallSite +import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol +import org.jetbrains.kotlin.idea.frontend.api.components.KtSymbolInfoProvider +import org.jetbrains.kotlin.idea.frontend.api.fir.KtFirAnalysisSession +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirBackingFieldSymbol +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirSymbol +import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPropertySymbol +import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol +import org.jetbrains.kotlin.idea.frontend.api.tokens.ValidityToken + +internal class KtFirSymbolInfoProvider( + override val analysisSession: KtFirAnalysisSession, + override val token: ValidityToken, +) : KtSymbolInfoProvider(), KtFirAnalysisSessionComponent { + override fun getDeprecation(symbol: KtSymbol): Deprecation? { + if (symbol is KtFirBackingFieldSymbol) return null + require(symbol is KtFirSymbol<*>) + return symbol.firRef.withFir { + val firSymbol = it.symbol + if (firSymbol is FirPropertySymbol) { + firSymbol.getDeprecationForCallSite(AnnotationUseSiteTarget.PROPERTY) + } else { + firSymbol.getDeprecationForCallSite() + } + } + } + + override fun getGetterDeprecation(symbol: KtPropertySymbol): Deprecation? { + require(symbol is KtFirSymbol<*>) + return symbol.firRef.withFir { + it.symbol.getDeprecationForCallSite(AnnotationUseSiteTarget.PROPERTY_GETTER, AnnotationUseSiteTarget.PROPERTY) + } + } + + override fun getSetterDeprecation(symbol: KtPropertySymbol): Deprecation? { + require(symbol is KtFirSymbol<*>) + return symbol.firRef.withFir { + it.symbol.getDeprecationForCallSite(AnnotationUseSiteTarget.PROPERTY_SETTER, AnnotationUseSiteTarget.PROPERTY) + } + } +} \ No newline at end of file diff --git a/idea/idea-frontend-fir/testData/fileScopeTest/simpleFileScope.txt b/idea/idea-frontend-fir/testData/fileScopeTest/simpleFileScope.txt index 2456bf1370b..48d59b78fdb 100644 --- a/idea/idea-frontend-fir/testData/fileScopeTest/simpleFileScope.txt +++ b/idea/idea-frontend-fir/testData/fileScopeTest/simpleFileScope.txt @@ -3,6 +3,7 @@ KtFirFileSymbol: annotationClassIds: [] annotations: [] origin: SOURCE + deprecationStatus: null CALLABLE NAMES: [test, testVal] @@ -31,6 +32,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirKotlinPropertySymbol: annotatedType: [] kotlin/Int @@ -57,6 +59,9 @@ KtFirKotlinPropertySymbol: setter: null symbolKind: TOP_LEVEL visibility: Public + deprecationStatus: null + getterDeprecationStatus: null + setterDeprecationStatus: null CLASSIFIER NAMES: [C, I] @@ -82,6 +87,7 @@ KtFirNamedClassOrObjectSymbol: symbolKind: TOP_LEVEL typeParameters: [] visibility: Public + deprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -103,3 +109,4 @@ KtFirNamedClassOrObjectSymbol: symbolKind: TOP_LEVEL typeParameters: [] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.txt b/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.txt index 1c2ba65edd7..cb1e5263438 100644 --- a/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.txt +++ b/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.txt @@ -23,6 +23,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -49,6 +50,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -75,6 +77,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -101,6 +104,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -127,6 +131,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -153,6 +158,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -179,6 +185,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -203,6 +210,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -229,6 +237,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Double @@ -255,6 +264,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Float @@ -281,6 +291,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -307,6 +318,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Long @@ -333,6 +345,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -359,6 +372,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -383,6 +397,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -407,6 +422,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -433,6 +449,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Double @@ -459,6 +476,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Float @@ -485,6 +503,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -511,6 +530,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Long @@ -537,6 +557,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -563,6 +584,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -589,6 +611,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -615,6 +638,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Double @@ -641,6 +665,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Float @@ -667,6 +692,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -693,6 +719,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Long @@ -719,6 +746,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -745,6 +773,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/ranges/IntRange @@ -771,6 +800,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/ranges/IntRange @@ -797,6 +827,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/ranges/LongRange @@ -823,6 +854,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/ranges/IntRange @@ -849,6 +881,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -880,6 +913,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Double @@ -911,6 +945,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Float @@ -942,6 +977,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -973,6 +1009,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Long @@ -1004,6 +1041,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -1035,6 +1073,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -1061,6 +1100,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(bitCount) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -1087,6 +1127,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(bitCount) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -1113,6 +1154,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Double @@ -1139,6 +1181,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Float @@ -1165,6 +1208,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -1191,6 +1235,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Long @@ -1217,6 +1262,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -1243,6 +1289,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Byte @@ -1267,6 +1314,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Char @@ -1291,6 +1339,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Double @@ -1315,6 +1364,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Float @@ -1339,6 +1389,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -1363,6 +1414,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Long @@ -1387,6 +1439,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Short @@ -1411,6 +1464,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -1435,6 +1489,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -1459,6 +1514,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -1485,6 +1541,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(bitCount) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -1511,6 +1568,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -1537,6 +1595,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -1561,6 +1620,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/String @@ -1585,6 +1645,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -1606,6 +1667,7 @@ KtFirNamedClassOrObjectSymbol: symbolKind: MEMBER typeParameters: [] visibility: Public + deprecationStatus: null KtFirConstructorSymbol: annotatedType: [] java/lang/Integer @@ -1625,6 +1687,7 @@ KtFirConstructorSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirConstructorSymbol: annotatedType: [] kotlin/Int @@ -1642,3 +1705,4 @@ KtFirConstructorSymbol: typeParameters: [] valueParameters: [] visibility: Private + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.txt b/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.txt index 299aa0e43c1..062728a1f1e 100644 --- a/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.txt +++ b/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.txt @@ -23,6 +23,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(element) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Unit @@ -50,6 +51,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(element) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -77,6 +79,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(elements) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -103,6 +106,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(elements) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Unit @@ -127,6 +131,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/collections/MutableListIterator @@ -151,6 +156,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/collections/MutableListIterator @@ -177,6 +183,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(index) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -203,6 +210,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(element) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -229,6 +237,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(elements) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] E @@ -255,6 +264,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(index) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -281,6 +291,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(elements) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] E @@ -308,6 +319,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(element) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/collections/MutableList @@ -335,6 +347,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(toIndex) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -361,6 +374,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(element) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -387,6 +401,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(elements) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] E @@ -413,6 +428,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(index) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -439,6 +455,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(element) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -463,6 +480,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/collections/MutableIterator @@ -487,6 +505,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -513,6 +532,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(element) ] visibility: Public + deprecationStatus: null KtFirKotlinPropertySymbol: annotatedType: [] kotlin/Int @@ -539,6 +559,9 @@ KtFirKotlinPropertySymbol: setter: null symbolKind: MEMBER visibility: Public + deprecationStatus: null + getterDeprecationStatus: null + setterDeprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -565,6 +588,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -589,6 +613,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/String @@ -613,3 +638,4 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.txt b/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.txt index 7e29c54d9f2..5cf1def82cd 100644 --- a/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.txt +++ b/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.txt @@ -10,6 +10,7 @@ KtFirJavaFieldSymbol: receiverType: null symbolKind: MEMBER visibility: Private + deprecationStatus: null KtFirJavaFieldSymbol: annotatedType: [] kotlin/Int @@ -23,6 +24,7 @@ KtFirJavaFieldSymbol: receiverType: null symbolKind: MEMBER visibility: Private + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -47,6 +49,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: PackageVisibility + deprecationStatus: null KtFirJavaFieldSymbol: annotatedType: [] kotlin/Int @@ -60,6 +63,7 @@ KtFirJavaFieldSymbol: receiverType: null symbolKind: MEMBER visibility: Private + deprecationStatus: null KtFirSyntheticJavaPropertySymbol: annotatedType: [] kotlin/Int @@ -86,6 +90,9 @@ KtFirSyntheticJavaPropertySymbol: setter: null symbolKind: MEMBER visibility: Public + deprecationStatus: null + getterDeprecationStatus: null + setterDeprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -110,6 +117,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -136,6 +144,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -162,6 +171,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -189,6 +199,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p1) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -216,6 +227,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p1) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Unit @@ -243,6 +255,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p1) ] visibility: PackageVisibility + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Unit @@ -272,6 +285,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p3) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Unit @@ -306,6 +320,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p3) ] visibility: Public + deprecationStatus: Deprecation(level=WARNING, inheritable=false, message=Deprecated in Java) KtFirFunctionSymbol: annotatedType: [] ft @@ -332,6 +347,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] ft @@ -358,6 +374,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] ft @@ -382,6 +399,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -408,6 +426,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -434,6 +453,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -460,6 +480,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -486,6 +507,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -512,6 +534,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -538,6 +561,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -567,6 +591,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p3) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -597,6 +622,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p4) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -624,6 +650,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p1) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -650,6 +677,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -676,6 +704,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -700,6 +729,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -726,6 +756,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -753,6 +784,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p1) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -779,6 +811,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -806,6 +839,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p1) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -833,6 +867,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p1) ] visibility: Private + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -859,6 +894,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -886,6 +922,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p1) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -912,6 +949,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -939,6 +977,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p1) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -966,6 +1005,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p1) ] visibility: Private + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] ft @@ -992,6 +1032,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] ft @@ -1019,6 +1060,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p1) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/CharSequence @@ -1046,6 +1088,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p1) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] ft @@ -1072,6 +1115,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] ft @@ -1099,6 +1143,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p1) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] ft @@ -1126,6 +1171,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p1) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -1152,6 +1198,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -1178,6 +1225,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] ft @@ -1205,6 +1253,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p1) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] ft @@ -1232,6 +1281,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p1) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] ft>, kotlin/Array>?> @@ -1259,6 +1309,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p1) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] ft>, kotlin/Array>?> @@ -1285,6 +1336,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] ft @@ -1311,6 +1363,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] ft @@ -1335,6 +1388,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] ft @@ -1361,6 +1415,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] ft @@ -1385,6 +1440,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] ft @@ -1409,6 +1465,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String @@ -1433,6 +1490,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] ft @@ -1457,6 +1515,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] ft @@ -1481,6 +1540,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Char @@ -1507,6 +1567,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -1530,6 +1591,7 @@ KtFirNamedClassOrObjectSymbol: symbolKind: MEMBER typeParameters: [] visibility: Private + deprecationStatus: null KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1547,6 +1609,7 @@ KtFirConstructorSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1566,6 +1629,7 @@ KtFirConstructorSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1585,6 +1649,7 @@ KtFirConstructorSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1606,6 +1671,7 @@ KtFirConstructorSymbol: KtFirValueParameterSymbol(p2) ] visibility: Public + deprecationStatus: null KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1627,6 +1693,7 @@ KtFirConstructorSymbol: KtFirValueParameterSymbol(p2) ] visibility: Public + deprecationStatus: null KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1654,6 +1721,7 @@ KtFirConstructorSymbol: KtFirValueParameterSymbol(p3) ] visibility: Public + deprecationStatus: Deprecation(level=WARNING, inheritable=false, message=Deprecated in Java) KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1679,6 +1747,7 @@ KtFirConstructorSymbol: KtFirValueParameterSymbol(p1) ] visibility: Public + deprecationStatus: Deprecation(level=WARNING, inheritable=false, message=Deprecated in Java) KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1701,6 +1770,7 @@ KtFirConstructorSymbol: KtFirValueParameterSymbol(p3) ] visibility: Public + deprecationStatus: null KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1723,6 +1793,7 @@ KtFirConstructorSymbol: KtFirValueParameterSymbol(p3) ] visibility: Public + deprecationStatus: null KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1743,6 +1814,7 @@ KtFirConstructorSymbol: KtFirValueParameterSymbol(p1) ] visibility: Public + deprecationStatus: null KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1763,6 +1835,7 @@ KtFirConstructorSymbol: KtFirValueParameterSymbol(p1) ] visibility: Public + deprecationStatus: null KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1784,6 +1857,7 @@ KtFirConstructorSymbol: KtFirValueParameterSymbol(p2) ] visibility: Public + deprecationStatus: null KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1803,6 +1877,7 @@ KtFirConstructorSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1822,6 +1897,7 @@ KtFirConstructorSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1841,6 +1917,7 @@ KtFirConstructorSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1861,6 +1938,7 @@ KtFirConstructorSymbol: KtFirValueParameterSymbol(p1) ] visibility: PackageVisibility + deprecationStatus: null KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1887,3 +1965,4 @@ KtFirConstructorSymbol: KtFirValueParameterSymbol(p2) ] visibility: PackageVisibility + deprecationStatus: Deprecation(level=WARNING, inheritable=false, message=Deprecated in Java) diff --git a/idea/idea-frontend-fir/testData/memberScopeByFqName/kotlin.Function2.txt b/idea/idea-frontend-fir/testData/memberScopeByFqName/kotlin.Function2.txt index c62bb20ea7f..2ff5d2e6c88 100644 --- a/idea/idea-frontend-fir/testData/memberScopeByFqName/kotlin.Function2.txt +++ b/idea/idea-frontend-fir/testData/memberScopeByFqName/kotlin.Function2.txt @@ -24,6 +24,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(p2) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -50,6 +51,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(other) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -74,6 +76,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/String @@ -98,3 +101,4 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/class.txt b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/class.txt index fd0dc1f32b5..f6ba37b7a44 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/class.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/class.txt @@ -20,3 +20,4 @@ KtFirNamedClassOrObjectSymbol: KtFirTypeParameterSymbol(T) ] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/classFromJdk.txt b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/classFromJdk.txt index f4266058b86..32d4220c2fe 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/classFromJdk.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/classFromJdk.txt @@ -21,3 +21,4 @@ KtFirNamedClassOrObjectSymbol: symbolKind: TOP_LEVEL typeParameters: [] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/enumEntry.txt b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/enumEntry.txt index 34171a86f0e..43dc5a0d954 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/enumEntry.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/enumEntry.txt @@ -7,3 +7,4 @@ KtFirEnumEntrySymbol: origin: LIBRARY receiverType: null symbolKind: MEMBER + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/fileWalkDirectionEnum.txt b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/fileWalkDirectionEnum.txt index 2e2c44a1e64..2591bfa7a7e 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/fileWalkDirectionEnum.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/fileWalkDirectionEnum.txt @@ -25,6 +25,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(element) ] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/collections/List @@ -56,6 +57,7 @@ KtFirFunctionSymbol: ] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/collections/List @@ -84,3 +86,4 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(elements) ] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/iterator.txt b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/iterator.txt index ac156207870..6022d2b588f 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/iterator.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/iterator.txt @@ -20,3 +20,4 @@ KtFirNamedClassOrObjectSymbol: KtFirTypeParameterSymbol(T) ] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/listOf.txt b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/listOf.txt index 6c0e9be4dcc..aa8997c08e7 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/listOf.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/listOf.txt @@ -18,3 +18,4 @@ KtFirNamedClassOrObjectSymbol: symbolKind: TOP_LEVEL typeParameters: [] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/memberFunction.txt b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/memberFunction.txt index d50f44e915e..a8b25ddbe85 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/memberFunction.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/memberFunction.txt @@ -23,3 +23,4 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(index) ] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt index 79ec320ef05..c6a8b9e83d4 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt @@ -21,6 +21,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/collections/ListIterator @@ -47,3 +48,4 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(index) ] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/nestedClass.txt b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/nestedClass.txt index 9cc4aa35b72..6232a635b4c 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/nestedClass.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/nestedClass.txt @@ -21,3 +21,4 @@ KtFirNamedClassOrObjectSymbol: KtFirTypeParameterSymbol(V) ] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/annotations.txt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/annotations.txt index 195eef2ff28..29221b617a2 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/annotations.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/annotations.txt @@ -10,6 +10,7 @@ KtFirValueParameterSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + deprecationStatus: null KtFirValueParameterSymbol: annotatedType: [] kotlin/Int @@ -23,6 +24,7 @@ KtFirValueParameterSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + deprecationStatus: null KtFirConstructorSymbol: annotatedType: [] Anno @@ -43,6 +45,7 @@ KtFirConstructorSymbol: KtFirValueParameterSymbol(param2) ] visibility: Public + deprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -64,6 +67,7 @@ KtFirNamedClassOrObjectSymbol: symbolKind: TOP_LEVEL typeParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Unit @@ -93,6 +97,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [ @@ -119,3 +124,4 @@ KtFirNamedClassOrObjectSymbol: symbolKind: TOP_LEVEL typeParameters: [] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/anonymousObject.txt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/anonymousObject.txt index dab06580597..90b56162cea 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/anonymousObject.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/anonymousObject.txt @@ -21,6 +21,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirKotlinPropertySymbol: annotatedType: [] kotlin/Int @@ -47,6 +48,9 @@ KtFirKotlinPropertySymbol: setter: null symbolKind: MEMBER visibility: Public + deprecationStatus: null + getterDeprecationStatus: null + setterDeprecationStatus: null KtFirAnonymousObjectSymbol: annotationClassIds: [] @@ -59,6 +63,7 @@ KtFirAnonymousObjectSymbol: [] java/lang/Runnable ] symbolKind: LOCAL + deprecationStatus: null KtFirKotlinPropertySymbol: annotatedType: [] java/lang/Runnable @@ -85,6 +90,9 @@ KtFirKotlinPropertySymbol: setter: null symbolKind: MEMBER visibility: Public + deprecationStatus: null + getterDeprecationStatus: null + setterDeprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -106,3 +114,4 @@ KtFirNamedClassOrObjectSymbol: symbolKind: TOP_LEVEL typeParameters: [] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/class.txt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/class.txt index 132df395f6c..3d287a067c8 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/class.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/class.txt @@ -18,3 +18,4 @@ KtFirNamedClassOrObjectSymbol: symbolKind: TOP_LEVEL typeParameters: [] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classMembes.txt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classMembes.txt index 1405663d9be..0b3fb79c98f 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classMembes.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classMembes.txt @@ -23,6 +23,9 @@ KtFirKotlinPropertySymbol: setter: null symbolKind: MEMBER visibility: Public + deprecationStatus: null + getterDeprecationStatus: null + setterDeprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -47,6 +50,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -68,3 +72,4 @@ KtFirNamedClassOrObjectSymbol: symbolKind: TOP_LEVEL typeParameters: [] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classPrimaryConstructor.txt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classPrimaryConstructor.txt index 1a120dd759c..024511b7f31 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classPrimaryConstructor.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classPrimaryConstructor.txt @@ -14,6 +14,7 @@ KtFirConstructorSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -35,3 +36,4 @@ KtFirNamedClassOrObjectSymbol: symbolKind: TOP_LEVEL typeParameters: [] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classSecondaryConstructors.txt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classSecondaryConstructors.txt index 7104ecccfe6..d495310e989 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classSecondaryConstructors.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classSecondaryConstructors.txt @@ -14,6 +14,7 @@ KtFirConstructorSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirValueParameterSymbol: annotatedType: [] kotlin/Int @@ -27,6 +28,7 @@ KtFirValueParameterSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + deprecationStatus: null KtFirConstructorSymbol: annotatedType: [] A @@ -46,6 +48,7 @@ KtFirConstructorSymbol: KtFirValueParameterSymbol(x) ] visibility: Public + deprecationStatus: null KtFirValueParameterSymbol: annotatedType: [] kotlin/Int @@ -59,6 +62,7 @@ KtFirValueParameterSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + deprecationStatus: null KtFirValueParameterSymbol: annotatedType: [] kotlin/String @@ -72,6 +76,7 @@ KtFirValueParameterSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + deprecationStatus: null KtFirConstructorSymbol: annotatedType: [] A @@ -92,6 +97,7 @@ KtFirConstructorSymbol: KtFirValueParameterSymbol(z) ] visibility: Public + deprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -113,3 +119,4 @@ KtFirNamedClassOrObjectSymbol: symbolKind: TOP_LEVEL typeParameters: [] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classWithTypeParams.txt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classWithTypeParams.txt index e55d5bd0acd..ed234334182 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classWithTypeParams.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classWithTypeParams.txt @@ -6,6 +6,7 @@ KtFirTypeParameterSymbol: kotlin/Any? ] variance: INVARIANT + deprecationStatus: null KtFirTypeParameterSymbol: isReified: false @@ -15,6 +16,7 @@ KtFirTypeParameterSymbol: kotlin/Any? ] variance: INVARIANT + deprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -39,3 +41,4 @@ KtFirNamedClassOrObjectSymbol: KtFirTypeParameterSymbol(R) ] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/deprecated.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/deprecated.kt new file mode 100644 index 00000000000..c44b32937a6 --- /dev/null +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/deprecated.kt @@ -0,0 +1,37 @@ +// WITH_STDLIB + +@Deprecated("don't use i") +val i: Int = 1 + +@get:Deprecated("don't use getter of i2") +val i2: Int = 1 + +@set:Deprecated("don't use getter of i3") +var i3: Int = 1 + +@get:Deprecated("don't use getter of i4") +@set:Deprecated("don't use getter of i4") +var i4: Int = 1 + +@Deprecated("don't use f") +fun f(): Int = 1 + +@Deprecated("don't use MyClass") +class MyClass + +class Foo { + @Deprecated("don't use i2") + val i2: Int = 1 + + @Deprecated("don't use f2") + fun f2(): Int = 1 +} + +@Deprecated("don't use j", level = DeprecationLevel.ERROR) +val j: Int = 2 + +@Deprecated("don't use j2", level = DeprecationLevel.HIDDEN) +val j2: Int = 2 + +@java.lang.Deprecated +val j2: Int = 2 diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/deprecated.txt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/deprecated.txt new file mode 100644 index 00000000000..4acde93189b --- /dev/null +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/deprecated.txt @@ -0,0 +1,383 @@ +KtFirKotlinPropertySymbol: + annotatedType: [] kotlin/Int + annotationClassIds: [ + kotlin/Deprecated + ] + annotations: [ + kotlin/Deprecated(message = don't use i) + psi: KtAnnotationEntry + ] + callableIdIfNonLocal: /i + dispatchType: null + getter: KtFirPropertyGetterSymbol() + hasBackingField: true + hasGetter: true + hasSetter: false + initializer: 1 + isConst: false + isExtension: false + isFromPrimaryConstructor: false + isLateInit: false + isOverride: false + isStatic: false + isVal: true + modality: FINAL + name: i + origin: SOURCE + receiverType: null + setter: null + symbolKind: TOP_LEVEL + visibility: Public + deprecationStatus: Deprecation(level=WARNING, inheritable=true, message=don't use i) + getterDeprecationStatus: Deprecation(level=WARNING, inheritable=true, message=don't use i) + setterDeprecationStatus: Deprecation(level=WARNING, inheritable=true, message=don't use i) + +KtFirKotlinPropertySymbol: + annotatedType: [] kotlin/Int + annotationClassIds: [ + kotlin/Deprecated + ] + annotations: [ + kotlin/Deprecated(message = don't use getter of i2) + psi: KtAnnotationEntry + ] + callableIdIfNonLocal: /i2 + dispatchType: null + getter: KtFirPropertyGetterSymbol() + hasBackingField: true + hasGetter: true + hasSetter: false + initializer: 1 + isConst: false + isExtension: false + isFromPrimaryConstructor: false + isLateInit: false + isOverride: false + isStatic: false + isVal: true + modality: FINAL + name: i2 + origin: SOURCE + receiverType: null + setter: null + symbolKind: TOP_LEVEL + visibility: Public + deprecationStatus: null + getterDeprecationStatus: Deprecation(level=WARNING, inheritable=true, message=don't use getter of i2) + setterDeprecationStatus: null + +KtFirKotlinPropertySymbol: + annotatedType: [] kotlin/Int + annotationClassIds: [ + kotlin/Deprecated + ] + annotations: [ + kotlin/Deprecated(message = don't use getter of i3) + psi: KtAnnotationEntry + ] + callableIdIfNonLocal: /i3 + dispatchType: null + getter: KtFirPropertyGetterSymbol() + hasBackingField: true + hasGetter: true + hasSetter: true + initializer: 1 + isConst: false + isExtension: false + isFromPrimaryConstructor: false + isLateInit: false + isOverride: false + isStatic: false + isVal: false + modality: FINAL + name: i3 + origin: SOURCE + receiverType: null + setter: KtFirPropertySetterSymbol() + symbolKind: TOP_LEVEL + visibility: Public + deprecationStatus: null + getterDeprecationStatus: null + setterDeprecationStatus: Deprecation(level=WARNING, inheritable=true, message=don't use getter of i3) + +KtFirKotlinPropertySymbol: + annotatedType: [] kotlin/Int + annotationClassIds: [ + kotlin/Deprecated + kotlin/Deprecated + ] + annotations: [ + kotlin/Deprecated(message = don't use getter of i4) + psi: KtAnnotationEntry + kotlin/Deprecated(message = don't use getter of i4) + psi: KtAnnotationEntry + ] + callableIdIfNonLocal: /i4 + dispatchType: null + getter: KtFirPropertyGetterSymbol() + hasBackingField: true + hasGetter: true + hasSetter: true + initializer: 1 + isConst: false + isExtension: false + isFromPrimaryConstructor: false + isLateInit: false + isOverride: false + isStatic: false + isVal: false + modality: FINAL + name: i4 + origin: SOURCE + receiverType: null + setter: KtFirPropertySetterSymbol() + symbolKind: TOP_LEVEL + visibility: Public + deprecationStatus: null + getterDeprecationStatus: Deprecation(level=WARNING, inheritable=true, message=don't use getter of i4) + setterDeprecationStatus: Deprecation(level=WARNING, inheritable=true, message=don't use getter of i4) + +KtFirFunctionSymbol: + annotatedType: [] kotlin/Int + annotationClassIds: [ + kotlin/Deprecated + ] + annotations: [ + kotlin/Deprecated(message = don't use f) + psi: KtAnnotationEntry + ] + callableIdIfNonLocal: /f + dispatchType: null + hasStableParameterNames: true + isExtension: false + isExternal: false + isInfix: false + isInline: false + isOperator: false + isOverride: false + isStatic: false + isSuspend: false + modality: FINAL + name: f + origin: SOURCE + receiverType: null + symbolKind: TOP_LEVEL + typeParameters: [] + valueParameters: [] + visibility: Public + deprecationStatus: Deprecation(level=WARNING, inheritable=true, message=don't use f) + +KtFirNamedClassOrObjectSymbol: + annotationClassIds: [ + kotlin/Deprecated + ] + annotations: [ + kotlin/Deprecated(message = don't use MyClass) + psi: KtAnnotationEntry + ] + classIdIfNonLocal: MyClass + classKind: CLASS + companionObject: null + isData: false + isExternal: false + isFun: false + isInline: false + isInner: false + modality: FINAL + name: MyClass + origin: SOURCE + superTypes: [ + [] kotlin/Any + ] + symbolKind: TOP_LEVEL + typeParameters: [] + visibility: Public + deprecationStatus: Deprecation(level=WARNING, inheritable=true, message=don't use MyClass) + +KtFirKotlinPropertySymbol: + annotatedType: [] kotlin/Int + annotationClassIds: [ + kotlin/Deprecated + ] + annotations: [ + kotlin/Deprecated(message = don't use i2) + psi: KtAnnotationEntry + ] + callableIdIfNonLocal: /Foo.i2 + dispatchType: Foo + getter: KtFirPropertyGetterSymbol() + hasBackingField: true + hasGetter: true + hasSetter: false + initializer: 1 + isConst: false + isExtension: false + isFromPrimaryConstructor: false + isLateInit: false + isOverride: false + isStatic: false + isVal: true + modality: FINAL + name: i2 + origin: SOURCE + receiverType: null + setter: null + symbolKind: MEMBER + visibility: Public + deprecationStatus: Deprecation(level=WARNING, inheritable=true, message=don't use i2) + getterDeprecationStatus: Deprecation(level=WARNING, inheritable=true, message=don't use i2) + setterDeprecationStatus: Deprecation(level=WARNING, inheritable=true, message=don't use i2) + +KtFirFunctionSymbol: + annotatedType: [] kotlin/Int + annotationClassIds: [ + kotlin/Deprecated + ] + annotations: [ + kotlin/Deprecated(message = don't use f2) + psi: KtAnnotationEntry + ] + callableIdIfNonLocal: /Foo.f2 + dispatchType: Foo + hasStableParameterNames: true + isExtension: false + isExternal: false + isInfix: false + isInline: false + isOperator: false + isOverride: false + isStatic: false + isSuspend: false + modality: FINAL + name: f2 + origin: SOURCE + receiverType: null + symbolKind: MEMBER + typeParameters: [] + valueParameters: [] + visibility: Public + deprecationStatus: Deprecation(level=WARNING, inheritable=true, message=don't use f2) + +KtFirNamedClassOrObjectSymbol: + annotationClassIds: [] + annotations: [] + classIdIfNonLocal: Foo + classKind: CLASS + companionObject: null + isData: false + isExternal: false + isFun: false + isInline: false + isInner: false + modality: FINAL + name: Foo + origin: SOURCE + superTypes: [ + [] kotlin/Any + ] + symbolKind: TOP_LEVEL + typeParameters: [] + visibility: Public + deprecationStatus: null + +KtFirKotlinPropertySymbol: + annotatedType: [] kotlin/Int + annotationClassIds: [ + kotlin/Deprecated + ] + annotations: [ + kotlin/Deprecated(level = KtUnsupportedConstantValue, message = don't use j) + psi: KtAnnotationEntry + ] + callableIdIfNonLocal: /j + dispatchType: null + getter: KtFirPropertyGetterSymbol() + hasBackingField: true + hasGetter: true + hasSetter: false + initializer: 2 + isConst: false + isExtension: false + isFromPrimaryConstructor: false + isLateInit: false + isOverride: false + isStatic: false + isVal: true + modality: FINAL + name: j + origin: SOURCE + receiverType: null + setter: null + symbolKind: TOP_LEVEL + visibility: Public + deprecationStatus: Deprecation(level=ERROR, inheritable=true, message=null) + getterDeprecationStatus: Deprecation(level=ERROR, inheritable=true, message=null) + setterDeprecationStatus: Deprecation(level=ERROR, inheritable=true, message=null) + +KtFirKotlinPropertySymbol: + annotatedType: [] kotlin/Int + annotationClassIds: [ + kotlin/Deprecated + ] + annotations: [ + kotlin/Deprecated(level = KtUnsupportedConstantValue, message = don't use j2) + psi: KtAnnotationEntry + ] + callableIdIfNonLocal: /j2 + dispatchType: null + getter: KtFirPropertyGetterSymbol() + hasBackingField: true + hasGetter: true + hasSetter: false + initializer: 2 + isConst: false + isExtension: false + isFromPrimaryConstructor: false + isLateInit: false + isOverride: false + isStatic: false + isVal: true + modality: FINAL + name: j2 + origin: SOURCE + receiverType: null + setter: null + symbolKind: TOP_LEVEL + visibility: Public + deprecationStatus: Deprecation(level=HIDDEN, inheritable=true, message=null) + getterDeprecationStatus: Deprecation(level=HIDDEN, inheritable=true, message=null) + setterDeprecationStatus: Deprecation(level=HIDDEN, inheritable=true, message=null) + +KtFirKotlinPropertySymbol: + annotatedType: [] kotlin/Int + annotationClassIds: [ + java/lang/Deprecated + ] + annotations: [ + java/lang/Deprecated() + psi: KtAnnotationEntry + ] + callableIdIfNonLocal: /j2 + dispatchType: null + getter: KtFirPropertyGetterSymbol() + hasBackingField: true + hasGetter: true + hasSetter: false + initializer: 2 + isConst: false + isExtension: false + isFromPrimaryConstructor: false + isLateInit: false + isOverride: false + isStatic: false + isVal: true + modality: FINAL + name: j2 + origin: SOURCE + receiverType: null + setter: null + symbolKind: TOP_LEVEL + visibility: Public + deprecationStatus: Deprecation(level=WARNING, inheritable=false, message=null) + getterDeprecationStatus: Deprecation(level=WARNING, inheritable=false, message=null) + setterDeprecationStatus: Deprecation(level=WARNING, inheritable=false, message=null) diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/enum.txt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/enum.txt index 3bd730e019c..768bba1b521 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/enum.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/enum.txt @@ -7,6 +7,7 @@ KtFirEnumEntrySymbol: origin: SOURCE receiverType: null symbolKind: MEMBER + deprecationStatus: null KtFirEnumEntrySymbol: annotatedType: [] X @@ -17,6 +18,7 @@ KtFirEnumEntrySymbol: origin: SOURCE receiverType: null symbolKind: MEMBER + deprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -38,3 +40,4 @@ KtFirNamedClassOrObjectSymbol: symbolKind: TOP_LEVEL typeParameters: [] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/enumValueMember.txt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/enumValueMember.txt index bdbf70f1d09..d272058aa19 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/enumValueMember.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/enumValueMember.txt @@ -10,6 +10,7 @@ KtFirValueParameterSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + deprecationStatus: null KtFirConstructorSymbol: annotatedType: [] Style @@ -29,6 +30,7 @@ KtFirConstructorSymbol: KtFirValueParameterSymbol(value) ] visibility: Private + deprecationStatus: null KtFirPropertyGetterSymbol: annotatedType: [] kotlin/String @@ -46,6 +48,7 @@ KtFirPropertyGetterSymbol: receiverType: null symbolKind: ACCESSOR visibility: Public + deprecationStatus: null KtFirKotlinPropertySymbol: annotatedType: [] kotlin/String @@ -72,6 +75,9 @@ KtFirKotlinPropertySymbol: setter: null symbolKind: MEMBER visibility: Public + deprecationStatus: null + getterDeprecationStatus: null + setterDeprecationStatus: null KtFirEnumEntrySymbol: annotatedType: [] Style @@ -82,6 +88,7 @@ KtFirEnumEntrySymbol: origin: SOURCE receiverType: null symbolKind: MEMBER + deprecationStatus: null KtFirKotlinPropertySymbol: annotatedType: [] kotlin/String @@ -108,6 +115,9 @@ KtFirKotlinPropertySymbol: setter: null symbolKind: MEMBER visibility: Public + deprecationStatus: null + getterDeprecationStatus: null + setterDeprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -129,3 +139,4 @@ KtFirNamedClassOrObjectSymbol: symbolKind: TOP_LEVEL typeParameters: [] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/extensionFunction.txt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/extensionFunction.txt index c2e93cf8a91..8ae6fc4405c 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/extensionFunction.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/extensionFunction.txt @@ -21,3 +21,4 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/function.txt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/function.txt index 0f4a9601a51..f4355c58198 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/function.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/function.txt @@ -10,6 +10,7 @@ KtFirValueParameterSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Unit @@ -36,3 +37,4 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(x) ] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/functionWithTypeParams.txt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/functionWithTypeParams.txt index 733c6036e4a..88b993f8650 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/functionWithTypeParams.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/functionWithTypeParams.txt @@ -6,6 +6,7 @@ KtFirTypeParameterSymbol: kotlin/Any? ] variance: INVARIANT + deprecationStatus: null KtFirValueParameterSymbol: annotatedType: [] X @@ -19,6 +20,7 @@ KtFirValueParameterSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Unit @@ -47,3 +49,4 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(x) ] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt index 5d5fb0ad473..cece4c0783f 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt @@ -10,6 +10,7 @@ KtFirValueParameterSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + deprecationStatus: null KtFirConstructorSymbol: annotatedType: [] A @@ -29,6 +30,7 @@ KtFirConstructorSymbol: KtFirValueParameterSymbol(i) ] visibility: Public + deprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -50,3 +52,4 @@ KtFirNamedClassOrObjectSymbol: symbolKind: TOP_LEVEL typeParameters: [] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/implicitReturn.txt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/implicitReturn.txt index 15b19e76674..9c8d520054a 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/implicitReturn.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/implicitReturn.txt @@ -21,3 +21,4 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/implicitReturnInLambda.txt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/implicitReturnInLambda.txt index 8503cb2e46a..4ecf5b79d12 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/implicitReturnInLambda.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/implicitReturnInLambda.txt @@ -10,6 +10,7 @@ KtFirValueParameterSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + deprecationStatus: null KtFirLocalVariableSymbol: annotatedType: [] kotlin/Int @@ -20,6 +21,7 @@ KtFirLocalVariableSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + deprecationStatus: null KtFirAnonymousFunctionSymbol: annotatedType: [] kotlin/Int @@ -32,6 +34,7 @@ KtFirAnonymousFunctionSymbol: valueParameters: [ KtFirValueParameterSymbol(a) ] + deprecationStatus: null KtFirLocalVariableSymbol: annotatedType: [] kotlin/Function1 @@ -42,6 +45,7 @@ KtFirLocalVariableSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + deprecationStatus: null KtFirValueParameterSymbol: annotatedType: [] kotlin/Int @@ -55,6 +59,7 @@ KtFirValueParameterSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + deprecationStatus: null KtFirLocalVariableSymbol: annotatedType: [] kotlin/Int @@ -65,6 +70,7 @@ KtFirLocalVariableSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + deprecationStatus: null KtFirAnonymousFunctionSymbol: annotatedType: [] kotlin/Int @@ -77,6 +83,7 @@ KtFirAnonymousFunctionSymbol: valueParameters: [ KtFirValueParameterSymbol(a) ] + deprecationStatus: null KtFirLocalVariableSymbol: annotatedType: [] kotlin/Function1 @@ -87,6 +94,7 @@ KtFirLocalVariableSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + deprecationStatus: null KtFirLocalVariableSymbol: annotatedType: [] kotlin/Int @@ -97,6 +105,7 @@ KtFirLocalVariableSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + deprecationStatus: null KtFirAnonymousFunctionSymbol: annotatedType: [] kotlin/Int @@ -109,6 +118,7 @@ KtFirAnonymousFunctionSymbol: valueParameters: [ KtFirValueParameterSymbol(it) ] + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Unit @@ -133,6 +143,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirValueParameterSymbol: annotatedType: [] kotlin/Function1 @@ -146,6 +157,7 @@ KtFirValueParameterSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Unit @@ -172,3 +184,4 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(lmbd) ] visibility: Private + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/localDeclarations.txt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/localDeclarations.txt index 36643552220..8ec3129d620 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/localDeclarations.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/localDeclarations.txt @@ -7,6 +7,7 @@ KtFirLocalVariableSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Unit @@ -31,6 +32,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Local + deprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -52,6 +54,7 @@ KtFirNamedClassOrObjectSymbol: symbolKind: LOCAL typeParameters: [] visibility: Local + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Unit @@ -76,3 +79,4 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/memberFunctions.txt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/memberFunctions.txt index 70fcd7c49b2..9a119f88734 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/memberFunctions.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/memberFunctions.txt @@ -21,6 +21,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Unit @@ -45,6 +46,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -66,3 +68,4 @@ KtFirNamedClassOrObjectSymbol: symbolKind: TOP_LEVEL typeParameters: [] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/memberProperties.txt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/memberProperties.txt index 2698436ff8b..423ddbff59e 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/memberProperties.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/memberProperties.txt @@ -23,6 +23,9 @@ KtFirKotlinPropertySymbol: setter: null symbolKind: MEMBER visibility: Public + deprecationStatus: null + getterDeprecationStatus: null + setterDeprecationStatus: null KtFirPropertyGetterSymbol: annotatedType: [] kotlin/Int @@ -40,6 +43,7 @@ KtFirPropertyGetterSymbol: receiverType: null symbolKind: ACCESSOR visibility: Public + deprecationStatus: null KtFirKotlinPropertySymbol: annotatedType: [] kotlin/Int @@ -66,6 +70,9 @@ KtFirKotlinPropertySymbol: setter: null symbolKind: MEMBER visibility: Public + deprecationStatus: null + getterDeprecationStatus: null + setterDeprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -87,3 +94,4 @@ KtFirNamedClassOrObjectSymbol: symbolKind: TOP_LEVEL typeParameters: [] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/outerAndInnerClasses.txt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/outerAndInnerClasses.txt index 60f43141841..e39fcbff4fd 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/outerAndInnerClasses.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/outerAndInnerClasses.txt @@ -6,6 +6,7 @@ KtFirTypeParameterSymbol: kotlin/Any? ] variance: INVARIANT + deprecationStatus: null KtFirTypeParameterSymbol: isReified: false @@ -15,6 +16,7 @@ KtFirTypeParameterSymbol: kotlin/Any? ] variance: INVARIANT + deprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -38,6 +40,7 @@ KtFirNamedClassOrObjectSymbol: KtFirTypeParameterSymbol(T1) ] visibility: Public + deprecationStatus: null KtFirTypeParameterSymbol: isReified: false @@ -47,6 +50,7 @@ KtFirTypeParameterSymbol: kotlin/Any? ] variance: INVARIANT + deprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -70,6 +74,7 @@ KtFirNamedClassOrObjectSymbol: KtFirTypeParameterSymbol(T2) ] visibility: Public + deprecationStatus: null KtFirTypeParameterSymbol: isReified: false @@ -79,6 +84,7 @@ KtFirTypeParameterSymbol: kotlin/Any? ] variance: INVARIANT + deprecationStatus: null KtFirTypeParameterSymbol: isReified: false @@ -88,6 +94,7 @@ KtFirTypeParameterSymbol: kotlin/Any? ] variance: INVARIANT + deprecationStatus: null KtFirTypeParameterSymbol: isReified: false @@ -97,6 +104,7 @@ KtFirTypeParameterSymbol: kotlin/Any? ] variance: INVARIANT + deprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -120,6 +128,7 @@ KtFirNamedClassOrObjectSymbol: KtFirTypeParameterSymbol(T5) ] visibility: Local + deprecationStatus: null KtFirTypeParameterSymbol: isReified: false @@ -129,6 +138,7 @@ KtFirTypeParameterSymbol: kotlin/Any? ] variance: INVARIANT + deprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -152,6 +162,7 @@ KtFirNamedClassOrObjectSymbol: KtFirTypeParameterSymbol(T6) ] visibility: Local + deprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -175,6 +186,7 @@ KtFirNamedClassOrObjectSymbol: KtFirTypeParameterSymbol(T4) ] visibility: Local + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Unit @@ -201,6 +213,7 @@ KtFirFunctionSymbol: ] valueParameters: [] visibility: Public + deprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -224,3 +237,4 @@ KtFirNamedClassOrObjectSymbol: KtFirTypeParameterSymbol(T) ] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/topLevelFunctions.txt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/topLevelFunctions.txt index a047953dfe9..e65f9941fbe 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/topLevelFunctions.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/topLevelFunctions.txt @@ -21,6 +21,7 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [] kotlin/Unit @@ -45,3 +46,4 @@ KtFirFunctionSymbol: typeParameters: [] valueParameters: [] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/topLevelProperties.txt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/topLevelProperties.txt index 87e53141a56..7f59a4bc85f 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/topLevelProperties.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/topLevelProperties.txt @@ -23,6 +23,9 @@ KtFirKotlinPropertySymbol: setter: null symbolKind: TOP_LEVEL visibility: Public + deprecationStatus: null + getterDeprecationStatus: null + setterDeprecationStatus: null KtFirPropertyGetterSymbol: annotatedType: [] kotlin/Int @@ -40,6 +43,7 @@ KtFirPropertyGetterSymbol: receiverType: null symbolKind: ACCESSOR visibility: Public + deprecationStatus: null KtFirKotlinPropertySymbol: annotatedType: [] kotlin/Int @@ -66,3 +70,6 @@ KtFirKotlinPropertySymbol: setter: null symbolKind: TOP_LEVEL visibility: Public + deprecationStatus: null + getterDeprecationStatus: null + setterDeprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/typeAlias.txt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/typeAlias.txt index c8ce87d073b..b003d058b6d 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/typeAlias.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/typeAlias.txt @@ -6,6 +6,7 @@ KtFirTypeParameterSymbol: kotlin/Any? ] variance: INVARIANT + deprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -29,6 +30,7 @@ KtFirNamedClassOrObjectSymbol: KtFirTypeParameterSymbol(T) ] visibility: Public + deprecationStatus: null KtFirTypeParameterSymbol: isReified: false @@ -38,6 +40,7 @@ KtFirTypeParameterSymbol: kotlin/Any? ] variance: INVARIANT + deprecationStatus: null KtFirTypeAliasSymbol: classIdIfNonLocal: Y @@ -45,3 +48,4 @@ KtFirTypeAliasSymbol: name: Y origin: SOURCE symbolKind: TOP_LEVEL + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/typeAnnotations.txt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/typeAnnotations.txt index 7d6481350bc..29013508f5a 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/typeAnnotations.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/typeAnnotations.txt @@ -23,6 +23,7 @@ KtFirNamedClassOrObjectSymbol: symbolKind: TOP_LEVEL typeParameters: [] visibility: Public + deprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [ @@ -49,6 +50,7 @@ KtFirNamedClassOrObjectSymbol: symbolKind: TOP_LEVEL typeParameters: [] visibility: Public + deprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [ @@ -75,6 +77,7 @@ KtFirNamedClassOrObjectSymbol: symbolKind: TOP_LEVEL typeParameters: [] visibility: Public + deprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [ @@ -101,6 +104,7 @@ KtFirNamedClassOrObjectSymbol: symbolKind: TOP_LEVEL typeParameters: [] visibility: Public + deprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -122,6 +126,7 @@ KtFirNamedClassOrObjectSymbol: symbolKind: TOP_LEVEL typeParameters: [] visibility: Public + deprecationStatus: null KtFirValueParameterSymbol: annotatedType: [ @@ -138,6 +143,7 @@ KtFirValueParameterSymbol: origin: SOURCE receiverType: null symbolKind: LOCAL + deprecationStatus: null KtFirFunctionSymbol: annotatedType: [ @@ -167,6 +173,7 @@ KtFirFunctionSymbol: KtFirValueParameterSymbol(arg) ] visibility: Public + deprecationStatus: null KtFirKotlinPropertySymbol: annotatedType: [ @@ -196,6 +203,9 @@ KtFirKotlinPropertySymbol: setter: null symbolKind: MEMBER visibility: Public + deprecationStatus: null + getterDeprecationStatus: null + setterDeprecationStatus: null KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -220,3 +230,4 @@ KtFirNamedClassOrObjectSymbol: symbolKind: TOP_LEVEL typeParameters: [] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByReference/accessorField.txt b/idea/idea-frontend-fir/testData/symbols/symbolByReference/accessorField.txt index 8700e8c7af3..ed968d31b55 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByReference/accessorField.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByReference/accessorField.txt @@ -7,3 +7,4 @@ KtFirBackingFieldSymbol: owningProperty: KtFirKotlinPropertySymbol(x) receiverType: null symbolKind: LOCAL + deprecationStatus: null diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByReference/constructorViaTypeAlias.txt b/idea/idea-frontend-fir/testData/symbols/symbolByReference/constructorViaTypeAlias.txt index 277ba5ab864..8b8c3095eff 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByReference/constructorViaTypeAlias.txt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByReference/constructorViaTypeAlias.txt @@ -18,3 +18,4 @@ KtFirConstructorSymbol: KtFirValueParameterSymbol(p0) ] visibility: Public + deprecationStatus: null diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/scopes/AbstractFileScopeTest.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/scopes/AbstractFileScopeTest.kt index 5e5828e44a4..2a752917730 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/scopes/AbstractFileScopeTest.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/scopes/AbstractFileScopeTest.kt @@ -20,18 +20,19 @@ abstract class AbstractFileScopeTest : AbstractHLApiSingleFileTest() { analyse(ktFile) { val symbol = ktFile.getFileSymbol() val scope = symbol.getFileScope() + with(DebugSymbolRenderer) { + val renderedSymbol = renderExtra(symbol) + val callableNames = scope.getPossibleCallableNames() + val renderedCallables = scope.getCallableSymbols().map { renderExtra(it) } + val classifierNames = scope.getPossibleClassifierNames() + val renderedClassifiers = scope.getClassifierSymbols().map { renderExtra(it) } - val renderedSymbol = DebugSymbolRenderer.render(symbol) - val callableNames = scope.getPossibleCallableNames() - val renderedCallables = scope.getCallableSymbols().map { DebugSymbolRenderer.render(it) } - val classifierNames = scope.getPossibleClassifierNames() - val renderedClassifiers = scope.getClassifierSymbols().map { DebugSymbolRenderer.render(it) } - - "FILE SYMBOL:\n" + renderedSymbol + - "\nCALLABLE NAMES:\n" + callableNames.joinToString(prefix = "[", postfix = "]\n", separator = ", ") + - "\nCALLABLE SYMBOLS:\n" + renderedCallables.joinToString(separator = "\n") + - "\nCLASSIFIER NAMES:\n" + classifierNames.joinToString(prefix = "[", postfix = "]\n", separator = ", ") + - "\nCLASSIFIER SYMBOLS:\n" + renderedClassifiers.joinToString(separator = "\n") + "FILE SYMBOL:\n" + renderedSymbol + + "\nCALLABLE NAMES:\n" + callableNames.joinToString(prefix = "[", postfix = "]\n", separator = ", ") + + "\nCALLABLE SYMBOLS:\n" + renderedCallables.joinToString(separator = "\n") + + "\nCLASSIFIER NAMES:\n" + classifierNames.joinToString(prefix = "[", postfix = "]\n", separator = ", ") + + "\nCLASSIFIER SYMBOLS:\n" + renderedClassifiers.joinToString(separator = "\n") + } } } diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/AbstractSymbolTest.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/AbstractSymbolTest.kt index c34133c2c54..c3860829525 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/AbstractSymbolTest.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/AbstractSymbolTest.kt @@ -5,14 +5,10 @@ package org.jetbrains.kotlin.idea.fir.frontend.api.symbols -import com.intellij.DynamicBundle -import com.intellij.core.CoreApplicationEnvironment import com.intellij.openapi.components.ServiceManager -import com.intellij.psi.impl.smartPointers.SmartPointerAnchorProvider import org.jetbrains.kotlin.idea.fir.analyseOnPooledThreadInReadAction import org.jetbrains.kotlin.idea.fir.frontend.api.test.framework.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.idea.fir.low.level.api.api.KotlinOutOfBlockModificationTrackerFactory -import org.jetbrains.kotlin.idea.fir.low.level.api.api.createProjectWideOutOfBlockModificationTracker import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession import org.jetbrains.kotlin.idea.frontend.api.symbols.DebugSymbolRenderer import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol @@ -41,7 +37,7 @@ abstract class AbstractSymbolTest : AbstractHLApiSingleFileTest() { collectSymbols(ktFile, testServices).map { symbol -> PointerWithRenderedSymbol( if (createPointers) symbol.createPointer() else null, - DebugSymbolRenderer.render(symbol) + with(DebugSymbolRenderer) { renderExtra(symbol) } ) } } @@ -73,7 +69,7 @@ abstract class AbstractSymbolTest : AbstractHLApiSingleFileTest() { pointersWithRendered.map { (pointer, expectedRender) -> val restored = pointer!!.restoreSymbol() ?: error("Symbol $expectedRender was not not restored") - DebugSymbolRenderer.render(restored) + with(DebugSymbolRenderer) { renderExtra(restored) } } } val actual = restored.joinToString(separator = "\n") diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/SymbolByPsiTestGenerated.java b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/SymbolByPsiTestGenerated.java index 2aa5db49528..e0bd3c24150 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/SymbolByPsiTestGenerated.java +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/SymbolByPsiTestGenerated.java @@ -66,6 +66,12 @@ public class SymbolByPsiTestGenerated extends AbstractSymbolByPsiTest { runTest("idea/idea-frontend-fir/testData/symbols/symbolByPsi/classWithTypeParams.kt"); } + @Test + @TestMetadata("deprecated.kt") + public void testDeprecated() throws Exception { + runTest("idea/idea-frontend-fir/testData/symbols/symbolByPsi/deprecated.kt"); + } + @Test @TestMetadata("enum.kt") public void testEnum() throws Exception {