From 7a22ad099a2851ed5584ca48fd111898de96f11b Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 10 Aug 2012 14:06:23 +0400 Subject: [PATCH] Fix formatting in some of test data files. Adapted from https://github.com/develar/kotlin/commit/a9e0a42fb1347fa8e21c86b5a073ef8a7c873da0. --- .../closure/cases/closureReferencingMember.kt | 3 +- .../closure/cases/localParameterInCallback.kt | 2 +- .../cases/closureWithParameterAndBoxing.jet | 6 +- .../cases/doubleEnclosedLocalVariable.jet | 8 +-- .../examples/cases/extensionClosure.jet | 8 +-- .../expression/function/cases/KT-921.kt | 71 ++++++++++--------- .../expression/function/cases/adderClosure.kt | 12 ++-- .../function/cases/defaultParameters.kt | 1 - .../cases/functionLiteralAsLastParameter.kt | 6 +- .../expression/function/cases/loopClosure.kt | 10 +-- .../expression/misc/cases/KT-1361-2.kt | 31 ++++---- .../expression/misc/cases/KT-740-2.kt | 50 +++++++------ .../misc/cases/classWithoutNamespace.kt | 6 +- .../expression/misc/cases/funInConstructor.kt | 15 ++-- .../misc/cases/funInConstructorBlock.kt | 17 +++-- .../misc/cases/whenReturnedWithoutBlock.kt | 24 +++---- .../cases/extensionLiteralPassedToFunction.kt | 6 +- ...yOnClassWithExplicitAndImplicitReceiver.kt | 28 ++++---- .../cases/virtualExtensionOverride.kt | 8 +-- .../cases/valuePassedToAncestorConstructor.kt | 6 +- .../kotlinLib/cases/namespaceWithClasses.js | 68 +++++++++--------- .../testFiles/native/cases/classObject.kt | 18 ++--- .../testFiles/object/cases/objectInMethod.kt | 5 +- .../object/cases/objectWithMethods.kt | 5 +- .../propertyAccess/cases/enumerable.kt | 2 +- ...verloadedOverriddenFunctionPropertyName.kt | 15 ++-- .../testFiles/propertyAccess/enumerate.js | 2 +- .../simple/cases/classInstantiation.kt | 2 +- .../cases/arrayFunctionConstructor.kt | 4 +- .../trait/cases/traitExtendsTwoTraits.kt | 14 ++-- .../webDemoExamples2/cases/builder.kt | 8 +-- 31 files changed, 227 insertions(+), 234 deletions(-) diff --git a/js/js.translator/testFiles/closure/cases/closureReferencingMember.kt b/js/js.translator/testFiles/closure/cases/closureReferencingMember.kt index 8cdbf5ea0d4..09d88979ea4 100644 --- a/js/js.translator/testFiles/closure/cases/closureReferencingMember.kt +++ b/js/js.translator/testFiles/closure/cases/closureReferencingMember.kt @@ -1,7 +1,6 @@ package foo class A() { - var i = 0 fun f() { @@ -21,4 +20,4 @@ fun box() : Boolean { val a = A() a.f() return a.i == 3 -} \ No newline at end of file +} diff --git a/js/js.translator/testFiles/closure/cases/localParameterInCallback.kt b/js/js.translator/testFiles/closure/cases/localParameterInCallback.kt index 4a7e66a3c31..4e4e9f16118 100644 --- a/js/js.translator/testFiles/closure/cases/localParameterInCallback.kt +++ b/js/js.translator/testFiles/closure/cases/localParameterInCallback.kt @@ -24,4 +24,4 @@ fun box() : Boolean { sum += f() } return (sum == 27) -} +} \ No newline at end of file diff --git a/js/js.translator/testFiles/examples/cases/closureWithParameterAndBoxing.jet b/js/js.translator/testFiles/examples/cases/closureWithParameterAndBoxing.jet index 2b64a547d29..9b3401b9d7b 100644 --- a/js/js.translator/testFiles/examples/cases/closureWithParameterAndBoxing.jet +++ b/js/js.translator/testFiles/examples/cases/closureWithParameterAndBoxing.jet @@ -1,7 +1,7 @@ -fun box() : String { - return if (apply( 5, {(arg: Int) -> arg + 13 } ) == 18) "OK" else "fail" +fun box(): String { + return if (apply(5) {(arg: Int) -> arg + 13 } == 18) "OK" else "fail" } -fun apply(arg : Int, f : (p:Int) -> Int) : Int { +fun apply(arg: Int, f: (p: Int) -> Int): Int { return f(arg) } diff --git a/js/js.translator/testFiles/examples/cases/doubleEnclosedLocalVariable.jet b/js/js.translator/testFiles/examples/cases/doubleEnclosedLocalVariable.jet index 96ac7f2ef19..16675be0d7e 100644 --- a/js/js.translator/testFiles/examples/cases/doubleEnclosedLocalVariable.jet +++ b/js/js.translator/testFiles/examples/cases/doubleEnclosedLocalVariable.jet @@ -1,8 +1,8 @@ -fun box() : String { +fun box(): String { val cl = 39 - return if (sum(200, { val ff = {cl}; ff() }) == 239) "OK" else "FAIL" + return if (sum(200, {val ff = {cl}; ff()}) == 239) "OK" else "FAIL" } -fun sum(arg:Int, f : () -> Int) : Int { +fun sum(arg: Int, f: ()->Int): Int { return arg + f() -} +} \ No newline at end of file diff --git a/js/js.translator/testFiles/examples/cases/extensionClosure.jet b/js/js.translator/testFiles/examples/cases/extensionClosure.jet index 21307ea42ab..1999e3cbbb6 100644 --- a/js/js.translator/testFiles/examples/cases/extensionClosure.jet +++ b/js/js.translator/testFiles/examples/cases/extensionClosure.jet @@ -1,13 +1,13 @@ -class Point(val x : Int, val y : Int) +class Point(val x: Int, val y: Int) -fun box() : String { - val answer = apply(Point(3, 5), { Point.(scalar : Int) : Point -> +fun box(): String { + val answer = apply(Point(3, 5), { Point.(scalar: Int) : Point -> Point(x * scalar, y * scalar) }) return if (answer.x == 6 && answer.y == 10) "OK" else "FAIL" } -fun apply(arg:Point, f : Point.(scalar : Int) -> Point) : Point { +fun apply(arg: Point, f: Point.(scalar: Int) -> Point): Point { return arg.f(2) } diff --git a/js/js.translator/testFiles/expression/function/cases/KT-921.kt b/js/js.translator/testFiles/expression/function/cases/KT-921.kt index 626e5f48019..82f26fe6685 100644 --- a/js/js.translator/testFiles/expression/function/cases/KT-921.kt +++ b/js/js.translator/testFiles/expression/function/cases/KT-921.kt @@ -2,12 +2,12 @@ import java.util.* class Lifetime() { val attached = ArrayList< Function0 >() - + public fun attach(action : ()->Unit) { attached.add(action) } - + fun close() { for(x in attached) x() @@ -18,51 +18,52 @@ class Lifetime() { public class Viewable() { val items = ArrayList() - + fun add(item:T) { items.add(item) } - + fun remove(item:T) { items.remove(item) } - - fun view(lifetime: Lifetime, viewer: (itemLifetime:Lifetime, item:T) -> Unit) - { - for(item in items) - viewer(lifetime, item) - } + + fun view(lifetime: Lifetime, viewer: (itemLifetime: Lifetime, item: T) -> Unit) { + for (item in items) { + viewer(lifetime, item) + } + } } -fun lifetime(body: (Lifetime)->Unit) -{ - val l = Lifetime() - body(l) - l.close() +fun lifetime(body: (Lifetime)->Unit) { + val l = Lifetime() + body(l) + l.close() } -fun Dump(items:ArrayList) -{ - for(item in items) - print(item.toString() + ", ") - println("end") +fun Dump(items: ArrayList) { + for(item in items) { + print(item.toString() + ", ") + } + println("end") } -fun main(args:Array) -{ - val v = Viewable() - val x = ArrayList() - v.add(1) - v.add(2) - v.add(3) - lifetime( - { - v.view(it, {(itemLifetime, item)-> - x.add(item) - Dump(x) - itemLifetime.attach { x.remove(item as Any); Dump(x); println("!") } - }) - }) +fun main(args: Array) { + val v = Viewable() + val x = ArrayList() + v.add(1) + v.add(2) + v.add(3) + lifetime() { + v.view(it) {itemLifetime, item -> + x.add(item) + Dump(x) + itemLifetime.attach() { + x.remove(item as Any); + Dump(x); + println("!") + } + } + } } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/function/cases/adderClosure.kt b/js/js.translator/testFiles/expression/function/cases/adderClosure.kt index d7c053cbb87..f5a9ab9f9cc 100644 --- a/js/js.translator/testFiles/expression/function/cases/adderClosure.kt +++ b/js/js.translator/testFiles/expression/function/cases/adderClosure.kt @@ -1,9 +1,9 @@ package foo -fun box() : Boolean { - var sum = 0 - val adder = {(a: Int) -> sum += a } - adder(3) - adder(2) - return sum == 5 +fun box(): Boolean { + var sum = 0 + val adder = {(a: Int) -> sum += a} + adder(3) + adder(2) + return sum == 5 } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/function/cases/defaultParameters.kt b/js/js.translator/testFiles/expression/function/cases/defaultParameters.kt index 73945d0780a..4b404c94049 100644 --- a/js/js.translator/testFiles/expression/function/cases/defaultParameters.kt +++ b/js/js.translator/testFiles/expression/function/cases/defaultParameters.kt @@ -1,6 +1,5 @@ package foo - fun f(a : Int = 2, b : Int = 3) = a + b fun box() : Boolean diff --git a/js/js.translator/testFiles/expression/function/cases/functionLiteralAsLastParameter.kt b/js/js.translator/testFiles/expression/function/cases/functionLiteralAsLastParameter.kt index 6be5be64eb6..c5b9d7d09ba 100644 --- a/js/js.translator/testFiles/expression/function/cases/functionLiteralAsLastParameter.kt +++ b/js/js.translator/testFiles/expression/function/cases/functionLiteralAsLastParameter.kt @@ -1,14 +1,14 @@ package foo -fun f(a: (Int) -> Int) = a(1) +fun f(a: (Int) -> Int) = a(1) -fun box() : Boolean { +fun box(): Boolean { if (f() { it + 2 } != 3) return false - if (f() {(a : Int) -> a * 300} != 300) return false; + if (f() {(a: Int) -> a * 300} != 300) return false; return true } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/function/cases/loopClosure.kt b/js/js.translator/testFiles/expression/function/cases/loopClosure.kt index 1cf3f038528..4290152f49d 100644 --- a/js/js.translator/testFiles/expression/function/cases/loopClosure.kt +++ b/js/js.translator/testFiles/expression/function/cases/loopClosure.kt @@ -2,16 +2,16 @@ package foo var b = 0 -fun loop(var times : Int) { - while(times > 0) { - val u = {(value : Int) -> +fun loop(var times: Int) { + while (times > 0) { + val u = {(value: Int) -> b = b + 1 } u(times--) - } + } } -fun box() : Boolean { +fun box(): Boolean { loop(5) return b == 5 } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/misc/cases/KT-1361-2.kt b/js/js.translator/testFiles/expression/misc/cases/KT-1361-2.kt index 809c2e0907a..699b6bf6f2d 100644 --- a/js/js.translator/testFiles/expression/misc/cases/KT-1361-2.kt +++ b/js/js.translator/testFiles/expression/misc/cases/KT-1361-2.kt @@ -1,7 +1,7 @@ package foo -class Data(val rawData : Array, val width : Int, val height : Int) { - fun get(x : Int, y : Int) : ColorLike { +class Data(val rawData: Array, val width: Int, val height: Int) { + fun get(x: Int, y: Int): ColorLike { return object : ColorLike { override val red: Int = rawData[(y * width + x) * 4 + 0]; override val green: Int = rawData[(y * width + x) * 4 + 1]; @@ -9,13 +9,13 @@ class Data(val rawData : Array, val width : Int, val height : Int) { } } - fun set(x : Int, y : Int, color : ColorLike) { + fun set(x: Int, y: Int, color: ColorLike) { rawData[(y * width + x) * 4 + 0] = color.red; rawData[(y * width + x) * 4 + 1] = color.green; rawData[(y * width + x) * 4 + 2] = color.blue; } - fun each(block : (x : Int, y : Int)->Unit) { + fun each(block: (x: Int, y: Int)->Unit) { for (x in 0..width - 1) { for (y in 0..height - 1) { block(x, y) @@ -24,29 +24,28 @@ class Data(val rawData : Array, val width : Int, val height : Int) { } } -class Color(r : Int, g : Int, b : Int) : ColorLike { +class Color(r: Int, g: Int, b: Int): ColorLike { override val red: Int = r override val green: Int = g override val blue: Int = b } trait ColorLike { - val red : Int; - val green : Int; - val blue : Int; + val red: Int; + val green: Int; + val blue: Int; } - -fun box() : Boolean { +fun box(): Boolean { val d = Data(Array(4) {0}, 1, 1) if (d[0, 0].red != 0) { return false } if (d[0, 0].green != 0) { - return false - } - if (d[0, 0].blue != 0) { - return false - } - return true + return false + } + if (d[0, 0].blue != 0) { + return false + } + return true } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/misc/cases/KT-740-2.kt b/js/js.translator/testFiles/expression/misc/cases/KT-740-2.kt index 8d2526ec134..1e30fa8d301 100644 --- a/js/js.translator/testFiles/expression/misc/cases/KT-740-2.kt +++ b/js/js.translator/testFiles/expression/misc/cases/KT-740-2.kt @@ -5,31 +5,29 @@ var c1 = 0 var c2 = 0 class A() { - var p = 0 - fun get(i : Int) : Int { - c1++ - return 0 - } - - fun set(i : Int, value : Int) { - c2++ - } + var p = 0 + fun get(i: Int): Int { + c1++ + return 0 + } + fun set(i: Int, value: Int) { + c2++ + } } -val a : A = A() -get() { - c0++ - return $a -} - -fun box() : String { +val a: A = A() + get() { + c0++ + return $a + } +fun box(): String { var d = a[1] if (c0 != 1) { return "1" } - if (c1 != 1) { + if (c1 != 1) { return "2" } ++a[1] @@ -37,20 +35,20 @@ fun box() : String { return "3" } if (c1 != 3) { - return "4" + return "4" } if (c2 != 1) { return "5" } - --a[1] + --a[1] if (c0 != 3) { return "6" } - if (c1 != 5) { - return "7" - } - if (c2 != 2) { - return "8" - } - return "OK" + if (c1 != 5) { + return "7" + } + if (c2 != 2) { + return "8" + } + return "OK" } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/misc/cases/classWithoutNamespace.kt b/js/js.translator/testFiles/expression/misc/cases/classWithoutNamespace.kt index 4aceb233099..89ed979706e 100644 --- a/js/js.translator/testFiles/expression/misc/cases/classWithoutNamespace.kt +++ b/js/js.translator/testFiles/expression/misc/cases/classWithoutNamespace.kt @@ -1,7 +1,7 @@ -class A(var a : Int) { +class A(var a: Int) { { - $a=3 + $a = 3 } } -fun box() = (A(1).a == 3) \ No newline at end of file +fun box() = (A(1).a == 3) diff --git a/js/js.translator/testFiles/expression/misc/cases/funInConstructor.kt b/js/js.translator/testFiles/expression/misc/cases/funInConstructor.kt index 917a00728af..fdcfcec0797 100644 --- a/js/js.translator/testFiles/expression/misc/cases/funInConstructor.kt +++ b/js/js.translator/testFiles/expression/misc/cases/funInConstructor.kt @@ -1,17 +1,18 @@ package foo class A() { + fun lold() = true - fun lold() = true - - val p = {{lold()}()} + val p = {{ + lold() + }() + } } - -fun box() : Boolean { - return A().p() +fun box(): Boolean { + return A().p() } -fun main(arg : Array) { +fun main(arg: Array) { println(box()) } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/misc/cases/funInConstructorBlock.kt b/js/js.translator/testFiles/expression/misc/cases/funInConstructorBlock.kt index 34fab35d9b8..16942d23712 100644 --- a/js/js.translator/testFiles/expression/misc/cases/funInConstructorBlock.kt +++ b/js/js.translator/testFiles/expression/misc/cases/funInConstructorBlock.kt @@ -1,19 +1,18 @@ package foo class A() { - - fun lold() = true - val p : ()->Boolean - { - $p = {{lold()}()} - } + fun lold() = true + val p: ()->Boolean + { + $p = {{lold()}()} + } } -fun box() : Boolean { - return A().p() +fun box(): Boolean { + return A().p() } -fun main(arg : Array) { +fun main(arg: Array) { println(box()) } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/misc/cases/whenReturnedWithoutBlock.kt b/js/js.translator/testFiles/expression/misc/cases/whenReturnedWithoutBlock.kt index bbc80810dbb..583f1697403 100644 --- a/js/js.translator/testFiles/expression/misc/cases/whenReturnedWithoutBlock.kt +++ b/js/js.translator/testFiles/expression/misc/cases/whenReturnedWithoutBlock.kt @@ -1,18 +1,18 @@ package foo -fun box() : Boolean { - if (t(1) != 0) { - return false - } - if (t(0) != 1) { - return false - } - return (t(100) == 2) +fun box(): Boolean { + if (t(1) != 0) { + return false + } + if (t(0) != 1) { + return false + } + return (t(100) == 2) } -fun t(i : Int) = when(i) { - 0 -> 1 - 1 -> 0 - else -> 2 +fun t(i: Int) = when(i) { + 0 -> 1 + 1 -> 0 + else -> 2 } \ No newline at end of file diff --git a/js/js.translator/testFiles/extensionFunction/cases/extensionLiteralPassedToFunction.kt b/js/js.translator/testFiles/extensionFunction/cases/extensionLiteralPassedToFunction.kt index 62bd16300a2..f0ddd9aed53 100644 --- a/js/js.translator/testFiles/extensionFunction/cases/extensionLiteralPassedToFunction.kt +++ b/js/js.translator/testFiles/extensionFunction/cases/extensionLiteralPassedToFunction.kt @@ -1,7 +1,7 @@ package foo -fun apply(i : Int, f : Int.(Int) -> Int) = i.f(1); +fun apply(i: Int, f: Int.(Int) -> Int) = i.f(1); -fun box() : Boolean { - return (apply(1, {i -> i + this})) == 2 +fun box(): Boolean { + return apply(1, {i -> i + this}) == 2 } \ No newline at end of file diff --git a/js/js.translator/testFiles/extensionFunction/cases/extensionPropertyOnClassWithExplicitAndImplicitReceiver.kt b/js/js.translator/testFiles/extensionFunction/cases/extensionPropertyOnClassWithExplicitAndImplicitReceiver.kt index b957fb7822d..4555042bb19 100644 --- a/js/js.translator/testFiles/extensionFunction/cases/extensionPropertyOnClassWithExplicitAndImplicitReceiver.kt +++ b/js/js.translator/testFiles/extensionFunction/cases/extensionPropertyOnClassWithExplicitAndImplicitReceiver.kt @@ -1,26 +1,24 @@ package foo class Foo { - - fun blah(value: Int): Int { - return value + 1 - } - + fun blah(value: Int): Int { + return value + 1 + } } -val Foo.fooImp : Int - get() { - return blah(5) - } +val Foo.fooImp: Int + get() { + return blah(5) + } -val Foo.fooExp : Int - get() { - return this.blah(10) - } +val Foo.fooExp: Int + get() { + return this.blah(10) + } -fun box() : Boolean { +fun box(): Boolean { var a = Foo() if (a.fooImp != 6) return false if (a.fooExp != 11) return false return true; -} \ No newline at end of file +} diff --git a/js/js.translator/testFiles/extensionFunction/cases/virtualExtensionOverride.kt b/js/js.translator/testFiles/extensionFunction/cases/virtualExtensionOverride.kt index 78646fb4b38..e03d60be4b2 100644 --- a/js/js.translator/testFiles/extensionFunction/cases/virtualExtensionOverride.kt +++ b/js/js.translator/testFiles/extensionFunction/cases/virtualExtensionOverride.kt @@ -1,16 +1,16 @@ package foo -open class A(var a : Int) { +open class A(var a: Int) { - open fun Int.modify() : Int { + open fun Int.modify(): Int { return this * 3; } fun eval() = a.modify(); } -class B(a : Int) : A(a) { - override fun Int.modify() : Int { +class B(a: Int): A(a) { + override fun Int.modify(): Int { return this - 2; } } diff --git a/js/js.translator/testFiles/inheritance/cases/valuePassedToAncestorConstructor.kt b/js/js.translator/testFiles/inheritance/cases/valuePassedToAncestorConstructor.kt index 97795d7210f..4f8e39011c6 100644 --- a/js/js.translator/testFiles/inheritance/cases/valuePassedToAncestorConstructor.kt +++ b/js/js.translator/testFiles/inheritance/cases/valuePassedToAncestorConstructor.kt @@ -1,12 +1,12 @@ package foo -open class C(a : Int) { +open class C(a: Int) { val b = a } -class D(c : Int) : C(c + 2) { +class D(c: Int): C(c + 2) { } fun box(): Boolean { - return (D(0).b == 2) + return (D(0).b == 2) } \ No newline at end of file diff --git a/js/js.translator/testFiles/kotlinLib/cases/namespaceWithClasses.js b/js/js.translator/testFiles/kotlinLib/cases/namespaceWithClasses.js index e18599b54ec..107f769c0cb 100644 --- a/js/js.translator/testFiles/kotlinLib/cases/namespaceWithClasses.js +++ b/js/js.translator/testFiles/kotlinLib/cases/namespaceWithClasses.js @@ -15,41 +15,41 @@ */ { - var classes = function(){ - var A = Kotlin.createClass({initialize:function(){ - this.$order = ''; - { - this.set_order(this.get_order() + 'A'); - } + var items = function () { + var A = Kotlin.createClass({initialize: function () { + this.$order = ''; + { + this.set_order(this.get_order() + 'A'); + } + }, set_order: function (tmp$0) { + this.$order = tmp$0; + }, get_order: function () { + return this.$order; + } + }); + var B = Kotlin.createClass(A, {initialize: function () { + this.super_init(); + { + this.set_order(this.get_order() + 'B'); + } + } + }); + var C = Kotlin.createClass(B, {initialize: function () { + this.super_init(); + { + this.set_order(this.get_order() + 'C'); + } + } + }); + return {A: A, B: B, C: C}; } - , set_order:function(tmp$0){ - this.$order = tmp$0; - } - , get_order:function(){ - return this.$order; - } - }); - var B = Kotlin.createClass(A, {initialize:function(){ - this.super_init(); - { - this.set_order(this.get_order() + 'B'); - } - } - }); - var C = Kotlin.createClass(B, {initialize:function(){ - this.super_init(); - { - this.set_order(this.get_order() + 'C'); - } - } - }); - return {A:A, B:B, C:C}; - } - (); - var foo = Kotlin.definePackage(classes, {box:function(){ - return (new foo.C).get_order() === 'ABC' && (new foo.B).get_order() === 'AB' && (new foo.A).get_order() === 'A'; - } - }); + (); + + items.box = function () { + return (new foo.C).get_order() === 'ABC' && (new foo.B).get_order() === 'AB' && (new foo.A).get_order() === 'A'; + }; + + var foo = Kotlin.definePackage(items); } function test() { diff --git a/js/js.translator/testFiles/native/cases/classObject.kt b/js/js.translator/testFiles/native/cases/classObject.kt index d2f2566cfce..5b46f087521 100644 --- a/js/js.translator/testFiles/native/cases/classObject.kt +++ b/js/js.translator/testFiles/native/cases/classObject.kt @@ -4,17 +4,17 @@ import js.* native class A(val c: Int) { - native - class object { - val g: Int = js.noImpl - val c: String = js.noImpl - } + native + class object { + val g: Int = js.noImpl + val c: String = js.noImpl + } } fun box(): Boolean { - if (A.g != 3) return false - if (A.c != "hoooray") return false - if (A(2).c != 2) return false + if (A.g != 3) return false + if (A.c != "hoooray") return false + if (A(2).c != 2) return false - return true + return true } \ No newline at end of file diff --git a/js/js.translator/testFiles/object/cases/objectInMethod.kt b/js/js.translator/testFiles/object/cases/objectInMethod.kt index 664d6aedc83..61d26aa3910 100644 --- a/js/js.translator/testFiles/object/cases/objectInMethod.kt +++ b/js/js.translator/testFiles/object/cases/objectInMethod.kt @@ -1,9 +1,7 @@ package foo class A() { - - fun f() : Boolean { - + fun f(): Boolean { object t { val c = true; } @@ -12,7 +10,6 @@ class A() { } return t.c && z.c } - } fun box() = A().f(); diff --git a/js/js.translator/testFiles/object/cases/objectWithMethods.kt b/js/js.translator/testFiles/object/cases/objectWithMethods.kt index 9d876f9e22c..1f1faf3f220 100644 --- a/js/js.translator/testFiles/object/cases/objectWithMethods.kt +++ b/js/js.translator/testFiles/object/cases/objectWithMethods.kt @@ -5,9 +5,7 @@ val a = object { fun b() = 2 } -fun box() : Boolean { - - +fun box(): Boolean { if (a.c() != 3) { return false; } @@ -15,6 +13,5 @@ fun box() : Boolean { return false; } - return true; } \ No newline at end of file diff --git a/js/js.translator/testFiles/propertyAccess/cases/enumerable.kt b/js/js.translator/testFiles/propertyAccess/cases/enumerable.kt index 899f049cd9e..9293e7ba318 100644 --- a/js/js.translator/testFiles/propertyAccess/cases/enumerable.kt +++ b/js/js.translator/testFiles/propertyAccess/cases/enumerable.kt @@ -25,4 +25,4 @@ fun box():Boolean { val test = _enumerate(Test()) val p = _enumerate(P()) return (100 == test.a && "s" == test.b) && p.a == 100 && _findFirst(object {val test = 100}) == 100; -} +} \ No newline at end of file diff --git a/js/js.translator/testFiles/propertyAccess/cases/overloadedOverriddenFunctionPropertyName.kt b/js/js.translator/testFiles/propertyAccess/cases/overloadedOverriddenFunctionPropertyName.kt index f43556f8b5b..01966f781e7 100644 --- a/js/js.translator/testFiles/propertyAccess/cases/overloadedOverriddenFunctionPropertyName.kt +++ b/js/js.translator/testFiles/propertyAccess/cases/overloadedOverriddenFunctionPropertyName.kt @@ -1,14 +1,19 @@ package foo trait I { - fun test():String + fun test(): String } -class P : I { - override fun test():String {return "a" + test("b")} - private fun test(p:String):String {return p} +class P: I { + override fun test(): String { + return "a" + test("b") + } + + private fun test(p: String): String { + return p + } } -fun box():Boolean { +fun box(): Boolean { return P().test() == "ab" } \ No newline at end of file diff --git a/js/js.translator/testFiles/propertyAccess/enumerate.js b/js/js.translator/testFiles/propertyAccess/enumerate.js index d8c8d0491d7..9e0800c158b 100644 --- a/js/js.translator/testFiles/propertyAccess/enumerate.js +++ b/js/js.translator/testFiles/propertyAccess/enumerate.js @@ -10,4 +10,4 @@ function _findFirst(o) { for (var p in o) { return o[p]; } -} +} \ No newline at end of file diff --git a/js/js.translator/testFiles/simple/cases/classInstantiation.kt b/js/js.translator/testFiles/simple/cases/classInstantiation.kt index e4b1a63d67b..2de7d76dd04 100644 --- a/js/js.translator/testFiles/simple/cases/classInstantiation.kt +++ b/js/js.translator/testFiles/simple/cases/classInstantiation.kt @@ -3,7 +3,7 @@ package foo class Test() { } -fun box() : Boolean { +fun box(): Boolean { var test = Test() return true } \ No newline at end of file diff --git a/js/js.translator/testFiles/standardClasses/cases/arrayFunctionConstructor.kt b/js/js.translator/testFiles/standardClasses/cases/arrayFunctionConstructor.kt index af27daeaafe..57783313a1e 100644 --- a/js/js.translator/testFiles/standardClasses/cases/arrayFunctionConstructor.kt +++ b/js/js.translator/testFiles/standardClasses/cases/arrayFunctionConstructor.kt @@ -1,7 +1,7 @@ package foo -val f = {(i : Int) -> i + 1} +val f = {(i: Int) -> i + 1} val a = Array(3, f) -fun box() = (a[0] == 1 && a[2] == 3 && a[1] == 2) \ No newline at end of file +fun box() = (a[0] == 1 && a[2] == 3 && a[1] == 2) diff --git a/js/js.translator/testFiles/trait/cases/traitExtendsTwoTraits.kt b/js/js.translator/testFiles/trait/cases/traitExtendsTwoTraits.kt index f058b97a5e8..5e5c03ae2e9 100644 --- a/js/js.translator/testFiles/trait/cases/traitExtendsTwoTraits.kt +++ b/js/js.translator/testFiles/trait/cases/traitExtendsTwoTraits.kt @@ -1,25 +1,25 @@ package foo trait A { - fun addFoo(s:String) : String { - return s + "FOO" + fun addFoo(s: String): String { + return s + "FOO" } } trait B { - fun hooray() : String { + fun hooray(): String { return "hooray" } } -trait AD : A, B { +trait AD: A, B { } -class Test() : AD { - fun eval() : String { +class Test(): AD { + fun eval(): String { return addFoo(hooray()); } } -fun box() = (Test().eval() == "hoorayFOO") \ No newline at end of file +fun box() = (Test().eval() == "hoorayFOO") diff --git a/js/js.translator/testFiles/webDemoExamples2/cases/builder.kt b/js/js.translator/testFiles/webDemoExamples2/cases/builder.kt index 5abd98a999e..2bae4e90e95 100644 --- a/js/js.translator/testFiles/webDemoExamples2/cases/builder.kt +++ b/js/js.translator/testFiles/webDemoExamples2/cases/builder.kt @@ -134,8 +134,8 @@ class A() : BodyTag("a") { } } -fun html(init : HTML.() -> Unit) : HTML { - val html = HTML() - html.init() - return html +fun html(init: HTML.() -> Unit): HTML { + val html = HTML() + html.init() + return html } \ No newline at end of file