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

Fix implementation doesn't match name of property

Browse Source 
Currently, property `hasSourceAnnotationsErased` returns the opposite
to what is stated in name. Invert it both in implementation and on
call site.

^KT-58551
This commit is contained in:
Roman Efremov
2023-08-03 16:41:41 +02:00
committed by Space Team
parent a1a1049aa8
commit 05cead2ab5
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/mpp/FirExpectActualMatchingContextImpl.kt
+1 -1
View File
@@ -375,7 +375,7 @@ class FirExpectActualMatchingContextImpl private constructor(
override val DeclarationSymbolMarker.hasSourceAnnotationsErased: Boolean
get() {
val symbol = asSymbol()
return symbol.source != null || symbol.origin is FirDeclarationOrigin.Plugin
return symbol.source == null && symbol.origin !is FirDeclarationOrigin.Plugin
}
object Factory : FirExpectActualMatchingContextFactory {
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/actualizer/IrExpectActualMatchingContext.kt
+1 -1
View File
@@ -491,6 +491,6 @@ internal abstract class IrExpectActualMatchingContext(
override val DeclarationSymbolMarker.hasSourceAnnotationsErased: Boolean
get() {
val ir = asIr()
return ir.sourceElement() != null || ir.origin is IrDeclarationOrigin.GeneratedByPlugin
return ir.sourceElement() == null && ir.origin !is IrDeclarationOrigin.GeneratedByPlugin
}
}
compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/mpp/AbstractExpectActualAnnotationMatchChecker.kt
+1 -1
View File
@@ -47,7 +47,7 @@ object AbstractExpectActualAnnotationMatchChecker {
// TODO(Roman.Efremov, KT-58551): fix actual typealias class members not checked in FE checkers
// TODO(Roman.Efremov, KT-58551): check annotations on fake overrides in case of implicit actualization
val skipSourceAnnotations = !actualSymbol.hasSourceAnnotationsErased
val skipSourceAnnotations = actualSymbol.hasSourceAnnotationsErased
val actualAnnotationsByName = actualSymbol.annotations.groupBy { it.classId }
for (expectAnnotation in expectSymbol.annotations) {
compiler/resolution/src/org/jetbrains/kotlin/resolve/multiplatform/ClassicExpectActualMatchingContext.kt
+3 -3
View File
@@ -369,8 +369,8 @@ class ClassicExpectActualMatchingContext(val platformModule: ModuleDescriptor) :
override val DeclarationSymbolMarker.hasSourceAnnotationsErased: Boolean
get() {
return DescriptorUtils.getContainingSourceFile(asDescriptor()) != SourceFile.NO_SOURCE_FILE ||
this is K1SyntheticClassifierSymbolMarker ||
this is CallableMemberDescriptor && kind == CallableMemberDescriptor.Kind.SYNTHESIZED
return DescriptorUtils.getContainingSourceFile(asDescriptor()) == SourceFile.NO_SOURCE_FILE &&
this !is K1SyntheticClassifierSymbolMarker &&
!(this is CallableMemberDescriptor && kind == CallableMemberDescriptor.Kind.SYNTHESIZED)
}
}