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

Unify Deprecation classes from :core:compiler.common and :compiler:frontend modules

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-08-27 12:51:16 +03:00
parent be999564b1
commit 762d225bd7
18 changed files with 108 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtSymbolInfoProvider.kt
+2 -2
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.idea.frontend.api.components
import org.jetbrains.kotlin.descriptors.Deprecation
import org.jetbrains.kotlin.resolve.deprecation.Deprecation
import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPropertySymbol
import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol
@@ -41,4 +41,4 @@ public interface KtSymbolInfoProviderMixIn : KtAnalysisSessionMixIn {
*/
public val KtPropertySymbol.setterDeprecationStatus: Deprecation?
get() = analysisSession.symbolInfoProvider.getSetterDeprecation(this)
}
}
idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/DebugSymbolRenderer.kt
+1 -1
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.idea.frontend.api.symbols
import org.jetbrains.kotlin.descriptors.Deprecation
import org.jetbrains.kotlin.resolve.deprecation.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.*
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSymbolInfoProvider.kt
+2 -2
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.idea.frontend.api.fir.components
import org.jetbrains.kotlin.descriptors.Deprecation
import org.jetbrains.kotlin.resolve.deprecation.Deprecation
import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
import org.jetbrains.kotlin.fir.declarations.getDeprecationForCallSite
import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
@@ -59,4 +59,4 @@ internal class KtFirSymbolInfoProvider(
it.symbol.getDeprecationForCallSite(AnnotationUseSiteTarget.PROPERTY_SETTER, AnnotationUseSiteTarget.PROPERTY)
}
}
}
}
idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.txt
Vendored
+4 -4
View File
@@ -320,7 +320,7 @@ KtFirFunctionSymbol:
KtFirValueParameterSymbol(p3)
]
visibility: Public
deprecationStatus: Deprecation(level=WARNING, inheritable=false, message=Deprecated in Java)
deprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=Deprecated in Java)
KtFirFunctionSymbol:
annotatedType: [] ft<kotlin/ByteArray, kotlin/ByteArray?>
@@ -1721,7 +1721,7 @@ KtFirConstructorSymbol:
KtFirValueParameterSymbol(p3)
]
visibility: Public
deprecationStatus: Deprecation(level=WARNING, inheritable=false, message=Deprecated in Java)
deprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=Deprecated in Java)
KtFirConstructorSymbol:
annotatedType: [] java/lang/String
@@ -1747,7 +1747,7 @@ KtFirConstructorSymbol:
KtFirValueParameterSymbol(p1)
]
visibility: Public
deprecationStatus: Deprecation(level=WARNING, inheritable=false, message=Deprecated in Java)
deprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=Deprecated in Java)
KtFirConstructorSymbol:
annotatedType: [] java/lang/String
@@ -1965,4 +1965,4 @@ KtFirConstructorSymbol:
KtFirValueParameterSymbol(p2)
]
visibility: PackageVisibility
deprecationStatus: Deprecation(level=WARNING, inheritable=false, message=Deprecated in Java)
deprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=Deprecated in Java)
idea/idea-frontend-fir/testData/symbols/symbolByPsi/deprecated.txt
Vendored
+22 -22
View File
@@ -28,9 +28,9 @@ KtFirKotlinPropertySymbol:
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)
deprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i)
getterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i)
setterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i)
KtFirKotlinPropertySymbol:
annotatedType: [] kotlin/Int
@@ -63,7 +63,7 @@ KtFirKotlinPropertySymbol:
symbolKind: TOP_LEVEL
visibility: Public
deprecationStatus: null
getterDeprecationStatus: Deprecation(level=WARNING, inheritable=true, message=don't use getter of i2)
getterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use getter of i2)
setterDeprecationStatus: null
KtFirKotlinPropertySymbol:
@@ -98,7 +98,7 @@ KtFirKotlinPropertySymbol:
visibility: Public
deprecationStatus: null
getterDeprecationStatus: null
setterDeprecationStatus: Deprecation(level=WARNING, inheritable=true, message=don't use getter of i3)
setterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use getter of i3)
KtFirKotlinPropertySymbol:
annotatedType: [] kotlin/Int
@@ -134,8 +134,8 @@ KtFirKotlinPropertySymbol:
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)
getterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use getter of i4)
setterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use getter of i4)
KtFirFunctionSymbol:
annotatedType: [] kotlin/Int
@@ -165,7 +165,7 @@ KtFirFunctionSymbol:
typeParameters: []
valueParameters: []
visibility: Public
deprecationStatus: Deprecation(level=WARNING, inheritable=true, message=don't use f)
deprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use f)
KtFirNamedClassOrObjectSymbol:
annotationClassIds: [
@@ -192,7 +192,7 @@ KtFirNamedClassOrObjectSymbol:
symbolKind: TOP_LEVEL
typeParameters: []
visibility: Public
deprecationStatus: Deprecation(level=WARNING, inheritable=true, message=don't use MyClass)
deprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use MyClass)
KtFirKotlinPropertySymbol:
annotatedType: [] kotlin/Int
@@ -224,9 +224,9 @@ KtFirKotlinPropertySymbol:
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)
deprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i2)
getterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i2)
setterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i2)
KtFirFunctionSymbol:
annotatedType: [] kotlin/Int
@@ -256,7 +256,7 @@ KtFirFunctionSymbol:
typeParameters: []
valueParameters: []
visibility: Public
deprecationStatus: Deprecation(level=WARNING, inheritable=true, message=don't use f2)
deprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use f2)
KtFirNamedClassOrObjectSymbol:
annotationClassIds: []
@@ -310,9 +310,9 @@ KtFirKotlinPropertySymbol:
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)
deprecationStatus: SimpleDeprecationInfo(deprecationLevel=ERROR, propagatesToOverrides=true, message=null)
getterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=ERROR, propagatesToOverrides=true, message=null)
setterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=ERROR, propagatesToOverrides=true, message=null)
KtFirKotlinPropertySymbol:
annotatedType: [] kotlin/Int
@@ -344,9 +344,9 @@ KtFirKotlinPropertySymbol:
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)
deprecationStatus: SimpleDeprecationInfo(deprecationLevel=HIDDEN, propagatesToOverrides=true, message=null)
getterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=HIDDEN, propagatesToOverrides=true, message=null)
setterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=HIDDEN, propagatesToOverrides=true, message=null)
KtFirKotlinPropertySymbol:
annotatedType: [] kotlin/Int
@@ -378,6 +378,6 @@ KtFirKotlinPropertySymbol:
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)
deprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=null)
getterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=null)
setterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=null)