diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/initializer/InitializerUtils.java b/js/js.translator/src/org/jetbrains/k2js/translate/initializer/InitializerUtils.java index d5f7cfaf29a..ef16e3534a3 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/initializer/InitializerUtils.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/initializer/InitializerUtils.java @@ -43,12 +43,7 @@ public final class InitializerUtils { public static JsStatement generateInitializerForProperty(@NotNull TranslationContext context, @NotNull PropertyDescriptor descriptor, @NotNull JsExpression value) { - if (context.isEcma5()) { - return JsAstUtils.definePropertyDataDescriptor(descriptor, value, context).makeStmt(); - } - else { - return assignmentToBackingField(context, descriptor, value).makeStmt(); - } + return assignmentToBackingField(context, descriptor, value).makeStmt(); } @Nullable diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsAstUtils.java b/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsAstUtils.java index 349144b9fba..e1845cd2177 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsAstUtils.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsAstUtils.java @@ -22,8 +22,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.Modality; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; import org.jetbrains.jet.lang.psi.JetElement; import org.jetbrains.k2js.translate.context.TranslationContext; @@ -222,14 +220,6 @@ public final class JsAstUtils { return result; } - @NotNull - public static JsInvocation definePropertyDataDescriptor(@NotNull PropertyDescriptor descriptor, - @NotNull JsExpression value, - @NotNull TranslationContext context) { - return defineProperty(context.getNameForDescriptor(descriptor).getIdent(), createPropertyDataDescriptor(descriptor, value), - context); - } - @NotNull public static JsInvocation defineProperty( @NotNull String name, @@ -272,11 +262,6 @@ public final class JsAstUtils { return dataDescriptor; } - @NotNull - public static JsObjectLiteral createPropertyDataDescriptor(@NotNull PropertyDescriptor descriptor, @NotNull JsExpression value) { - return createPropertyDataDescriptor(descriptor, descriptor.isVar() || descriptor.getModality() == Modality.OPEN, value); - } - @NotNull private static JsObjectLiteral createPropertyDataDescriptor( @NotNull DeclarationDescriptor descriptor,