From 04d9b4685bb0c2bbb6bb75530314ccc648e68744 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 27 Jul 2012 17:33:23 +0400 Subject: [PATCH] =?UTF-8?q?KT-2177:=20object=20literal=20as=20initializer?= =?UTF-8?q?=20value=20for=20class/object=20property=20=E2=80=94=20undefine?= =?UTF-8?q?d=20variable=20generated.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Just test. #KT-2177 Fixed --- .../test/org/jetbrains/k2js/test/semantics/ObjectTest.java | 5 +---- js/js.translator/testFiles/object/cases/objectInObject.kt | 3 ++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ObjectTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/ObjectTest.java index 62fbfbacfab..093b4ecf2e4 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ObjectTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/ObjectTest.java @@ -16,11 +16,8 @@ package org.jetbrains.k2js.test.semantics; -import org.jetbrains.k2js.config.EcmaVersion; import org.jetbrains.k2js.test.SingleFileTranslationTest; -import java.util.EnumSet; - /** * @author Pavel Talanov */ @@ -48,7 +45,7 @@ public final class ObjectTest extends SingleFileTranslationTest { } public void testObjectInObject() throws Exception { - fooBoxTest(EnumSet.noneOf(EcmaVersion.class)); + fooBoxTest(); } diff --git a/js/js.translator/testFiles/object/cases/objectInObject.kt b/js/js.translator/testFiles/object/cases/objectInObject.kt index 1d467b1b2a2..24391cc0ce1 100644 --- a/js/js.translator/testFiles/object/cases/objectInObject.kt +++ b/js/js.translator/testFiles/object/cases/objectInObject.kt @@ -10,7 +10,8 @@ object B { } class C { - val query = object {val status = "complete"} + fun ov() = "d" + val query = object {val status = "complete" + ov()} } fun box() = A.query.status == "complete" && B.query.status == "completed" && C().query.status == "completed"