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

Rename isHeader to isExpect in descriptors

Browse Source
This commit is contained in:
Stanislav Erokhin
2017-09-14 20:46:40 +03:00
committed by Mikhail Glukhikh
parent fd6eab38e5
commit c8ee424f67
61 changed files with 135 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsNameClashChecker.kt
+3 -3
View File
@@ -69,7 +69,7 @@ class JsNameClashChecker : SimpleDeclarationChecker {
if (existing != null &&
existing != descriptor &&
existing.isImpl == descriptor.isImpl &&
existing.isHeader == descriptor.isHeader &&
existing.isExpect == descriptor.isExpect &&
!bindingContext.isCommonDiagnosticReported(declaration)
) {
diagnosticHolder.report(ErrorsJs.JS_NAME_CLASH.on(declaration, name, existing))
@@ -112,8 +112,8 @@ class JsNameClashChecker : SimpleDeclarationChecker {
private val DeclarationDescriptor.isImpl: Boolean
get() = this is MemberDescriptor && this.isImpl
private val DeclarationDescriptor.isHeader: Boolean
get() = this is MemberDescriptor && this.isHeader
private val DeclarationDescriptor.isExpect: Boolean
get() = this is MemberDescriptor && this.isExpect
private fun isFakeOverridingNative(descriptor: CallableMemberDescriptor): Boolean {
return descriptor.kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE &&
js/js.frontend/src/org/jetbrains/kotlin/js/translate/utils/AnnotationsUtils.java
+1 -1
View File
@@ -163,7 +163,7 @@ public final class AnnotationsUtils {
}
public static boolean isPredefinedObject(@NotNull DeclarationDescriptor descriptor) {
if (descriptor instanceof MemberDescriptor && ((MemberDescriptor) descriptor).isHeader()) return true;
if (descriptor instanceof MemberDescriptor && ((MemberDescriptor) descriptor).isExpect()) return true;
if (isEffectivelyExternalMember(descriptor)) return true;
for (PredefinedAnnotation annotation : PredefinedAnnotation.values()) {
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt
+1 -1
View File
@@ -130,7 +130,7 @@ object KotlinJavascriptSerializationUtil {
val builder = ProtoBuf.PackageFragment.newBuilder()
// TODO: ModuleDescriptor should be able to return the package only with the contents of that module, without dependencies
val skip: (DeclarationDescriptor) -> Boolean = { DescriptorUtils.getContainingModule(it) != module || (it is MemberDescriptor && it.isHeader) }
val skip: (DeclarationDescriptor) -> Boolean = { DescriptorUtils.getContainingModule(it) != module || (it is MemberDescriptor && it.isExpect) }
val fileRegistry = KotlinFileRegistry()
val serializerExtension = KotlinJavascriptSerializerExtension(fileRegistry)