diff --git a/compiler/frontend/src/org/jetbrains/kotlin/lexer/JetTokens.java b/compiler/frontend/src/org/jetbrains/kotlin/lexer/JetTokens.java index 69ce13f5ae9..ab8ccf848ec 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/lexer/JetTokens.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/lexer/JetTokens.java @@ -168,7 +168,7 @@ public interface JetTokens { JetKeywordToken FINALLY_KEYWORD = JetKeywordToken.softKeyword("finally"); JetModifierKeywordToken FINAL_KEYWORD = JetModifierKeywordToken.softKeywordModifier("final"); - JetModifierKeywordToken LATE_INIT_KEYWORD = JetModifierKeywordToken.softKeywordModifier("lateinit"); + JetModifierKeywordToken LATEINIT_KEYWORD = JetModifierKeywordToken.softKeywordModifier("lateinit"); JetModifierKeywordToken DATA_KEYWORD = JetModifierKeywordToken.softKeywordModifier("data"); JetModifierKeywordToken INLINE_KEYWORD = JetModifierKeywordToken.softKeywordModifier("inline"); @@ -197,7 +197,7 @@ public interface JetTokens { CATCH_KEYWORD, FINALLY_KEYWORD, OUT_KEYWORD, FINAL_KEYWORD, VARARG_KEYWORD, REIFIED_KEYWORD, DYNAMIC_KEYWORD, COMPANION_KEYWORD, CONSTRUCTOR_KEYWORD, INIT_KEYWORD, SEALED_KEYWORD, FIELD_KEYWORD, PROPERTY_KEYWORD, RECEIVER_KEYWORD, PARAM_KEYWORD, SETPARAM_KEYWORD, - LATE_INIT_KEYWORD, + LATEINIT_KEYWORD, DATA_KEYWORD, INLINE_KEYWORD, NOINLINE_KEYWORD, TAILREC_KEYWORD, EXTERNAL_KEYWORD, ANNOTATION_KEYWORD, CROSSINLINE_KEYWORD, CONST_KEYWORD, OPERATOR_KEYWORD, INFIX_KEYWORD ); @@ -211,7 +211,7 @@ public interface JetTokens { new JetModifierKeywordToken[] { ABSTRACT_KEYWORD, ENUM_KEYWORD, OPEN_KEYWORD, INNER_KEYWORD, OVERRIDE_KEYWORD, PRIVATE_KEYWORD, PUBLIC_KEYWORD, INTERNAL_KEYWORD, PROTECTED_KEYWORD, OUT_KEYWORD, IN_KEYWORD, FINAL_KEYWORD, VARARG_KEYWORD, - REIFIED_KEYWORD, COMPANION_KEYWORD, SEALED_KEYWORD, LATE_INIT_KEYWORD, + REIFIED_KEYWORD, COMPANION_KEYWORD, SEALED_KEYWORD, LATEINIT_KEYWORD, DATA_KEYWORD, INLINE_KEYWORD, NOINLINE_KEYWORD, TAILREC_KEYWORD, EXTERNAL_KEYWORD, ANNOTATION_KEYWORD, CROSSINLINE_KEYWORD, CONST_KEYWORD, OPERATOR_KEYWORD, INFIX_KEYWORD }; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.java index 8de99a50183..1cb6a92b4f1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.java @@ -413,7 +413,7 @@ public class DeclarationsChecker { private void checkPropertyLateInit(@NotNull JetCallableDeclaration property, @NotNull PropertyDescriptor propertyDescriptor) { JetModifierList modifierList = property.getModifierList(); if (modifierList == null) return; - PsiElement modifier = modifierList.getModifier(JetTokens.LATE_INIT_KEYWORD); + PsiElement modifier = modifierList.getModifier(JetTokens.LATEINIT_KEYWORD); if (modifier == null) return; if (!propertyDescriptor.isVar()) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java index 0d61f735995..ffa29b37acb 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java @@ -747,7 +747,7 @@ public class DescriptorResolver { JetPsiUtil.safeName(property.getName()), CallableMemberDescriptor.Kind.DECLARATION, toSourceElement(property), - modifierList != null && modifierList.hasModifier(JetTokens.LATE_INIT_KEYWORD), + modifierList != null && modifierList.hasModifier(JetTokens.LATEINIT_KEYWORD), modifierList != null && modifierList.hasModifier(JetTokens.CONST_KEYWORD) ); wrapper.setProperty(propertyDescriptor); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt index 83608972f8f..0509ea741af 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt @@ -70,7 +70,7 @@ public object ModifierCheckerCore { REIFIED_KEYWORD to EnumSet.of(TYPE_PARAMETER), VARARG_KEYWORD to EnumSet.of(VALUE_PARAMETER, PROPERTY_PARAMETER), COMPANION_KEYWORD to EnumSet.of(OBJECT), - LATE_INIT_KEYWORD to EnumSet.of(MEMBER_PROPERTY), + LATEINIT_KEYWORD to EnumSet.of(MEMBER_PROPERTY), DATA_KEYWORD to EnumSet.of(CLASS_ONLY, INNER_CLASS, LOCAL_CLASS), INLINE_KEYWORD to EnumSet.of(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER, PROPERTY), NOINLINE_KEYWORD to EnumSet.of(VALUE_PARAMETER), diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java index aec580b5629..37fec0ade8c 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java @@ -32,7 +32,7 @@ public class Flags { // Class public static final FlagField CLASS_KIND = FlagField.after(MODALITY, ProtoBuf.Class.Kind.values()); - public static final FlagField INNER = FlagField.booleanAfter(CLASS_KIND); + public static final FlagField IS_INNER = FlagField.booleanAfter(CLASS_KIND); // Callables @@ -57,8 +57,8 @@ public class Flags { public static final FlagField HAS_GETTER = FlagField.booleanAfter(IS_VAR); public static final FlagField HAS_SETTER = FlagField.booleanAfter(HAS_GETTER); public static final FlagField IS_CONST = FlagField.booleanAfter(HAS_SETTER); - public static final FlagField LATE_INIT = FlagField.booleanAfter(IS_CONST); - public static final FlagField HAS_CONSTANT = FlagField.booleanAfter(LATE_INIT); + public static final FlagField IS_LATEINIT = FlagField.booleanAfter(IS_CONST); + public static final FlagField HAS_CONSTANT = FlagField.booleanAfter(IS_LATEINIT); // Parameters @@ -92,7 +92,7 @@ public class Flags { | MODALITY.toFlags(modality(modality)) | VISIBILITY.toFlags(visibility(visibility)) | CLASS_KIND.toFlags(classKind(kind, isCompanionObject)) - | INNER.toFlags(inner) + | IS_INNER.toFlags(inner) ; } @@ -164,7 +164,7 @@ public class Flags { | HAS_GETTER.toFlags(hasGetter) | HAS_SETTER.toFlags(hasSetter) | IS_CONST.toFlags(isConst) - | LATE_INIT.toFlags(lateInit) + | IS_LATEINIT.toFlags(lateInit) | HAS_CONSTANT.toFlags(hasConstant) ; } diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt index b022aa7ca2d..14bc31e7148 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt @@ -44,7 +44,7 @@ public class MemberDeserializer(private val c: DeserializationContext) { Deserialization.memberKind(Flags.MEMBER_KIND.get(flags)), proto, c.nameResolver, - Flags.LATE_INIT.get(flags), + Flags.IS_LATEINIT.get(flags), Flags.IS_CONST.get(flags) ) diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt index 9e3969bae84..24b9f6db4a3 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt @@ -56,7 +56,7 @@ public class DeserializedClassDescriptor( private val kindFromProto = Flags.CLASS_KIND.get(classProto.getFlags()) private val kind = Deserialization.classKind(kindFromProto) private val isCompanion = kindFromProto == ProtoBuf.Class.Kind.COMPANION_OBJECT - private val isInner = Flags.INNER.get(classProto.getFlags()) + private val isInner = Flags.IS_INNER.get(classProto.getFlags()) val c = outerContext.childContext(this, classProto.getTypeParameterList(), nameResolver) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt index ac4065ee710..b9e2760c6e3 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt @@ -176,7 +176,7 @@ enum class FlagsToModifiers { INNER { override fun getModifiers(flags: Int): JetModifierKeywordToken? { - return if (Flags.INNER.get(flags)) JetTokens.INNER_KEYWORD else null + return if (Flags.IS_INNER.get(flags)) JetTokens.INNER_KEYWORD else null } }, @@ -188,7 +188,7 @@ enum class FlagsToModifiers { LATEINIT { override fun getModifiers(flags: Int): JetModifierKeywordToken? { - return if (Flags.LATE_INIT.get(flags)) JetTokens.LATE_INIT_KEYWORD else null + return if (Flags.IS_LATEINIT.get(flags)) JetTokens.LATEINIT_KEYWORD else null } },