From 38d1142c39b75a88105b437be22824f0269384f3 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 14 Feb 2014 15:28:40 +0400 Subject: [PATCH] Minor change: reformat code in testData files. --- .../testFiles/classObject/cases/inTrait.kt | 3 +- .../testFiles/classObject/cases/setVar.kt | 3 +- .../testFiles/classObject/cases/simple.kt | 3 +- .../classObject/cases/withExtension.kt | 2 +- .../closure/cases/closureInNestedFunctions.kt | 2 +- .../cases/closureInNestedFunctionsInMethod.kt | 2 +- ...reInNestedFunctionsWhichMixedWithObject.kt | 12 +- .../cases/closureLocalLiteralFunction.kt | 4 +- .../closure/cases/closureReferencingMember.kt | 24 +-- .../closure/cases/closureThisInConstructor.kt | 4 +- .../closure/cases/iteratingCallbacks.kt | 16 +- .../closure/cases/localParameterInCallback.kt | 16 +- .../cases/wrappedVariableInExtensionFun.kt | 4 +- .../dangerous/cases/2dangerousInExpression.kt | 40 ++-- .../dangerous/cases/dangerousInline.kt | 4 +- .../cases/dangerousInsideDangerous.kt | 29 +-- .../dangerous/cases/evaluationOrder.kt | 20 +- .../dangerous/cases/ifAsFunArgument.kt | 17 +- .../dangerous/cases/ifAsPlusArgument.kt | 14 +- .../dangerous/cases/whenAsMinusArgument.kt | 24 +-- .../cases/constructorCallWithDefArg1.kt | 2 +- .../cases/constructorCallWithDefArg2.kt | 46 ++--- .../defaultArguments/cases/enumWithDefArg.kt | 13 +- .../cases/enumWithOneDefArg.kt | 11 +- .../cases/enumWithTwoDefArgs.kt | 19 +- .../cases/extensionFunWithDefArgs.kt | 14 +- .../cases/funInAbstractClassWithDefArg.kt | 8 +- .../cases/overloadFunWithDefArg.kt | 10 +- .../cases/overrideValWithDefaultValue.kt | 2 +- .../cases/virtualCallWithDefArg.kt | 16 +- .../cases/delegateByTopLevelFun.kt | 15 +- .../cases/delegateByTopLevelProperty.kt | 15 +- .../cases/delegateForExtProperty.kt | 5 +- .../cases/delegateWithPropertyAccess.kt | 14 +- .../cases/getAsExtensionFun.kt | 3 +- .../cases/propertyMetadata.kt | 2 +- .../cases/setAsExtensionFun.kt | 15 +- .../delegateProperty/cases/simple.kt | 2 +- .../delegateProperty/cases/topLevelVal.kt | 3 +- .../delegateProperty/cases/topLevelVar.kt | 13 +- .../delegateProperty/cases/withGenerics.kt | 2 +- .../enum/cases/enumWithInheritance.kt | 3 +- .../testFiles/enum/cases/standardMethods.kt | 7 +- .../examples/cases/closureWithParameter.kt | 6 +- .../examples/cases/diamondInheritance.kt | 14 +- .../cases/doubleEnclosedLocalVariable.kt | 4 +- .../examples/cases/enclosingLocalVariable.kt | 4 +- .../examples/cases/extensionClosure.kt | 2 +- .../testFiles/examples/cases/funDelegation.kt | 15 +- .../examples/cases/incrementProperty.kt | 16 +- .../examples/cases/inheritedMethod.kt | 14 +- .../examples/cases/initializerBlock.kt | 14 +- .../testFiles/examples/cases/kt242.kt | 26 ++- .../cases/newInstanceDefaultConstructor.kt | 12 +- .../examples/cases/overloadBinaryOperator.kt | 2 +- .../examples/cases/overloadUnaryOperator.kt | 2 +- .../examples/cases/propertyDelegation.kt | 29 +-- .../examples/cases/rightHandOverride.kt | 9 +- .../examples/cases/simplestClosure.kt | 6 +- .../cases/simplestClosureAndBoxing.kt | 6 +- .../sortedTests/unsupported/basicmethod.kt | 6 +- .../sortedTests/unsupported/basicproperty.kt | 4 +- .../sortedTests/unsupported/classObject.kt | 10 +- .../unsupported/classObjectInterface.kt | 9 +- .../unsupported/classObjectMethod.kt | 10 +- .../sortedTests/unsupported/enclosed.kt | 12 +- .../unsupported/forwardTypeParameter.kt | 12 +- .../sortedTests/unsupported/inheritance.kt | 31 +-- .../unsupported/inheritedInnerClass.kt | 16 +- .../unsupported/initializerBlockDImpl.kt | 20 +- .../sortedTests/unsupported/innerClass.kt | 26 +-- .../unsupported/propertyInInitializer.kt | 18 +- .../sortedTests/unsupported/traitproperty.kt | 10 +- .../usesJava/exceptionConstructor.kt | 6 +- .../cast/cases/castToNotNullType.kt | 6 +- .../cast/cases/castToNullableType.kt | 2 +- .../equals/cases/customEqualsMethod.kt | 4 +- .../equals/cases/customEqualsMethodOnAny.kt | 4 +- .../equals/cases/equalsNullOrUndefined.kt | 10 +- .../equals/cases/explicitEqualsMethod.kt | 2 +- .../explicitEqualsMethodForPrimitives.kt | 34 ++-- .../expression/equals/cases/kt2370.kt | 1 + .../expression/equals/cases/stringsEqual.kt | 2 +- .../for/cases/forIteratesOverArray.kt | 7 +- .../expression/for/cases/forOnEmptyArray.kt | 2 +- .../expression/function/cases/KT-921.kt | 43 ++-- .../expression/function/cases/adderClosure.kt | 2 +- .../function/cases/closureWithParameter.kt | 6 +- .../cases/closureWithParameterAndBoxing.kt | 6 +- .../function/cases/defaultParameters.kt | 9 +- .../function/cases/enclosingThis.kt | 4 +- .../function/cases/expressionAsFunction.kt | 64 +++--- .../function/cases/functionInsideFunction.kt | 6 +- .../function/cases/functionLiteral.kt | 10 +- .../cases/functionLiteralAsLastParameter.kt | 2 +- .../cases/functionLiteralAsParameter.kt | 6 +- .../cases/functionUsedBeforeDeclaration.kt | 7 +- .../cases/functionWithTwoParametersCall.kt | 4 +- .../function/cases/implicitItParameter.kt | 10 +- .../expression/function/cases/mangling.kt | 163 +++++++++------ .../function/cases/manglingAnyMethods.kt | 6 +- .../function/cases/manglingStability.kt | 4 +- .../function/cases/namedArguments.kt | 8 +- .../expression/function/cases/vararg.kt | 66 +++--- .../invoke/cases/explicitInvokeLambda.kt | 4 +- .../expression/invoke/cases/invokeMethod.kt | 2 +- .../expression/misc/cases/KT-1052-2.kt | 24 +-- .../expression/misc/cases/KT-1052.kt | 24 +-- .../expression/misc/cases/KT-1361-2.kt | 6 +- .../expression/misc/cases/KT-1865.kt | 4 +- .../expression/misc/cases/KT-2314.kt | 8 +- .../expression/misc/cases/KT-740-3.kt | 18 +- .../testFiles/expression/misc/cases/KT-740.kt | 20 +- .../testFiles/expression/misc/cases/KT-817.kt | 2 +- .../testFiles/expression/misc/cases/elvis.kt | 26 +-- .../expression/misc/cases/exclExcl.kt | 6 +- .../cases/exclExclResultIsComputedOnce.kt | 12 +- .../expression/misc/cases/exclExclThrows.kt | 6 +- ...ionLiteralCalledInsideExtensionFunction.kt | 20 +- .../extensionLiteralCreatedAtPackageLevel.kt | 14 +- .../expression/misc/cases/funInConstructor.kt | 7 +- .../misc/cases/funInConstructorBlock.kt | 4 +- .../misc/cases/functionExpression.kt | 36 ++-- .../misc/cases/inheritFromJetIterator.kt | 4 +- .../expression/misc/cases/intRange.kt | 23 ++- .../expression/misc/cases/lazyProperty.kt | 14 +- .../expression/misc/cases/localProperty.kt | 11 +- .../misc/cases/localVarAsFunction.kt | 12 +- .../misc/cases/mainFunInNestedPackage.kt | 4 +- .../misc/cases/packageLevelVarInPackage.kt | 2 +- .../misc/cases/packageLevelVarInRoot.kt | 2 +- .../misc/cases/packagePropertyCalledAsFun.kt | 2 +- ...ExplicitlyDefinedAccessorsWithoutBodies.kt | 12 +- .../cases/propertyAsFunCalledOnConstructor.kt | 6 +- .../safecallComputesExpressionOnlyOnce.kt | 4 +- .../stringInterpolationEvaluationOrder.kt | 12 +- .../expression/string/cases/intInTemplate.kt | 2 +- .../expression/string/cases/kt2227.kt | 4 +- .../expression/string/cases/kt2227_2.kt | 8 +- .../cases/multipleExpressionsInTemplate.kt | 2 +- .../string/cases/numbersInTemplate.kt | 4 +- .../cases/objectToStringCallInTemplate.kt | 4 +- .../string/cases/stringAssignment.kt | 2 +- .../expression/string/cases/stringConstant.kt | 2 +- .../string/cases/stringInTemplate.kt | 2 +- .../expression/string/cases/stringSplit.kt | 26 +-- .../cases/objectWithToString.kt | 6 +- .../stringTemplates/cases/stringValues.kt | 2 +- .../expression/toString/cases/toString.kt | 2 +- .../cases/extensionForSuperclass.kt | 4 +- ...sionFunctionCalledFromExtensionFunction.kt | 2 +- .../cases/extensionFunctionOnExpression.kt | 4 +- .../cases/extensionInsideFunctionLiteral.kt | 4 +- .../cases/extensionLiteralPassedToFunction.kt | 2 +- ...nOnClassWithExplicitAndImplicitReceiver.kt | 16 +- .../cases/extensionUsedInsideClass.kt | 4 +- .../cases/extensionWithImplicitReceiver.kt | 4 +- .../extensionFunction/cases/generic.kt | 22 +- .../cases/implicitReceiverInExtension.kt | 6 +- .../extensionFunction/cases/intExtension.kt | 2 +- .../cases/superClassMemberInExtension.kt | 4 +- .../cases/virtualExtension.kt | 4 +- .../cases/virtualExtensionOverride.kt | 2 +- .../extensionProperty/cases/absExtension.kt | 4 +- .../cases/propertyWithGetterAndSetter.kt | 8 +- .../cases/simplePropertyWithGetter.kt | 11 +- .../inheritance/cases/abstractVarOverride.kt | 8 +- .../cases/complexInitializationOrder.kt | 2 +- .../inheritance/cases/crazyInheritance.kt | 20 +- .../inheritance/cases/definitionOrder.kt | 2 +- .../inheritance/cases/fromFakeClasses.kt | 7 +- .../inheritance/cases/initializationOrder.kt | 2 +- .../cases/initializersOfBasicClassExecute.kt | 2 +- .../testFiles/inheritance/cases/kt3499.kt | 2 +- .../inheritance/cases/methodOverride.kt | 2 +- .../inheritance/cases/valOverride.kt | 4 +- .../cases/valuePassedToAncestorConstructor.kt | 2 +- .../testFiles/inline/cases/extension.kt | 2 +- .../inline/cases/extensionWithParameter.kt | 4 +- .../inline/cases/functionWithBlockBody.kt | 4 +- .../inline/cases/functionWithOneParameter.kt | 10 +- .../inline/cases/functionWithTwoParameters.kt | 18 +- .../testFiles/inline/cases/method.kt | 10 +- .../methodWithIndirectlyReferencedThis.kt | 14 +- .../inline/cases/methodWithReferenceToThis.kt | 12 +- .../testFiles/java/arrayList/cases/access.kt | 14 +- .../java/arrayList/cases/arrayAccess.kt | 2 +- .../arrayList/cases/constructWithCapacity.kt | 4 +- .../cases/constructWithSideEffectParam.kt | 8 +- .../java/arrayList/cases/emptyList.kt | 2 +- .../java/arrayList/cases/indexOOB.kt | 2 +- .../testFiles/java/arrayList/cases/indexOf.kt | 20 +- .../testFiles/java/arrayList/cases/isEmpty.kt | 2 +- .../testFiles/java/arrayList/cases/iterate.kt | 2 +- .../testFiles/java/arrayList/cases/misc.kt | 2 +- .../testFiles/java/arrayList/cases/remove.kt | 2 +- .../java/arrayList/cases/removeAll.kt | 6 +- .../cases/removeWithIndexOutOfBounds.kt | 4 +- .../java/arrayList/cases/retainAll.kt | 8 +- .../testFiles/jsTester/jsTester.js | 4 +- .../testFiles/jsTester/jsTester.kt | 4 +- .../cases/createClassFromOtherPackage/b.kt | 2 +- .../b.kt | 2 +- .../b.kt | 1 + .../cases/multiValForArray.kt | 9 +- .../multideclaration/cases/multiValForMap.kt | 11 +- .../cases/multiValForRange.kt | 11 +- .../multideclaration/cases/multiValInFor.kt | 6 +- .../cases/multiValInIntFor.kt | 4 +- .../cases/multiValInIntRangeFor.kt | 4 +- .../nameClashes/cases/methodOverload.kt | 10 +- .../nameClashes/cases/overloadExtension.kt | 6 +- .../testFiles/native/cases/class.kt | 8 +- .../testFiles/native/cases/kt1519.kt | 10 +- .../testFiles/native/cases/kt2209.kt | 10 +- .../testFiles/native/cases/library.kt | 6 +- .../testFiles/native/cases/simple.kt | 2 +- .../testFiles/native/cases/simpleUndefined.kt | 4 +- .../testFiles/native/cases/undefined.kt | 12 +- .../testFiles/native/cases/vararg.kt | 112 +++++------ .../testFiles/native/native/class.js | 4 +- .../native/inheritanceFromNativeClass.js | 10 +- .../testFiles/native/native/kt1519.js | 2 +- .../testFiles/native/native/kt2209.js | 2 +- .../testFiles/native/native/library.js | 22 +- .../testFiles/native/native/vararg.js | 2 +- .../testFiles/number/cases/kt2342.kt | 6 +- .../number/cases/numberConversions.kt | 2 +- .../object/cases/objectDeclarationWithVars.kt | 2 +- .../testFiles/object/cases/objectInObject.kt | 20 +- .../cases/objectInheritingFromATrait.kt | 6 +- .../object/cases/objectInheritingFromClass.kt | 2 +- .../object/cases/objectWithMethods.kt | 24 +-- .../cases/binaryDivOverload.kt | 2 +- .../operatorOverloading/cases/compareTo.kt | 12 +- ...adOnPropertyCallGetterAndSetterOnlyOnce.kt | 42 ++-- ...oadUnaryOperationsViaExtensionFunctions.kt | 3 +- .../cases/overloadedCallOnProperty.kt | 6 +- .../cases/plusAndMinusAsAnExpression.kt | 2 +- .../cases/plusAssignNoReassign.kt | 4 +- .../operatorOverloading/cases/plusOverload.kt | 10 +- .../operatorOverloading/cases/postfixInc.kt | 6 +- .../cases/postfixOnProperty.kt | 10 +- .../cases/prefixDecOverload.kt | 12 +- .../cases/prefixIncReturnsCorrectValue.kt | 20 +- .../cases/unaryOnIntProperty.kt | 18 +- .../cases/unaryOnIntPropertyAsStatement.kt | 18 +- .../usingModInCaseModAssignNotAvailable.kt | 4 +- .../classCreatedInDeeplyNestedPackage.kt | 2 +- .../testFiles/patternMatching/cases/kt1665.kt | 14 +- .../cases/matchNullableType.kt | 12 +- .../patternMatching/cases/multipleCases.kt | 30 +-- .../patternMatching/cases/whenAsExpression.kt | 2 +- .../cases/whenAsExpressionWithThrow.kt | 2 +- .../cases/whenEvaluatesArgumentOnlyOnce.kt | 18 +- .../cases/whenExecutesOnlyOnce.kt | 16 +- .../patternMatching/cases/whenNotType.kt | 10 +- .../patternMatching/cases/whenType.kt | 10 +- .../patternMatching/cases/whenValue.kt | 22 +- .../patternMatching/cases/whenValueOrType.kt | 32 +-- .../patternMatching/cases/whenWithIf.kt | 33 +-- .../cases/whenWithoutExpression.kt | 4 +- .../cases/accessToInstanceProperty.kt | 4 +- .../cases/classUsesPackageProperties.kt | 10 +- .../propertyAccess/cases/customGetter.kt | 12 +- .../propertyAccess/cases/customSetter.kt | 10 +- .../propertyAccess/cases/enumerable.kt | 18 +- .../cases/extensionLiteralSafeCall.kt | 20 +- .../cases/initInstanceProperties.kt | 8 +- ...verloadedOverriddenFunctionPropertyName.kt | 2 +- .../cases/packageCustomAccessors.kt | 14 +- .../cases/packagePropertySet.kt | 2 +- .../testFiles/propertyAccess/cases/setter.kt | 4 +- .../cases/twoClassesWithProperties.kt | 6 +- .../cases/checkSupertypeOrder.kt | 4 +- .../cases/overrideNotDirectlySuper.kt | 2 +- .../cases/overrideValFromTraits.kt | 2 +- .../testFiles/range/cases/explicitRange.kt | 2 +- .../testFiles/range/cases/intInRange.kt | 3 +- .../testFiles/range/cases/intUpTo.kt | 6 +- .../range/cases/iteratingOverRanges.kt | 2 +- .../testFiles/range/cases/rangeSugarSyntax.kt | 2 +- .../range/cases/rangeToDoesNotIterate.kt | 4 +- .../testFiles/rtti/cases/rttiForClass.kt | 4 +- .../testFiles/rtti/cases/rttiForTrait.kt | 5 +- .../testFiles/rtti/cases/rttiForTrait2.kt | 19 +- .../testFiles/safeCall/cases/safeAccess.kt | 6 +- .../testFiles/safeCall/cases/safeCall.kt | 8 +- .../cases/safeCallReturnsNullIfFails.kt | 6 +- .../cases/safeExtensionFunctionCall.kt | 44 ++-- .../testFiles/simple/cases/assign.kt | 8 +- .../testFiles/simple/cases/breakDoWhile.kt | 11 +- .../testFiles/simple/cases/breakWhile.kt | 16 +- .../testFiles/simple/cases/comparison.kt | 2 +- ...complexExpressionAsConstructorParameter.kt | 6 +- .../simple/cases/constructorWithParameter.kt | 4 +- .../constructorWithPropertiesAsParameters.kt | 4 +- .../testFiles/simple/cases/continueDoWhile.kt | 19 +- .../testFiles/simple/cases/continueWhile.kt | 18 +- .../testFiles/simple/cases/doWhile.kt | 5 +- .../testFiles/simple/cases/doWhile2.kt | 5 +- .../testFiles/simple/cases/elseif.kt | 11 +- js/js.translator/testFiles/simple/cases/if.kt | 5 +- .../simple/cases/ifElseAsExpression.kt | 3 +- .../simple/cases/methodDeclarationAndCall.kt | 4 +- .../simple/cases/minusAssignOnProperty.kt | 6 +- .../testFiles/simple/cases/notBoolean.kt | 3 +- .../testFiles/simple/cases/plusAssign.kt | 2 +- .../cases/positiveAndNegativeNumbers.kt | 3 +- .../simple/cases/postfixIntOperations.kt | 2 +- .../simple/cases/prefixIntOperations.kt | 2 +- .../propertiesAsParametersInitialized.kt | 4 +- .../testFiles/simple/cases/propertyAccess.kt | 2 +- .../simple/cases/simpleInitializer.kt | 11 +- .../testFiles/simple/cases/while.kt | 2 +- .../testFiles/simple/cases/while2.kt | 4 +- .../sourcemap/cases/methodCallInMethod.kt | 3 +- .../testFiles/standardClasses/cases/array.kt | 2 +- .../standardClasses/cases/arrayAccess.kt | 2 +- .../cases/arrayFactoryMethods.kt | 34 ++-- .../cases/arrayFunctionConstructor.kt | 2 +- .../standardClasses/cases/arraySize.kt | 3 +- .../cases/arrayThrowsExceptionOnOOBaccess.kt | 3 +- .../standardClasses/cases/arraysIterator.kt | 10 +- .../testFiles/stdlib/cases/Filter.kt | 40 ++-- .../superCall/cases/classSuperCall.kt | 2 +- .../superCall/cases/nativeSuperClass.kt | 2 +- js/js.translator/testFiles/test.html | 2 +- .../checkImplementationCharacteristics.kt | 32 +-- .../cases/classDerivesFromClassAndTrait.kt | 6 +- .../cases/classDerivesFromTraitAndClass.kt | 6 +- .../testFiles/trait/cases/definitionOrder.kt | 2 +- .../testFiles/trait/cases/example.kt | 8 +- .../testFiles/trait/cases/funDelegation.kt | 15 +- .../trait/cases/traitAddsFunctionsToClass.kt | 8 +- .../trait/cases/traitExtendsTrait.kt | 8 +- .../trait/cases/traitExtendsTwoTraits.kt | 4 +- .../webDemoCanvasExamples/cases/Creatures.kt | 35 ++-- .../cases/Fancy lines.kt | 6 +- .../cases/Hello, Kotlin.kt | 20 +- .../cases/Traffic light.kt | 164 +++++++-------- .../webDemoExamples1/cases/forLoop.kt | 14 +- .../webDemoExamples1/cases/ifAsExpression.kt | 6 +- .../webDemoExamples1/cases/isCheck.kt | 4 +- .../cases/multiLanguageHello.kt | 16 +- .../webDemoExamples1/cases/nullChecks.kt | 12 +- .../cases/objectOrientedHello.kt | 14 +- .../webDemoExamples1/cases/patternMatching.kt | 16 +- .../webDemoExamples1/cases/printArg.kt | 2 +- .../webDemoExamples1/cases/ranges.kt | 6 +- .../webDemoExamples1/cases/whileLoop.kt | 8 +- .../webDemoExamples2/cases/bottles.kt | 69 +++---- .../testFiles/webDemoExamples2/cases/life.kt | 167 ++++++++-------- .../testFiles/webDemoExamples2/cases/maze.kt | 189 +++++++++--------- 354 files changed, 2144 insertions(+), 1986 deletions(-) diff --git a/js/js.translator/testFiles/classObject/cases/inTrait.kt b/js/js.translator/testFiles/classObject/cases/inTrait.kt index d06eee93091..770e4c6554e 100644 --- a/js/js.translator/testFiles/classObject/cases/inTrait.kt +++ b/js/js.translator/testFiles/classObject/cases/inTrait.kt @@ -1,8 +1,7 @@ package foo trait A { - class object - { + class object { val OK: String = "OK" } } diff --git a/js/js.translator/testFiles/classObject/cases/setVar.kt b/js/js.translator/testFiles/classObject/cases/setVar.kt index e4fc6c91501..34f4ea6c794 100644 --- a/js/js.translator/testFiles/classObject/cases/setVar.kt +++ b/js/js.translator/testFiles/classObject/cases/setVar.kt @@ -8,8 +8,7 @@ class A { } - -fun box() : String { +fun box(): String { A.a = 2 if (A.a != 2) return "A.a != 2, it: ${A.a}" diff --git a/js/js.translator/testFiles/classObject/cases/simple.kt b/js/js.translator/testFiles/classObject/cases/simple.kt index e9bef55538c..708a192bb40 100644 --- a/js/js.translator/testFiles/classObject/cases/simple.kt +++ b/js/js.translator/testFiles/classObject/cases/simple.kt @@ -9,8 +9,7 @@ class A { } - -fun box() : String { +fun box(): String { if (A.a != 2) return "A.a != 2, it: ${A.a}" if (A.b != 5) return "A.b != 5, it: ${A.b}" diff --git a/js/js.translator/testFiles/classObject/cases/withExtension.kt b/js/js.translator/testFiles/classObject/cases/withExtension.kt index 8a0553a8cdd..b18afc7ccc0 100644 --- a/js/js.translator/testFiles/classObject/cases/withExtension.kt +++ b/js/js.translator/testFiles/classObject/cases/withExtension.kt @@ -15,7 +15,7 @@ class B { } } -fun box() : String { +fun box(): String { if (A.a != 3) return "A.a != 3, it: ${A.a}" if (A.foo() != 5) return "A.foo() != 5, it: ${A.foo()}" diff --git a/js/js.translator/testFiles/closure/cases/closureInNestedFunctions.kt b/js/js.translator/testFiles/closure/cases/closureInNestedFunctions.kt index c2e3e1b99d5..18f50dee099 100644 --- a/js/js.translator/testFiles/closure/cases/closureInNestedFunctions.kt +++ b/js/js.translator/testFiles/closure/cases/closureInNestedFunctions.kt @@ -1,6 +1,6 @@ package foo -fun run(f: ()->T) = f() +fun run(f: () -> T) = f() fun funfun(): Boolean { val result = true diff --git a/js/js.translator/testFiles/closure/cases/closureInNestedFunctionsInMethod.kt b/js/js.translator/testFiles/closure/cases/closureInNestedFunctionsInMethod.kt index cd88db811b5..b5849811728 100644 --- a/js/js.translator/testFiles/closure/cases/closureInNestedFunctionsInMethod.kt +++ b/js/js.translator/testFiles/closure/cases/closureInNestedFunctionsInMethod.kt @@ -1,6 +1,6 @@ package foo -fun run(f:()->T) = f() +fun run(f: () -> T) = f() class Fail(val message: String) : RuntimeException(message) { val isFail = true // workaround for exception handling diff --git a/js/js.translator/testFiles/closure/cases/closureInNestedFunctionsWhichMixedWithObject.kt b/js/js.translator/testFiles/closure/cases/closureInNestedFunctionsWhichMixedWithObject.kt index ca79c958bef..96747e834bc 100644 --- a/js/js.translator/testFiles/closure/cases/closureInNestedFunctionsWhichMixedWithObject.kt +++ b/js/js.translator/testFiles/closure/cases/closureInNestedFunctionsWhichMixedWithObject.kt @@ -1,15 +1,15 @@ package foo -fun run(f: ()->T) = f() +fun run(f: () -> T) = f() fun box(): Boolean { val t = run { - object { - fun boo(param: String): String { - return run { param } - } - } + object { + fun boo(param: String): String { + return run { param } } + } + } return t.boo("OK") == "OK" } diff --git a/js/js.translator/testFiles/closure/cases/closureLocalLiteralFunction.kt b/js/js.translator/testFiles/closure/cases/closureLocalLiteralFunction.kt index e91273e68ec..4baf2959a5d 100644 --- a/js/js.translator/testFiles/closure/cases/closureLocalLiteralFunction.kt +++ b/js/js.translator/testFiles/closure/cases/closureLocalLiteralFunction.kt @@ -1,9 +1,9 @@ package foo -val k = {"K"} +val k = { "K" } fun test(): String { - val o = {"O"} + val o = { "O" } val funLit = { o() + k() } return funLit() diff --git a/js/js.translator/testFiles/closure/cases/closureReferencingMember.kt b/js/js.translator/testFiles/closure/cases/closureReferencingMember.kt index 09d88979ea4..2580f667fbf 100644 --- a/js/js.translator/testFiles/closure/cases/closureReferencingMember.kt +++ b/js/js.translator/testFiles/closure/cases/closureReferencingMember.kt @@ -1,23 +1,23 @@ package foo class A() { - var i = 0 + var i = 0 - fun f() { - for (j in 0..2) { - foo { - i += j - } + fun f() { + for (j in 0..2) { + foo { + i += j + } + } } - } } -fun foo(f : ()->Unit) { - f() +fun foo(f: () -> Unit) { + f() } -fun box() : Boolean { - val a = A() - a.f() +fun box(): Boolean { + val a = A() + a.f() return a.i == 3 } diff --git a/js/js.translator/testFiles/closure/cases/closureThisInConstructor.kt b/js/js.translator/testFiles/closure/cases/closureThisInConstructor.kt index 3c286be5469..07fe5d09c66 100644 --- a/js/js.translator/testFiles/closure/cases/closureThisInConstructor.kt +++ b/js/js.translator/testFiles/closure/cases/closureThisInConstructor.kt @@ -11,7 +11,7 @@ object foo { done = 3 } - val extLambda: Int.()->Unit = { + val extLambda: Int.() -> Unit = { result = "foo.extLambda OK" done = this } @@ -25,7 +25,7 @@ class Foo { done = -7 } - val extLambda: Int.()->Unit = { + val extLambda: Int.() -> Unit = { result = "Foo::extLambda OK" done = this } diff --git a/js/js.translator/testFiles/closure/cases/iteratingCallbacks.kt b/js/js.translator/testFiles/closure/cases/iteratingCallbacks.kt index a01dd483b94..44048ccaad6 100644 --- a/js/js.translator/testFiles/closure/cases/iteratingCallbacks.kt +++ b/js/js.translator/testFiles/closure/cases/iteratingCallbacks.kt @@ -2,20 +2,20 @@ package foo import java.util.* -fun box() : Boolean { +fun box(): Boolean { val oneTwo = Array(2) { it + 1 } - val a = ArrayList<()->Int>() + val a = ArrayList<() -> Int>() for (i in oneTwo) { for (j in 1..2) { a.add({ - var res = 0 - for (t in 0..2) { - res += i * j - } - res - }) + var res = 0 + for (t in 0..2) { + res += i * j + } + res + }) } } var sum = 0 diff --git a/js/js.translator/testFiles/closure/cases/localParameterInCallback.kt b/js/js.translator/testFiles/closure/cases/localParameterInCallback.kt index 4e4e9f16118..da52d46b1d0 100644 --- a/js/js.translator/testFiles/closure/cases/localParameterInCallback.kt +++ b/js/js.translator/testFiles/closure/cases/localParameterInCallback.kt @@ -2,21 +2,21 @@ package foo import java.util.* -fun box() : Boolean { +fun box(): Boolean { val oneTwo = Array(2) { it + 1 } - val a = ArrayList<()->Int>() + val a = ArrayList<() -> Int>() for (i in oneTwo) { for (l in 1..2) { val j = l a.add({ - var res = 0 - for (t in 0..2) { - res += i * j - } - res - }) + var res = 0 + for (t in 0..2) { + res += i * j + } + res + }) } } var sum = 0 diff --git a/js/js.translator/testFiles/closure/cases/wrappedVariableInExtensionFun.kt b/js/js.translator/testFiles/closure/cases/wrappedVariableInExtensionFun.kt index a784daf554d..2a65409869c 100644 --- a/js/js.translator/testFiles/closure/cases/wrappedVariableInExtensionFun.kt +++ b/js/js.translator/testFiles/closure/cases/wrappedVariableInExtensionFun.kt @@ -1,10 +1,10 @@ package foo -fun Any.foo(n: Int): ()->Boolean { +fun Any.foo(n: Int): () -> Boolean { var count = n return { --count >= 0 } } fun box(): Boolean { - return 1.foo(3)() && !1.foo(0)() + return 1.foo(3)() && !1.foo(0)() } diff --git a/js/js.translator/testFiles/dangerous/cases/2dangerousInExpression.kt b/js/js.translator/testFiles/dangerous/cases/2dangerousInExpression.kt index cf1b874addf..33124120660 100644 --- a/js/js.translator/testFiles/dangerous/cases/2dangerousInExpression.kt +++ b/js/js.translator/testFiles/dangerous/cases/2dangerousInExpression.kt @@ -1,26 +1,26 @@ package foo -fun box() : Boolean { - if (f(0) != -3) { - return false - } - if (f(102) != 201) { - return false; - } - if (f(103) != 100) { - return false - } - if (f(-100) != -100) { - return false - } - if (f(-99) != -201) { - return false - } +fun box(): Boolean { + if (f(0) != -3) { + return false + } + if (f(102) != 201) { + return false; + } + if (f(103) != 100) { + return false + } + if (f(-100) != -100) { + return false + } + if (f(-99) != -201) { + return false + } - return true + return true } -fun f(i : Int) : Int { - var j = i - return --j + (if (j < -100) return -100 else --j) + (if (j > 100) return 100 else 0) +fun f(i: Int): Int { + var j = i + return --j + (if (j < -100) return -100 else --j) + (if (j > 100) return 100 else 0) } diff --git a/js/js.translator/testFiles/dangerous/cases/dangerousInline.kt b/js/js.translator/testFiles/dangerous/cases/dangerousInline.kt index d031a85ec4e..a1ee985fe51 100644 --- a/js/js.translator/testFiles/dangerous/cases/dangerousInline.kt +++ b/js/js.translator/testFiles/dangerous/cases/dangerousInline.kt @@ -4,6 +4,6 @@ var i = 0 inline fun f() = i * 2 -fun box() : Boolean { - return (++i + f()) == 3 +fun box(): Boolean { + return (++i + f()) == 3 } \ No newline at end of file diff --git a/js/js.translator/testFiles/dangerous/cases/dangerousInsideDangerous.kt b/js/js.translator/testFiles/dangerous/cases/dangerousInsideDangerous.kt index aaa99e3858f..238710633d1 100644 --- a/js/js.translator/testFiles/dangerous/cases/dangerousInsideDangerous.kt +++ b/js/js.translator/testFiles/dangerous/cases/dangerousInsideDangerous.kt @@ -1,19 +1,22 @@ package foo -fun box() : Boolean { - if (f(0) != 201) { - return false - } - if (f(1) != 104) { +fun box(): Boolean { + if (f(0) != 201) { return false - } - if (f(-2) != -100) { - return false - } - return true + } + if (f(1) != 104) { + return false + } + if (f(-2) != -100) { + return false + } + return true } -fun f(i : Int) : Int { - var j = i - return ++j + if (j != 1) {(if (j > 0) 100 else return -100) + 2} else 200 +fun f(i: Int): Int { + var j = i + return ++j + if (j != 1) { + (if (j > 0) 100 else return -100) + 2 + } + else 200 } \ No newline at end of file diff --git a/js/js.translator/testFiles/dangerous/cases/evaluationOrder.kt b/js/js.translator/testFiles/dangerous/cases/evaluationOrder.kt index 4e0df7a6fe6..4ec4a9cfae4 100644 --- a/js/js.translator/testFiles/dangerous/cases/evaluationOrder.kt +++ b/js/js.translator/testFiles/dangerous/cases/evaluationOrder.kt @@ -2,16 +2,16 @@ package foo var d = 0 -fun f() : Int { - d = if (d < 0) -100 else 100 - return d +fun f(): Int { + d = if (d < 0) -100 else 100 + return d } -fun box() : Boolean { - d = d-- + f() + when(d) { - -100 -> return true - 1 -> 1 - else -> return false - } - return false +fun box(): Boolean { + d = d-- + f() + when(d) { + -100 -> return true + 1 -> 1 + else -> return false + } + return false } diff --git a/js/js.translator/testFiles/dangerous/cases/ifAsFunArgument.kt b/js/js.translator/testFiles/dangerous/cases/ifAsFunArgument.kt index f400eea6474..5ecde62ebda 100644 --- a/js/js.translator/testFiles/dangerous/cases/ifAsFunArgument.kt +++ b/js/js.translator/testFiles/dangerous/cases/ifAsFunArgument.kt @@ -1,14 +1,13 @@ package foo -fun box() : Boolean { - var i = 0 - val c = sum(++i, if (i == 0) return false else i + 2) - if (c != 4) { - return false - } - return true +fun box(): Boolean { + var i = 0 + val c = sum(++i, if (i == 0) return false else i + 2) + if (c != 4) { + return false + } + return true } - -fun sum(a1 : Int, a2 : Int) = a1 + a2 +fun sum(a1: Int, a2: Int) = a1 + a2 diff --git a/js/js.translator/testFiles/dangerous/cases/ifAsPlusArgument.kt b/js/js.translator/testFiles/dangerous/cases/ifAsPlusArgument.kt index fe76cf8fc58..8abdad883e7 100644 --- a/js/js.translator/testFiles/dangerous/cases/ifAsPlusArgument.kt +++ b/js/js.translator/testFiles/dangerous/cases/ifAsPlusArgument.kt @@ -1,10 +1,10 @@ package foo -fun box() : Boolean { - var i = 0 - var t = ++i + if (i == 0) 0 else 2 - if (t != 3) { - return false - } - return true +fun box(): Boolean { + var i = 0 + var t = ++i + if (i == 0) 0 else 2 + if (t != 3) { + return false + } + return true } diff --git a/js/js.translator/testFiles/dangerous/cases/whenAsMinusArgument.kt b/js/js.translator/testFiles/dangerous/cases/whenAsMinusArgument.kt index 1dda1603dab..38aa7d13f06 100644 --- a/js/js.translator/testFiles/dangerous/cases/whenAsMinusArgument.kt +++ b/js/js.translator/testFiles/dangerous/cases/whenAsMinusArgument.kt @@ -1,15 +1,15 @@ package foo -fun box() : Boolean { - var i = 0 - var t = ++i + when(i) { - 3 -> 4 - 1 -> 2 - 0 -> 1 - else -> 100 - } - if (t != 3) { - return false - } - return true +fun box(): Boolean { + var i = 0 + var t = ++i + when(i) { + 3 -> 4 + 1 -> 2 + 0 -> 1 + else -> 100 + } + if (t != 3) { + return false + } + return true } \ No newline at end of file diff --git a/js/js.translator/testFiles/defaultArguments/cases/constructorCallWithDefArg1.kt b/js/js.translator/testFiles/defaultArguments/cases/constructorCallWithDefArg1.kt index 9a8bd8da6e8..fc0f9694624 100644 --- a/js/js.translator/testFiles/defaultArguments/cases/constructorCallWithDefArg1.kt +++ b/js/js.translator/testFiles/defaultArguments/cases/constructorCallWithDefArg1.kt @@ -9,7 +9,7 @@ fun box(): String { val a1 = A(1) if (a0.a != 0) return "a0.a != 0, it: ${a0.a}" if (a1.a != 1) return "a1.a != 1, it: ${a1.a}" - + val b1 = B() if (b1.a != 0) return "b1.a != 0, it: ${b1.a}" if (b1.b != "a") return "b1.b != 'a', it: ${b1.b}" diff --git a/js/js.translator/testFiles/defaultArguments/cases/constructorCallWithDefArg2.kt b/js/js.translator/testFiles/defaultArguments/cases/constructorCallWithDefArg2.kt index 4976cc1bbe8..8e3c757fc0f 100644 --- a/js/js.translator/testFiles/defaultArguments/cases/constructorCallWithDefArg2.kt +++ b/js/js.translator/testFiles/defaultArguments/cases/constructorCallWithDefArg2.kt @@ -1,36 +1,36 @@ package foo class T4( - val c1: Boolean, - val c2: Boolean, - val c3: Boolean, - val c4: String + val c1: Boolean, + val c2: Boolean, + val c3: Boolean, + val c4: String ) { - override fun equals(other: Any?): Boolean { - if (other !is T4) return false; - return c1 == other.c1 && - c2 == other.c2 && - c3 == other.c3 && - c4 == other.c4 - } + override fun equals(o: Any?): Boolean { + if (o !is T4) return false; + return c1 == o.c1 && + c2 == o.c2 && + c3 == o.c3 && + c4 == o.c4 + } } fun reformat( - str : String, - normalizeCase : Boolean = true, - uppercaseFirstLetter : Boolean = true, - divideByCamelHumps : Boolean = true, - wordSeparator : String = " " + str: String, + normalizeCase: Boolean = true, + uppercaseFirstLetter: Boolean = true, + divideByCamelHumps: Boolean = true, + wordSeparator: String = " " ) = - T4(normalizeCase, uppercaseFirstLetter, divideByCamelHumps, wordSeparator) + T4(normalizeCase, uppercaseFirstLetter, divideByCamelHumps, wordSeparator) -fun box() : String { +fun box(): String { val expected = T4(true, true, true, " ") - if(reformat("", true, true, true, " ") != expected) return "fail1" - if(reformat("", true, true, true) != expected) return "fail2" - if(reformat("", true, true) != expected) return "fail3" - if(reformat("", true) != expected) return "fail4" - if(reformat("") != expected) return "fail5" + if (reformat("", true, true, true, " ") != expected) return "fail1" + if (reformat("", true, true, true) != expected) return "fail2" + if (reformat("", true, true) != expected) return "fail3" + if (reformat("", true) != expected) return "fail4" + if (reformat("") != expected) return "fail5" return "OK" } diff --git a/js/js.translator/testFiles/defaultArguments/cases/enumWithDefArg.kt b/js/js.translator/testFiles/defaultArguments/cases/enumWithDefArg.kt index fbe12113cea..5d8294fbe50 100644 --- a/js/js.translator/testFiles/defaultArguments/cases/enumWithDefArg.kt +++ b/js/js.translator/testFiles/defaultArguments/cases/enumWithDefArg.kt @@ -1,12 +1,13 @@ package foo + enum class A(val a: Int = 1) { - FIRST: A() - SECOND: A(2) + FIRST: A() + SECOND: A(2) } fun box(): String { - if (A.FIRST.a == 1 && A.SECOND.a == 2) { - return "OK" - } - return "fail" + if (A.FIRST.a == 1 && A.SECOND.a == 2) { + return "OK" + } + return "fail" } diff --git a/js/js.translator/testFiles/defaultArguments/cases/enumWithOneDefArg.kt b/js/js.translator/testFiles/defaultArguments/cases/enumWithOneDefArg.kt index ffe00ad3cf7..310776dade5 100644 --- a/js/js.translator/testFiles/defaultArguments/cases/enumWithOneDefArg.kt +++ b/js/js.translator/testFiles/defaultArguments/cases/enumWithOneDefArg.kt @@ -1,11 +1,12 @@ package foo + enum class Foo(val a: Int = 1, val b: String) { - B: Foo(2, "b") - C: Foo(b = "b") + B: Foo(2, "b") + C: Foo(b = "b") } fun box(): String { - if (Foo.B.a != 2 || Foo.B.b != "b") return "fail1" - if (Foo.C.a != 1 || Foo.C.b != "b") return "fail2" - return "OK" + if (Foo.B.a != 2 || Foo.B.b != "b") return "fail1" + if (Foo.C.a != 1 || Foo.C.b != "b") return "fail2" + return "OK" } diff --git a/js/js.translator/testFiles/defaultArguments/cases/enumWithTwoDefArgs.kt b/js/js.translator/testFiles/defaultArguments/cases/enumWithTwoDefArgs.kt index d0ed74f60a9..480b215f08b 100644 --- a/js/js.translator/testFiles/defaultArguments/cases/enumWithTwoDefArgs.kt +++ b/js/js.translator/testFiles/defaultArguments/cases/enumWithTwoDefArgs.kt @@ -1,15 +1,16 @@ package foo + enum class Foo(val a: Int = 1, val b: String = "a") { - A: Foo() - B: Foo(2, "b") - C: Foo(b = "b") - D: Foo(a = 2) + A: Foo() + B: Foo(2, "b") + C: Foo(b = "b") + D: Foo(a = 2) } fun box(): String { - if (Foo.A.a != 1 || Foo.A.b != "a") return "fail1" - if (Foo.B.a != 2 || Foo.B.b != "b") return "fail2" - if (Foo.C.a != 1 || Foo.C.b != "b") return "fail3" - if (Foo.D.a != 2 || Foo.D.b != "a") return "fail4" - return "OK" + if (Foo.A.a != 1 || Foo.A.b != "a") return "fail1" + if (Foo.B.a != 2 || Foo.B.b != "b") return "fail2" + if (Foo.C.a != 1 || Foo.C.b != "b") return "fail3" + if (Foo.D.a != 2 || Foo.D.b != "a") return "fail4" + return "OK" } diff --git a/js/js.translator/testFiles/defaultArguments/cases/extensionFunWithDefArgs.kt b/js/js.translator/testFiles/defaultArguments/cases/extensionFunWithDefArgs.kt index a9b08a4d60a..756604ce800 100644 --- a/js/js.translator/testFiles/defaultArguments/cases/extensionFunWithDefArgs.kt +++ b/js/js.translator/testFiles/defaultArguments/cases/extensionFunWithDefArgs.kt @@ -1,12 +1,12 @@ package foo -fun T.toPrefixedString(prefix: String = "", suffix: String="") = prefix + toString() + suffix +fun T.toPrefixedString(prefix: String = "", suffix: String = "") = prefix + toString() + suffix -fun box() : String { - if("mama".toPrefixedString(suffix="321", prefix="papa") != "papamama321") return "fail1" - if("mama".toPrefixedString(prefix="papa") != "papamama") return "fail2" - if("mama".toPrefixedString("papa", "239") != "papamama239") return "fail3" - if("mama".toPrefixedString("papa") != "papamama") return "fail4" - if("mama".toPrefixedString() != "mama") return "fail5" +fun box(): String { + if ("mama".toPrefixedString(suffix = "321", prefix = "papa") != "papamama321") return "fail1" + if ("mama".toPrefixedString(prefix = "papa") != "papamama") return "fail2" + if ("mama".toPrefixedString("papa", "239") != "papamama239") return "fail3" + if ("mama".toPrefixedString("papa") != "papamama") return "fail4" + if ("mama".toPrefixedString() != "mama") return "fail5" return "OK" } diff --git a/js/js.translator/testFiles/defaultArguments/cases/funInAbstractClassWithDefArg.kt b/js/js.translator/testFiles/defaultArguments/cases/funInAbstractClassWithDefArg.kt index 8e9d8258a6a..6376da63a3a 100644 --- a/js/js.translator/testFiles/defaultArguments/cases/funInAbstractClassWithDefArg.kt +++ b/js/js.translator/testFiles/defaultArguments/cases/funInAbstractClassWithDefArg.kt @@ -1,14 +1,14 @@ package foo open abstract class B() { - fun foo(arg: Int = 239 + 1) : Int = arg + fun foo(arg: Int = 239 + 1): Int = arg } class C() : B() { } -fun box() : String { - if(C().foo(10) != 10) return "fail1" - if(C().foo() != 240) return "fail2" +fun box(): String { + if (C().foo(10) != 10) return "fail1" + if (C().foo() != 240) return "fail2" return "OK" } diff --git a/js/js.translator/testFiles/defaultArguments/cases/overloadFunWithDefArg.kt b/js/js.translator/testFiles/defaultArguments/cases/overloadFunWithDefArg.kt index 4cbe1ef4e77..2fddf1025a8 100644 --- a/js/js.translator/testFiles/defaultArguments/cases/overloadFunWithDefArg.kt +++ b/js/js.translator/testFiles/defaultArguments/cases/overloadFunWithDefArg.kt @@ -1,15 +1,15 @@ package foo open abstract class B() { - abstract fun foo2(arg: Int = 239) : Int + abstract fun foo2(arg: Int = 239): Int } class C() : B() { - override fun foo2(arg: Int) : Int = arg + override fun foo2(arg: Int): Int = arg } -fun box() : String { - if(C().foo2() != 239) return "fail1" - if(C().foo2(10) != 10) return "fail2" +fun box(): String { + if (C().foo2() != 239) return "fail1" + if (C().foo2(10) != 10) return "fail2" return "OK" } diff --git a/js/js.translator/testFiles/defaultArguments/cases/overrideValWithDefaultValue.kt b/js/js.translator/testFiles/defaultArguments/cases/overrideValWithDefaultValue.kt index f2a0255d17d..f310471af71 100644 --- a/js/js.translator/testFiles/defaultArguments/cases/overrideValWithDefaultValue.kt +++ b/js/js.translator/testFiles/defaultArguments/cases/overrideValWithDefaultValue.kt @@ -7,7 +7,7 @@ open class A(open val bar: Int = 2) { class B(override val bar: Int = 3) : A() -fun box() : String { +fun box(): String { val b = B() if (b.bar != 3) return "b.bar != 3, it: " + b.bar if (b.barA != 2) return "b.barA != 2, it: " + b.barA diff --git a/js/js.translator/testFiles/defaultArguments/cases/virtualCallWithDefArg.kt b/js/js.translator/testFiles/defaultArguments/cases/virtualCallWithDefArg.kt index 997feb8898d..aa5541b729e 100644 --- a/js/js.translator/testFiles/defaultArguments/cases/virtualCallWithDefArg.kt +++ b/js/js.translator/testFiles/defaultArguments/cases/virtualCallWithDefArg.kt @@ -1,22 +1,22 @@ package foo trait A { - fun bar2(arg: Int = 239) : Int + fun bar2(arg: Int = 239): Int - fun bar(arg: Int = 240) : Int = bar2(arg/2) + fun bar(arg: Int = 240): Int = bar2(arg / 2) } open abstract class B() : A { - override fun bar2(arg: Int) : Int = arg + override fun bar2(arg: Int): Int = arg } class C() : B() { } -fun box() : String { - if(C().bar(10) != 5) return "fail1: ${C().bar(10)}" - if(C().bar() != 120) return "fail2: ${C().bar()}" - if(C().bar2() != 239) return "fail3: ${C().bar2()}" - if(C().bar2(10) != 10) return "fail4: ${C().bar2(10)}" +fun box(): String { + if (C().bar(10) != 5) return "fail1: ${C().bar(10)}" + if (C().bar() != 120) return "fail2: ${C().bar()}" + if (C().bar2() != 239) return "fail3: ${C().bar2()}" + if (C().bar2(10) != 10) return "fail4: ${C().bar2(10)}" return "OK" } diff --git a/js/js.translator/testFiles/delegateProperty/cases/delegateByTopLevelFun.kt b/js/js.translator/testFiles/delegateProperty/cases/delegateByTopLevelFun.kt index 2e6101a8b60..84ab3f7aa28 100644 --- a/js/js.translator/testFiles/delegateProperty/cases/delegateByTopLevelFun.kt +++ b/js/js.translator/testFiles/delegateProperty/cases/delegateByTopLevelFun.kt @@ -1,8 +1,11 @@ package foo + class Delegate { var inner = 1 fun get(t: Any?, p: PropertyMetadata): Int = inner - fun set(t: Any?, p: PropertyMetadata, i: Int) { inner = i } + fun set(t: Any?, p: PropertyMetadata, i: Int) { + inner = i + } } fun foo() = Delegate() @@ -12,9 +15,9 @@ class A { } fun box(): String { - val c = A() - if(c.prop != 1) return "fail get" - c.prop = 2 - if (c.prop != 2) return "fail set" - return "OK" + val c = A() + if (c.prop != 1) return "fail get" + c.prop = 2 + if (c.prop != 2) return "fail set" + return "OK" } diff --git a/js/js.translator/testFiles/delegateProperty/cases/delegateByTopLevelProperty.kt b/js/js.translator/testFiles/delegateProperty/cases/delegateByTopLevelProperty.kt index a6ff8d5293e..32445b6a0db 100644 --- a/js/js.translator/testFiles/delegateProperty/cases/delegateByTopLevelProperty.kt +++ b/js/js.translator/testFiles/delegateProperty/cases/delegateByTopLevelProperty.kt @@ -1,8 +1,11 @@ package foo + class Delegate { var inner = 1 fun get(t: Any?, p: PropertyMetadata): Int = inner - fun set(t: Any?, p: PropertyMetadata, i: Int) { inner = i } + fun set(t: Any?, p: PropertyMetadata, i: Int) { + inner = i + } } val p = Delegate() @@ -12,9 +15,9 @@ class A { } fun box(): String { - val c = A() - if(c.prop != 1) return "fail get" - c.prop = 2 - if (c.prop != 2) return "fail set" - return "OK" + val c = A() + if (c.prop != 1) return "fail get" + c.prop = 2 + if (c.prop != 2) return "fail set" + return "OK" } diff --git a/js/js.translator/testFiles/delegateProperty/cases/delegateForExtProperty.kt b/js/js.translator/testFiles/delegateProperty/cases/delegateForExtProperty.kt index 2e4dfeba0a9..1a79bc00d9d 100644 --- a/js/js.translator/testFiles/delegateProperty/cases/delegateForExtProperty.kt +++ b/js/js.translator/testFiles/delegateProperty/cases/delegateForExtProperty.kt @@ -1,6 +1,7 @@ package foo + class Delegate { - fun get(t: A, p: PropertyMetadata): Int = 1 + fun get(t: A, p: PropertyMetadata): Int = 1 } val A.prop: Int by Delegate() @@ -9,5 +10,5 @@ class A { } fun box(): String { - return if(A().prop == 1) "OK" else "fail" + return if (A().prop == 1) "OK" else "fail" } diff --git a/js/js.translator/testFiles/delegateProperty/cases/delegateWithPropertyAccess.kt b/js/js.translator/testFiles/delegateProperty/cases/delegateWithPropertyAccess.kt index 8378be611ee..32445b6a0db 100644 --- a/js/js.translator/testFiles/delegateProperty/cases/delegateWithPropertyAccess.kt +++ b/js/js.translator/testFiles/delegateProperty/cases/delegateWithPropertyAccess.kt @@ -3,7 +3,9 @@ package foo class Delegate { var inner = 1 fun get(t: Any?, p: PropertyMetadata): Int = inner - fun set(t: Any?, p: PropertyMetadata, i: Int) { inner = i } + fun set(t: Any?, p: PropertyMetadata, i: Int) { + inner = i + } } val p = Delegate() @@ -13,9 +15,9 @@ class A { } fun box(): String { - val c = A() - if(c.prop != 1) return "fail get" - c.prop = 2 - if (c.prop != 2) return "fail set" - return "OK" + val c = A() + if (c.prop != 1) return "fail get" + c.prop = 2 + if (c.prop != 2) return "fail set" + return "OK" } diff --git a/js/js.translator/testFiles/delegateProperty/cases/getAsExtensionFun.kt b/js/js.translator/testFiles/delegateProperty/cases/getAsExtensionFun.kt index aa2301e7bac..27be81e3b06 100644 --- a/js/js.translator/testFiles/delegateProperty/cases/getAsExtensionFun.kt +++ b/js/js.translator/testFiles/delegateProperty/cases/getAsExtensionFun.kt @@ -1,4 +1,5 @@ package foo + class Delegate { } @@ -9,5 +10,5 @@ class A { } fun box(): String { - return if(A().prop == 1) "OK" else "fail" + return if (A().prop == 1) "OK" else "fail" } diff --git a/js/js.translator/testFiles/delegateProperty/cases/propertyMetadata.kt b/js/js.translator/testFiles/delegateProperty/cases/propertyMetadata.kt index 7fd472562cb..2b6e717d464 100644 --- a/js/js.translator/testFiles/delegateProperty/cases/propertyMetadata.kt +++ b/js/js.translator/testFiles/delegateProperty/cases/propertyMetadata.kt @@ -5,7 +5,7 @@ trait WithName { } class GetPropertyName() { - fun get(withName: WithName, property: PropertyMetadata) : String { + fun get(withName: WithName, property: PropertyMetadata): String { return withName.name + ":" + property.name; } fun set(withName: WithName, property: PropertyMetadata, value: String) { diff --git a/js/js.translator/testFiles/delegateProperty/cases/setAsExtensionFun.kt b/js/js.translator/testFiles/delegateProperty/cases/setAsExtensionFun.kt index cb8addff4c2..c3421858206 100644 --- a/js/js.translator/testFiles/delegateProperty/cases/setAsExtensionFun.kt +++ b/js/js.translator/testFiles/delegateProperty/cases/setAsExtensionFun.kt @@ -1,19 +1,22 @@ package foo + class Delegate { var inner = 1 fun get(t: Any?, p: PropertyMetadata): Int = inner } -fun Delegate.set(t: Any?, p: PropertyMetadata, i: Int) { inner = i } +fun Delegate.set(t: Any?, p: PropertyMetadata, i: Int) { + inner = i +} class A { var prop: Int by Delegate() } fun box(): String { - val c = A() - if(c.prop != 1) return "fail get" - c.prop = 2 - if (c.prop != 2) return "fail set" - return "OK" + val c = A() + if (c.prop != 1) return "fail get" + c.prop = 2 + if (c.prop != 2) return "fail set" + return "OK" } diff --git a/js/js.translator/testFiles/delegateProperty/cases/simple.kt b/js/js.translator/testFiles/delegateProperty/cases/simple.kt index 243d43f55f0..a3c7f476953 100644 --- a/js/js.translator/testFiles/delegateProperty/cases/simple.kt +++ b/js/js.translator/testFiles/delegateProperty/cases/simple.kt @@ -5,7 +5,7 @@ trait WithNumber { } class IncNumber(val inc: Int) { - fun get(withNumber: WithNumber, property: PropertyMetadata) : Int { + fun get(withNumber: WithNumber, property: PropertyMetadata): Int { return withNumber.number + inc; } fun set(withNumber: WithNumber, property: PropertyMetadata, value: Int) { diff --git a/js/js.translator/testFiles/delegateProperty/cases/topLevelVal.kt b/js/js.translator/testFiles/delegateProperty/cases/topLevelVal.kt index 8b33b122def..c234f1af8f3 100644 --- a/js/js.translator/testFiles/delegateProperty/cases/topLevelVal.kt +++ b/js/js.translator/testFiles/delegateProperty/cases/topLevelVal.kt @@ -1,4 +1,5 @@ package foo + class Delegate { fun get(t: Any?, p: PropertyMetadata): Int = 1 } @@ -6,5 +7,5 @@ class Delegate { val prop: Int by Delegate() fun box(): String { - return if(prop == 1) "OK" else "fail" + return if (prop == 1) "OK" else "fail" } diff --git a/js/js.translator/testFiles/delegateProperty/cases/topLevelVar.kt b/js/js.translator/testFiles/delegateProperty/cases/topLevelVar.kt index 058191ccbe6..c38bdd0706e 100644 --- a/js/js.translator/testFiles/delegateProperty/cases/topLevelVar.kt +++ b/js/js.translator/testFiles/delegateProperty/cases/topLevelVar.kt @@ -1,15 +1,18 @@ package foo + class Delegate { var inner = 1 fun get(t: Any?, p: PropertyMetadata): Int = inner - fun set(t: Any?, p: PropertyMetadata, i: Int) { inner = i } + fun set(t: Any?, p: PropertyMetadata, i: Int) { + inner = i + } } var prop: Int by Delegate() fun box(): String { - if(prop != 1) return "fail get" - prop = 2 - if (prop != 2) return "fail set" - return "OK" + if (prop != 1) return "fail get" + prop = 2 + if (prop != 2) return "fail set" + return "OK" } diff --git a/js/js.translator/testFiles/delegateProperty/cases/withGenerics.kt b/js/js.translator/testFiles/delegateProperty/cases/withGenerics.kt index 836caf4f654..edd45355ea8 100644 --- a/js/js.translator/testFiles/delegateProperty/cases/withGenerics.kt +++ b/js/js.translator/testFiles/delegateProperty/cases/withGenerics.kt @@ -6,7 +6,7 @@ trait Getter { class Delegate(val getter: Getter) { var t: T? = null - fun get(obj: Any, property: PropertyMetadata) : T { + fun get(obj: Any, property: PropertyMetadata): T { if (t != null) { return t!! } diff --git a/js/js.translator/testFiles/enum/cases/enumWithInheritance.kt b/js/js.translator/testFiles/enum/cases/enumWithInheritance.kt index faebfcda919..e4327693400 100644 --- a/js/js.translator/testFiles/enum/cases/enumWithInheritance.kt +++ b/js/js.translator/testFiles/enum/cases/enumWithInheritance.kt @@ -9,7 +9,8 @@ enum class B(open val bar: Int) { y = 0 } } - b : B(4){} + b : B(4) { + } c : B(5) } diff --git a/js/js.translator/testFiles/enum/cases/standardMethods.kt b/js/js.translator/testFiles/enum/cases/standardMethods.kt index 2b854842d85..20aa427a899 100644 --- a/js/js.translator/testFiles/enum/cases/standardMethods.kt +++ b/js/js.translator/testFiles/enum/cases/standardMethods.kt @@ -7,7 +7,8 @@ enum class Simple { } enum class A { - a : A() {} + a : A() { + } b : A() c } @@ -21,8 +22,8 @@ fun box(): String { if (ok.ordinal() != 0) return "ok = Simple.Ok; ok.ordinal() != 0, it: ${ok.ordinal()}" val ok2 = Simple.valueOf("OK") - if(!ok2.equals(ok)) return "ok2 not equal ok" - if(!ok2.identityEquals(ok)) return "ok2 not identity equal ok" + if (!ok2.equals(ok)) return "ok2 not equal ok" + if (!ok2.identityEquals(ok)) return "ok2 not identity equal ok" if (EmptyEnum.values().size != 0) return "EmptyEnum.values().size != 0" diff --git a/js/js.translator/testFiles/examples/cases/closureWithParameter.kt b/js/js.translator/testFiles/examples/cases/closureWithParameter.kt index e0b5d616951..66734c13a79 100644 --- a/js/js.translator/testFiles/examples/cases/closureWithParameter.kt +++ b/js/js.translator/testFiles/examples/cases/closureWithParameter.kt @@ -1,7 +1,7 @@ -fun box() : String { - return apply( "OK", {(arg: String) -> arg } ) +fun box(): String { + return apply("OK", {(arg: String) -> arg }) } -fun apply(arg : String, f : (p:String) -> String) : String { +fun apply(arg: String, f: (p: String) -> String): String { return f(arg) } diff --git a/js/js.translator/testFiles/examples/cases/diamondInheritance.kt b/js/js.translator/testFiles/examples/cases/diamondInheritance.kt index 210aecafedc..b0ce0447a44 100644 --- a/js/js.translator/testFiles/examples/cases/diamondInheritance.kt +++ b/js/js.translator/testFiles/examples/cases/diamondInheritance.kt @@ -1,18 +1,20 @@ // Changed when traits were introduced. May not make sense any more open class Base() { - public var v : Int = 0 + public var v: Int = 0 } -open class Left() : Base() {} -trait Right : Base {} +open class Left() : Base() { +} +trait Right : Base { +} class D() : Left(), Right -fun vl(l : Left) : Int = l.v -fun vr(r : Right) : Int = r.v +fun vl(l: Left): Int = l.v +fun vr(r: Right): Int = r.v -fun box() : String { +fun box(): String { val d = D() d.v = 42 diff --git a/js/js.translator/testFiles/examples/cases/doubleEnclosedLocalVariable.kt b/js/js.translator/testFiles/examples/cases/doubleEnclosedLocalVariable.kt index 16675be0d7e..9f1ccde81b2 100644 --- a/js/js.translator/testFiles/examples/cases/doubleEnclosedLocalVariable.kt +++ b/js/js.translator/testFiles/examples/cases/doubleEnclosedLocalVariable.kt @@ -1,8 +1,8 @@ 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/enclosingLocalVariable.kt b/js/js.translator/testFiles/examples/cases/enclosingLocalVariable.kt index 01e1a103ff2..edd4063cead 100644 --- a/js/js.translator/testFiles/examples/cases/enclosingLocalVariable.kt +++ b/js/js.translator/testFiles/examples/cases/enclosingLocalVariable.kt @@ -1,8 +1,8 @@ -fun box() : String { +fun box(): String { val cl = 39 return if (sum(200, { val m = { val r = { cl }; r() }; m() }) == 239) "OK" else "FAIL" } -fun sum(arg:Int, f : () -> Int) : Int { +fun sum(arg: Int, f: () -> Int): Int { return arg + f() } diff --git a/js/js.translator/testFiles/examples/cases/extensionClosure.kt b/js/js.translator/testFiles/examples/cases/extensionClosure.kt index 1999e3cbbb6..c566a427b75 100644 --- a/js/js.translator/testFiles/examples/cases/extensionClosure.kt +++ b/js/js.translator/testFiles/examples/cases/extensionClosure.kt @@ -1,7 +1,7 @@ class Point(val x: Int, val y: Int) fun box(): String { - val answer = apply(Point(3, 5), { Point.(scalar: Int) : Point -> + val answer = apply(Point(3, 5), { Point.(scalar: Int): Point -> Point(x * scalar, y * scalar) }) diff --git a/js/js.translator/testFiles/examples/cases/funDelegation.kt b/js/js.translator/testFiles/examples/cases/funDelegation.kt index 10a1f408b09..00cedb1cda3 100644 --- a/js/js.translator/testFiles/examples/cases/funDelegation.kt +++ b/js/js.translator/testFiles/examples/cases/funDelegation.kt @@ -1,15 +1,18 @@ open class Base() { - fun n(n : Int) : Int = n + 1 + fun n(n: Int): Int = n + 1 } -trait Abstract {} +trait Abstract { +} -class Derived1() : Base(), Abstract {} -class Derived2() : Abstract, Base() {} +class Derived1() : Base(), Abstract { +} +class Derived2() : Abstract, Base() { +} -fun test(s : Base) : Boolean = s.n(238) == 239 +fun test(s: Base): Boolean = s.n(238) == 239 -fun box() : String { +fun box(): String { if (!test(Base())) return "Fail #1" if (!test(Derived1())) return "Fail #2" if (!test(Derived2())) return "Fail #3" diff --git a/js/js.translator/testFiles/examples/cases/incrementProperty.kt b/js/js.translator/testFiles/examples/cases/incrementProperty.kt index 29123dbcaf3..a0fca29dfdf 100644 --- a/js/js.translator/testFiles/examples/cases/incrementProperty.kt +++ b/js/js.translator/testFiles/examples/cases/incrementProperty.kt @@ -1,14 +1,14 @@ class Slot() { - var vitality: Int = 10000 + var vitality: Int = 10000 - fun increaseVitality(delta: Int) { - vitality = vitality + delta - if (vitality > 65535) vitality = 65535; - } + fun increaseVitality(delta: Int) { + vitality = vitality + delta + if (vitality > 65535) vitality = 65535; + } } fun box(): String { - val s = Slot() - s.increaseVitality(1000) - if (s.vitality == 11000) return "OK" else return "fail" + val s = Slot() + s.increaseVitality(1000) + if (s.vitality == 11000) return "OK" else return "fail" } diff --git a/js/js.translator/testFiles/examples/cases/inheritedMethod.kt b/js/js.translator/testFiles/examples/cases/inheritedMethod.kt index 97d432077a8..0d34b0b0060 100644 --- a/js/js.translator/testFiles/examples/cases/inheritedMethod.kt +++ b/js/js.translator/testFiles/examples/cases/inheritedMethod.kt @@ -1,13 +1,13 @@ open class Foo() { - fun xyzzy(): String = "xyzzy" + fun xyzzy(): String = "xyzzy" } -class Bar(): Foo() { - fun test(): String = xyzzy() +class Bar() : Foo() { + fun test(): String = xyzzy() } -fun box() : String { - val bar = Bar() - val f = bar.test() - return if (f == "xyzzy") "OK" else "fail" +fun box(): String { + val bar = Bar() + val f = bar.test() + return if (f == "xyzzy") "OK" else "fail" } diff --git a/js/js.translator/testFiles/examples/cases/initializerBlock.kt b/js/js.translator/testFiles/examples/cases/initializerBlock.kt index c89deeda87d..4f7a24370d5 100644 --- a/js/js.translator/testFiles/examples/cases/initializerBlock.kt +++ b/js/js.translator/testFiles/examples/cases/initializerBlock.kt @@ -1,13 +1,13 @@ class C() { - public var f: Int + public var f: Int - { - $f = 610 - } + { + $f = 610 + } } fun box(): String { - val c = C() - if (c.f != 610) return "fail" - return "OK" + val c = C() + if (c.f != 610) return "fail" + return "OK" } diff --git a/js/js.translator/testFiles/examples/cases/kt242.kt b/js/js.translator/testFiles/examples/cases/kt242.kt index 4e2de93cff3..f58ad3de17a 100644 --- a/js/js.translator/testFiles/examples/cases/kt242.kt +++ b/js/js.translator/testFiles/examples/cases/kt242.kt @@ -1,19 +1,27 @@ -fun box() : String { +fun box(): String { val i: Int? = 7 val j: Int? = null val k = 7 //verify errors - if (i == 7) {} - if (7 == i) {} + if (i == 7) { + } + if (7 == i) { + } - if (j == 7) {} - if (7 == j) {} + if (j == 7) { + } + if (7 == j) { + } - if (i == k) {} - if (k == i) {} + if (i == k) { + } + if (k == i) { + } - if (j == k) {} - if (k == j) {} + if (j == k) { + } + if (k == j) { + } return "OK" } \ No newline at end of file diff --git a/js/js.translator/testFiles/examples/cases/newInstanceDefaultConstructor.kt b/js/js.translator/testFiles/examples/cases/newInstanceDefaultConstructor.kt index 6cd0ebd954b..623ba5cb33d 100644 --- a/js/js.translator/testFiles/examples/cases/newInstanceDefaultConstructor.kt +++ b/js/js.translator/testFiles/examples/cases/newInstanceDefaultConstructor.kt @@ -2,10 +2,10 @@ class SimpleClass() { fun foo() = 610 } -fun box() : String { - val c = SimpleClass() - if (c.foo() == 610) { - return "OK" - } - return "FAIL" +fun box(): String { + val c = SimpleClass() + if (c.foo() == 610) { + return "OK" + } + return "FAIL" } diff --git a/js/js.translator/testFiles/examples/cases/overloadBinaryOperator.kt b/js/js.translator/testFiles/examples/cases/overloadBinaryOperator.kt index bee66062979..4afd53c97fc 100644 --- a/js/js.translator/testFiles/examples/cases/overloadBinaryOperator.kt +++ b/js/js.translator/testFiles/examples/cases/overloadBinaryOperator.kt @@ -4,7 +4,7 @@ class ArrayWrapper() { val contents = ArrayList() fun add(item: T) { - contents.add(item) + contents.add(item) } fun plus(b: ArrayWrapper): ArrayWrapper { diff --git a/js/js.translator/testFiles/examples/cases/overloadUnaryOperator.kt b/js/js.translator/testFiles/examples/cases/overloadUnaryOperator.kt index 2cbe1a27f3a..865bf78c98c 100644 --- a/js/js.translator/testFiles/examples/cases/overloadUnaryOperator.kt +++ b/js/js.translator/testFiles/examples/cases/overloadUnaryOperator.kt @@ -4,7 +4,7 @@ class ArrayWrapper() { val contents = ArrayList() fun add(item: T) { - contents.add(item) + contents.add(item) } fun minus(): ArrayWrapper { diff --git a/js/js.translator/testFiles/examples/cases/propertyDelegation.kt b/js/js.translator/testFiles/examples/cases/propertyDelegation.kt index 614c624f124..f6486d64f30 100644 --- a/js/js.translator/testFiles/examples/cases/propertyDelegation.kt +++ b/js/js.translator/testFiles/examples/cases/propertyDelegation.kt @@ -1,21 +1,24 @@ open class Base() { val plain = 239 - public val read : Int - get() = 239 + public val read: Int + get() = 239 - public var readwrite : Int = 0 - get() = $readwrite + 1 - set(n : Int) { - $readwrite = n - } + public var readwrite: Int = 0 + get() = $readwrite + 1 + set(n: Int) { + $readwrite = n + } } -trait Abstract {} +trait Abstract { +} -class Derived1() : Base(), Abstract {} -class Derived2() : Abstract, Base() {} +class Derived1() : Base(), Abstract { +} +class Derived2() : Abstract, Base() { +} -fun code(s : Base) : Int { +fun code(s: Base): Int { if (s.plain != 239) return 1 if (s.read != 239) return 2 s.readwrite = 238 @@ -23,9 +26,9 @@ fun code(s : Base) : Int { return 0 } -fun test(s : Base) : Boolean = code(s) == 0 +fun test(s: Base): Boolean = code(s) == 0 -fun box() : String { +fun box(): String { if (!test(Base())) return "Fail #1" if (!test(Derived1())) return "Fail #2" if (!test(Derived2())) return "Fail #3" diff --git a/js/js.translator/testFiles/examples/cases/rightHandOverride.kt b/js/js.translator/testFiles/examples/cases/rightHandOverride.kt index e99e60bd863..76cef58292e 100644 --- a/js/js.translator/testFiles/examples/cases/rightHandOverride.kt +++ b/js/js.translator/testFiles/examples/cases/rightHandOverride.kt @@ -1,6 +1,7 @@ // Changed when traits were introduced. May not make sense any more -trait Left {} +trait Left { +} open class Right() { open fun f() = 42 } @@ -9,9 +10,9 @@ class D() : Left, Right() { override fun f() = 239 } -fun box() : String { - val r : Right = Right() - val d : D = D() +fun box(): String { + val r: Right = Right() + val d: D = D() if (r.f() != 42) return "Fail #1" if (d.f() != 239) return "Fail #2" diff --git a/js/js.translator/testFiles/examples/cases/simplestClosure.kt b/js/js.translator/testFiles/examples/cases/simplestClosure.kt index 7a9f3b439cf..7234934c6e4 100644 --- a/js/js.translator/testFiles/examples/cases/simplestClosure.kt +++ b/js/js.translator/testFiles/examples/cases/simplestClosure.kt @@ -1,7 +1,7 @@ -fun box() : String { - return invoker( {"OK"} ) +fun box(): String { + return invoker({ "OK" }) } -fun invoker(gen : () -> String) : String { +fun invoker(gen: () -> String): String { return gen() } diff --git a/js/js.translator/testFiles/examples/cases/simplestClosureAndBoxing.kt b/js/js.translator/testFiles/examples/cases/simplestClosureAndBoxing.kt index 50f22fbeb8d..68c79939866 100644 --- a/js/js.translator/testFiles/examples/cases/simplestClosureAndBoxing.kt +++ b/js/js.translator/testFiles/examples/cases/simplestClosureAndBoxing.kt @@ -1,7 +1,7 @@ -fun box() : String { - return if (int_invoker( { 7 } ) == 7) "OK" else "fail" +fun box(): String { + return if (int_invoker({ 7 }) == 7) "OK" else "fail" } -fun int_invoker(gen : () -> Int) : Int { +fun int_invoker(gen: () -> Int): Int { return gen() } diff --git a/js/js.translator/testFiles/examples/sortedTests/unsupported/basicmethod.kt b/js/js.translator/testFiles/examples/sortedTests/unsupported/basicmethod.kt index 9920bc3b69d..33e6c67d064 100644 --- a/js/js.translator/testFiles/examples/sortedTests/unsupported/basicmethod.kt +++ b/js/js.translator/testFiles/examples/sortedTests/unsupported/basicmethod.kt @@ -1,16 +1,16 @@ import java.util.ArrayList trait Tr { - fun extra() : String = "_" + fun extra(): String = "_" } class N() : ArrayList(), Tr { - override fun add(el: Any) : Boolean { + override fun add(el: Any): Boolean { super.add(el) return super.add(el.toString() + super.extra() + el + extra()) } - override fun extra() : String = super.extra() + super.extra() + override fun extra(): String = super.extra() + super.extra() } fun box(): String { diff --git a/js/js.translator/testFiles/examples/sortedTests/unsupported/basicproperty.kt b/js/js.translator/testFiles/examples/sortedTests/unsupported/basicproperty.kt index ae1cfa5618b..124466a93ad 100644 --- a/js/js.translator/testFiles/examples/sortedTests/unsupported/basicproperty.kt +++ b/js/js.translator/testFiles/examples/sortedTests/unsupported/basicproperty.kt @@ -3,14 +3,14 @@ open class M() { } class N() : M() { - val a : Int + val a: Int get() { super.b = super.b + 1 return super.b + 1 } override var b: Int = a + 1 - val superb : Int + val superb: Int get() = super.b } diff --git a/js/js.translator/testFiles/examples/sortedTests/unsupported/classObject.kt b/js/js.translator/testFiles/examples/sortedTests/unsupported/classObject.kt index 76eff77c438..0e9a53ef70b 100644 --- a/js/js.translator/testFiles/examples/sortedTests/unsupported/classObject.kt +++ b/js/js.translator/testFiles/examples/sortedTests/unsupported/classObject.kt @@ -1,11 +1,11 @@ class C() { - class object { - fun create() = C() - } + class object { + fun create() = C() + } } fun box(): String { - val c = C.create() - return if (c is C) "OK" else "fail" + val c = C.create() + return if (c is C) "OK" else "fail" } diff --git a/js/js.translator/testFiles/examples/sortedTests/unsupported/classObjectInterface.kt b/js/js.translator/testFiles/examples/sortedTests/unsupported/classObjectInterface.kt index 432bb37bee0..9ca2f5d72b1 100644 --- a/js/js.translator/testFiles/examples/sortedTests/unsupported/classObjectInterface.kt +++ b/js/js.translator/testFiles/examples/sortedTests/unsupported/classObjectInterface.kt @@ -1,9 +1,10 @@ class C() { - fun getInstance(): Runnable = C + fun getInstance(): Runnable = C - class object: Runnable { - override fun run(): Unit { } - } + class object: Runnable { + override fun run(): Unit { + } + } } fun foo() = C().getInstance() diff --git a/js/js.translator/testFiles/examples/sortedTests/unsupported/classObjectMethod.kt b/js/js.translator/testFiles/examples/sortedTests/unsupported/classObjectMethod.kt index d7d70a86d96..9fe61a3c366 100644 --- a/js/js.translator/testFiles/examples/sortedTests/unsupported/classObjectMethod.kt +++ b/js/js.translator/testFiles/examples/sortedTests/unsupported/classObjectMethod.kt @@ -1,13 +1,13 @@ abstract open class Default { - abstract fun defaultValue(): Int + abstract fun defaultValue(): Int } class MyInt() { - class object : Default { - override fun defaultValue(): Int = 610 - } + class object : Default { + override fun defaultValue(): Int = 610 + } } -fun toDefault(t: T) where class object T: Default = T.defaultValue() +fun toDefault(t: T) where class object T : Default = T.defaultValue() fun box(): String = if (toDefault(MyInt()) == 610) "OK" else "fail" diff --git a/js/js.translator/testFiles/examples/sortedTests/unsupported/enclosed.kt b/js/js.translator/testFiles/examples/sortedTests/unsupported/enclosed.kt index 705e0b602c2..4b6e8d36060 100644 --- a/js/js.translator/testFiles/examples/sortedTests/unsupported/enclosed.kt +++ b/js/js.translator/testFiles/examples/sortedTests/unsupported/enclosed.kt @@ -1,20 +1,20 @@ trait BK { - fun x() : Int = 50 + fun x(): Int = 50 } trait K : BK { - override fun x() : Int = super.x() * 2 + override fun x(): Int = super.x() * 2 } open class M() { - open fun x() : Int = 10 + open fun x(): Int = 10 open var y = 500 } open class N() : M(), K { - override fun x() : Int = 20 + override fun x(): Int = 20 override var y = 200 @@ -24,7 +24,7 @@ open class N() : M(), K { fun test3() = super@N.x() fun test4() = super.x() fun test5() = y - fun test6() : Int { + fun test6(): Int { super@N.y += 200 return super@N.y } @@ -33,7 +33,7 @@ open class N() : M(), K { fun box(): String { if (N().C().test1() != 100) return "test1 fail"; - if (N().C().test2() != 10) return "test2 fail"; + if (N().C().test2() != 10) return "test2 fail"; if (N().C().test3() != 100) return "test3 fail"; if (N().C().test4() != 100) return "test4 fail"; if (N().C().test5() != 200) return "test5 fail"; diff --git a/js/js.translator/testFiles/examples/sortedTests/unsupported/forwardTypeParameter.kt b/js/js.translator/testFiles/examples/sortedTests/unsupported/forwardTypeParameter.kt index 2e78cd3ae9c..060472dc351 100644 --- a/js/js.translator/testFiles/examples/sortedTests/unsupported/forwardTypeParameter.kt +++ b/js/js.translator/testFiles/examples/sortedTests/unsupported/forwardTypeParameter.kt @@ -1,12 +1,14 @@ -class Foo() { } -class Bar() { } +class Foo() { +} +class Bar() { +} fun isInstance(obj: Any?) = obj is T fun isInstance2(obj: Any?) = isInstance(obj) fun box(): String { - if (! isInstance2(Foo())) return "fail 1" - if (isInstance2(Foo())) return "fail 2" - return "OK" + if (!isInstance2(Foo())) return "fail 1" + if (isInstance2(Foo())) return "fail 2" + return "OK" } diff --git a/js/js.translator/testFiles/examples/sortedTests/unsupported/inheritance.kt b/js/js.translator/testFiles/examples/sortedTests/unsupported/inheritance.kt index 0bfdb4e497f..f0d06a2615f 100644 --- a/js/js.translator/testFiles/examples/sortedTests/unsupported/inheritance.kt +++ b/js/js.translator/testFiles/examples/sortedTests/unsupported/inheritance.kt @@ -1,24 +1,31 @@ // Changed when traits were introduced. May not make sense any more -open class X(val x : Int) {} +open class X(val x: Int) { +} trait Y { - abstract val y : Int + abstract val y: Int } -class YImpl(override val y : Int) : Y {} - -class Point(x : Int, yy : Int) : X(x) , Y { - override val y : Int = yy +class YImpl(override val y: Int) : Y { } -trait Abstract {} +class Point(x: Int, yy: Int) : X(x), Y { + override val y: Int = yy +} -class P1(x : Int, yy : Y) : Abstract, X(x), Y by yy {} -class P2(x : Int, yy : Y) : X(x), Abstract, Y by yy {} -class P3(x : Int, yy : Y) : X(x), Y by yy, Abstract {} -class P4(x : Int, yy : Y) : Y by yy, Abstract, X(x) {} +trait Abstract { +} -fun box() : String { +class P1(x: Int, yy: Y) : Abstract, X(x), Y by yy { +} +class P2(x: Int, yy: Y) : X(x), Abstract, Y by yy { +} +class P3(x: Int, yy: Y) : X(x), Y by yy, Abstract { +} +class P4(x: Int, yy: Y) : Y by yy, Abstract, X(x) { +} + +fun box(): String { if (X(239).x != 239) return "FAIL #1" if (YImpl(239).y != 239) return "FAIL #2" diff --git a/js/js.translator/testFiles/examples/sortedTests/unsupported/inheritedInnerClass.kt b/js/js.translator/testFiles/examples/sortedTests/unsupported/inheritedInnerClass.kt index 4717bea55a8..840f2bf2ee6 100644 --- a/js/js.translator/testFiles/examples/sortedTests/unsupported/inheritedInnerClass.kt +++ b/js/js.translator/testFiles/examples/sortedTests/unsupported/inheritedInnerClass.kt @@ -1,14 +1,14 @@ class Outer() { - open class InnerBase() { - } + open class InnerBase() { + } - class InnerDerived(): InnerBase() { - } + class InnerDerived() : InnerBase() { + } - public val foo: InnerBase? = InnerDerived() + public val foo: InnerBase? = InnerDerived() } -fun box() : String { - val o = Outer() - return if (o.foo === null) "fail" else "OK" +fun box(): String { + val o = Outer() + return if (o.foo === null) "fail" else "OK" } diff --git a/js/js.translator/testFiles/examples/sortedTests/unsupported/initializerBlockDImpl.kt b/js/js.translator/testFiles/examples/sortedTests/unsupported/initializerBlockDImpl.kt index aa3d227c80f..cb1e9cccf14 100644 --- a/js/js.translator/testFiles/examples/sortedTests/unsupported/initializerBlockDImpl.kt +++ b/js/js.translator/testFiles/examples/sortedTests/unsupported/initializerBlockDImpl.kt @@ -2,19 +2,19 @@ import java.util.* import java.io.* class World() { - public val items: ArrayList = ArrayList + public val items: ArrayList = ArrayList - class Item() { - { - items.add(this) + class Item() { + { + items.add(this) + } } - } - val foo = Item() + val foo = Item() } -fun box() : String { - val w = World() - if (w.items.size() != 1) return "fail" - return "OK" +fun box(): String { + val w = World() + if (w.items.size() != 1) return "fail" + return "OK" } diff --git a/js/js.translator/testFiles/examples/sortedTests/unsupported/innerClass.kt b/js/js.translator/testFiles/examples/sortedTests/unsupported/innerClass.kt index df43f61e8bc..8f3437e40c1 100644 --- a/js/js.translator/testFiles/examples/sortedTests/unsupported/innerClass.kt +++ b/js/js.translator/testFiles/examples/sortedTests/unsupported/innerClass.kt @@ -1,19 +1,19 @@ class Outer(val foo: StringBuilder) { - class Inner() { - fun len() : Int { - return foo.length() + class Inner() { + fun len(): Int { + return foo.length() + } } - } - fun test() : Inner { - return Inner() - } + fun test(): Inner { + return Inner() + } } -fun box() : String { - val sb = StringBuilder("xyzzy") - val o = Outer(sb) - val i = o.test() - val l = i.len() - return if (l != 5) "fail" else "OK" +fun box(): String { + val sb = StringBuilder("xyzzy") + val o = Outer(sb) + val i = o.test() + val l = i.len() + return if (l != 5) "fail" else "OK" } diff --git a/js/js.translator/testFiles/examples/sortedTests/unsupported/propertyInInitializer.kt b/js/js.translator/testFiles/examples/sortedTests/unsupported/propertyInInitializer.kt index f6e84b15afd..7b49104f9e3 100644 --- a/js/js.translator/testFiles/examples/sortedTests/unsupported/propertyInInitializer.kt +++ b/js/js.translator/testFiles/examples/sortedTests/unsupported/propertyInInitializer.kt @@ -1,16 +1,16 @@ class Outer() { - val s = "xyzzy" + val s = "xyzzy" - open class InnerBase(public val name: String) { - } + open class InnerBase(public val name: String) { + } - class InnerDerived(): InnerBase(s) { - } + class InnerDerived() : InnerBase(s) { + } - val x = InnerDerived() + val x = InnerDerived() } -fun box() : String { - val o = Outer() - return if (o.x.name != "xyzzy") "fail" else "OK" +fun box(): String { + val o = Outer() + return if (o.x.name != "xyzzy") "fail" else "OK" } diff --git a/js/js.translator/testFiles/examples/sortedTests/unsupported/traitproperty.kt b/js/js.translator/testFiles/examples/sortedTests/unsupported/traitproperty.kt index 715d8d73d8b..51c0f2893f5 100644 --- a/js/js.translator/testFiles/examples/sortedTests/unsupported/traitproperty.kt +++ b/js/js.translator/testFiles/examples/sortedTests/unsupported/traitproperty.kt @@ -1,6 +1,6 @@ trait M { - var backingB : Int - var b : Int + var backingB: Int + var b: Int get() = backingB set(value: Int) { backingB = value @@ -8,16 +8,16 @@ trait M { } class N() : M { - override var backingB : Int = 0 + override var backingB: Int = 0 - val a : Int + val a: Int get() { super.b = super.b + 1 return super.b + 1 } override var b: Int = a + 1 - val superb : Int + val superb: Int get() = super.b } diff --git a/js/js.translator/testFiles/examples/sortedTests/usesJava/exceptionConstructor.kt b/js/js.translator/testFiles/examples/sortedTests/usesJava/exceptionConstructor.kt index ab6117e266e..69b4871de72 100644 --- a/js/js.translator/testFiles/examples/sortedTests/usesJava/exceptionConstructor.kt +++ b/js/js.translator/testFiles/examples/sortedTests/usesJava/exceptionConstructor.kt @@ -1,7 +1,7 @@ -class GameError(msg: String): Exception(msg) { +class GameError(msg: String) : Exception(msg) { } fun box(): String { - val e = GameError("foo") - return if (e.getMessage() == "foo") "OK" else "fail" + val e = GameError("foo") + return if (e.getMessage() == "foo") "OK" else "fail" } diff --git a/js/js.translator/testFiles/expression/cast/cases/castToNotNullType.kt b/js/js.translator/testFiles/expression/cast/cases/castToNotNullType.kt index 8bfe1df0d82..54be7f57779 100644 --- a/js/js.translator/testFiles/expression/cast/cases/castToNotNullType.kt +++ b/js/js.translator/testFiles/expression/cast/cases/castToNotNullType.kt @@ -5,10 +5,10 @@ class A fun checkCastNullableToNotNull(): Boolean { val a = null try { - val s = a as A + val s = a as A } - catch (e : Exception) { - return true + catch (e: Exception) { + return true } return false } diff --git a/js/js.translator/testFiles/expression/cast/cases/castToNullableType.kt b/js/js.translator/testFiles/expression/cast/cases/castToNullableType.kt index f7efafbe0b4..550c2494bf7 100644 --- a/js/js.translator/testFiles/expression/cast/cases/castToNullableType.kt +++ b/js/js.translator/testFiles/expression/cast/cases/castToNullableType.kt @@ -7,7 +7,7 @@ fun box(): String { val s = a as A? if (s != null) return "Failed when try cast Nullable with null value to Nullable" - val b : A? = A() + val b: A? = A() val n = b as A? if (n != b) return "Failed when try cast Nullable with not null value to Nullable" diff --git a/js/js.translator/testFiles/expression/equals/cases/customEqualsMethod.kt b/js/js.translator/testFiles/expression/equals/cases/customEqualsMethod.kt index 25775b2e914..ec5bc1e60f4 100644 --- a/js/js.translator/testFiles/expression/equals/cases/customEqualsMethod.kt +++ b/js/js.translator/testFiles/expression/equals/cases/customEqualsMethod.kt @@ -10,10 +10,10 @@ class Foo(val name: String) { } fun callEqualsMethod(v1: Foo?, v2: Foo?): Boolean { - return v1 == v2 + return v1 == v2 } -fun box() : Boolean { +fun box(): Boolean { val a = Foo("abc") val b = Foo("abc") val c = Foo("def") diff --git a/js/js.translator/testFiles/expression/equals/cases/customEqualsMethodOnAny.kt b/js/js.translator/testFiles/expression/equals/cases/customEqualsMethodOnAny.kt index cc65ba30e98..f17462afb93 100644 --- a/js/js.translator/testFiles/expression/equals/cases/customEqualsMethodOnAny.kt +++ b/js/js.translator/testFiles/expression/equals/cases/customEqualsMethodOnAny.kt @@ -10,10 +10,10 @@ class Foo(val name: String) { } fun callEqualsMethod(v1: Any?, v2: Any?): Boolean { - return v1 == v2 + return v1 == v2 } -fun box() : Boolean { +fun box(): Boolean { val a = Foo("abc") val b = Foo("abc") val c = Foo("def") diff --git a/js/js.translator/testFiles/expression/equals/cases/equalsNullOrUndefined.kt b/js/js.translator/testFiles/expression/equals/cases/equalsNullOrUndefined.kt index 706fb6db4b7..7a4d7c7aab1 100644 --- a/js/js.translator/testFiles/expression/equals/cases/equalsNullOrUndefined.kt +++ b/js/js.translator/testFiles/expression/equals/cases/equalsNullOrUndefined.kt @@ -2,24 +2,24 @@ package foo native val undefined: Any = noImpl -fun box() : String { +fun box(): String { val a: Int? = null val r = a == null if (!r || a != null) - return "wrong result on simple nullable check" + return "wrong result on simple nullable check" //force using Kotlin.equals val t = null if (t != undefined) - return "wrong result when compare null and undefined using Kotlin.equals" + return "wrong result when compare null and undefined using Kotlin.equals" var i = 0; fun foo(): Int? = ++i; if (foo() == null) - return "wrong result on nullable check with side effects" + return "wrong result on nullable check with side effects" if (i != 1) - return "wrong affects when using nullable check with side effects" + return "wrong affects when using nullable check with side effects" return "OK" } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/equals/cases/explicitEqualsMethod.kt b/js/js.translator/testFiles/expression/equals/cases/explicitEqualsMethod.kt index 90e660a9252..eef5d7ab1b0 100644 --- a/js/js.translator/testFiles/expression/equals/cases/explicitEqualsMethod.kt +++ b/js/js.translator/testFiles/expression/equals/cases/explicitEqualsMethod.kt @@ -13,7 +13,7 @@ class Bar() { } -fun box() : Boolean { +fun box(): Boolean { val a = Foo("abc") val b = Foo("abc") val c = Foo("def") diff --git a/js/js.translator/testFiles/expression/equals/cases/explicitEqualsMethodForPrimitives.kt b/js/js.translator/testFiles/expression/equals/cases/explicitEqualsMethodForPrimitives.kt index e4abc8da6a8..f1cd5e93748 100644 --- a/js/js.translator/testFiles/expression/equals/cases/explicitEqualsMethodForPrimitives.kt +++ b/js/js.translator/testFiles/expression/equals/cases/explicitEqualsMethodForPrimitives.kt @@ -1,21 +1,21 @@ package foo -fun box() : Boolean { - val a = 2 - if (!(a equals a)) return false - if (!(a equals 2)) return false - if (!(a equals 2.0)) return false - val c = "a" - if (!("a" equals c)) return false - if (!(null equals null)) return false - val d = 5.6 - if (!(d.toShort() equals 5.toShort())) return false - if (!(d.toByte() equals 5.toByte())) return false - if (!(d.toFloat() equals 5.6.toFloat())) return false - if (!(d.toInt() equals 5)) return false - if (true equals false) return false +fun box(): Boolean { + val a = 2 + if (!(a equals a)) return false + if (!(a equals 2)) return false + if (!(a equals 2.0)) return false + val c = "a" + if (!("a" equals c)) return false + if (!(null equals null)) return false + val d = 5.6 + if (!(d.toShort() equals 5.toShort())) return false + if (!(d.toByte() equals 5.toByte())) return false + if (!(d.toFloat() equals 5.6.toFloat())) return false + if (!(d.toInt() equals 5)) return false + if (true equals false) return false - val n: Number = 3 - if (!(n equals 3.3.toInt())) return false - return true + val n: Number = 3 + if (!(n equals 3.3.toInt())) return false + return true } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/equals/cases/kt2370.kt b/js/js.translator/testFiles/expression/equals/cases/kt2370.kt index 5793b26412f..ea883d43a37 100644 --- a/js/js.translator/testFiles/expression/equals/cases/kt2370.kt +++ b/js/js.translator/testFiles/expression/equals/cases/kt2370.kt @@ -1,6 +1,7 @@ package foo import java.util.* + fun box(): Boolean { val data = ArrayList() data.add("foo") diff --git a/js/js.translator/testFiles/expression/equals/cases/stringsEqual.kt b/js/js.translator/testFiles/expression/equals/cases/stringsEqual.kt index af7106b8c4d..9e5320a27dd 100644 --- a/js/js.translator/testFiles/expression/equals/cases/stringsEqual.kt +++ b/js/js.translator/testFiles/expression/equals/cases/stringsEqual.kt @@ -1,6 +1,6 @@ package foo -fun box() : Boolean { +fun box(): Boolean { val a = "abc" val b = "abc" val c = "def" diff --git a/js/js.translator/testFiles/expression/for/cases/forIteratesOverArray.kt b/js/js.translator/testFiles/expression/for/cases/forIteratesOverArray.kt index 7d80aa9aca4..b1e389776ea 100644 --- a/js/js.translator/testFiles/expression/for/cases/forIteratesOverArray.kt +++ b/js/js.translator/testFiles/expression/for/cases/forIteratesOverArray.kt @@ -2,16 +2,17 @@ package foo val a1 = arrayOfNulls(10) -fun box() : Boolean { +fun box(): Boolean { var c = 0 var d = 0 a1[3] = 3 a1[5] = 5 - for (a : Int? in a1) { + for (a: Int? in a1) { if (a != null) { c += 1; - } else { + } + else { d += 1 } } diff --git a/js/js.translator/testFiles/expression/for/cases/forOnEmptyArray.kt b/js/js.translator/testFiles/expression/for/cases/forOnEmptyArray.kt index d056f147f9c..be373105181 100644 --- a/js/js.translator/testFiles/expression/for/cases/forOnEmptyArray.kt +++ b/js/js.translator/testFiles/expression/for/cases/forOnEmptyArray.kt @@ -2,7 +2,7 @@ package foo val a1 = arrayOfNulls(0) -fun box() : Boolean { +fun box(): Boolean { for (a in a1) { return false; } 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 82f26fe6685..e68bc653eea 100644 --- a/js/js.translator/testFiles/expression/function/cases/KT-921.kt +++ b/js/js.translator/testFiles/expression/function/cases/KT-921.kt @@ -1,33 +1,28 @@ import java.util.* class Lifetime() { - val attached = ArrayList< Function0 >() + val attached = ArrayList>() - public fun attach(action : ()->Unit) - { - attached.add(action) - } + public fun attach(action: () -> Unit) { + attached.add(action) + } - fun close() - { - for(x in attached) x() - attached.clear() - } + fun close() { + for (x in attached) x() + attached.clear() + } } -public class Viewable() -{ - val items = ArrayList() +public class Viewable() { + val items = ArrayList() - fun add(item:T) - { - items.add(item) - } + fun add(item: T) { + items.add(item) + } - fun remove(item:T) - { - items.remove(item) - } + fun remove(item: T) { + items.remove(item) + } fun view(lifetime: Lifetime, viewer: (itemLifetime: Lifetime, item: T) -> Unit) { for (item in items) { @@ -36,14 +31,14 @@ public class Viewable() } } -fun lifetime(body: (Lifetime)->Unit) { +fun lifetime(body: (Lifetime) -> Unit) { val l = Lifetime() body(l) l.close() } fun Dump(items: ArrayList) { - for(item in items) { + for (item in items) { print(item.toString() + ", ") } println("end") @@ -56,7 +51,7 @@ fun main(args: Array) { v.add(2) v.add(3) lifetime() { - v.view(it) {itemLifetime, item -> + v.view(it) { itemLifetime, item -> x.add(item) Dump(x) itemLifetime.attach() { diff --git a/js/js.translator/testFiles/expression/function/cases/adderClosure.kt b/js/js.translator/testFiles/expression/function/cases/adderClosure.kt index f5a9ab9f9cc..95c35b5a10b 100644 --- a/js/js.translator/testFiles/expression/function/cases/adderClosure.kt +++ b/js/js.translator/testFiles/expression/function/cases/adderClosure.kt @@ -2,7 +2,7 @@ package foo fun box(): Boolean { var sum = 0 - val adder = {(a: Int) -> sum += a} + val adder = {(a: Int) -> sum += a } adder(3) adder(2) return sum == 5 diff --git a/js/js.translator/testFiles/expression/function/cases/closureWithParameter.kt b/js/js.translator/testFiles/expression/function/cases/closureWithParameter.kt index 31c8e3f07c0..5d19a82d6bb 100644 --- a/js/js.translator/testFiles/expression/function/cases/closureWithParameter.kt +++ b/js/js.translator/testFiles/expression/function/cases/closureWithParameter.kt @@ -1,9 +1,9 @@ package foo -fun box() : String { - return apply( "OK", {(arg: String) -> arg } ) +fun box(): String { + return apply("OK", {(arg: String) -> arg }) } -fun apply(arg : String, f : (p:String) -> String) : String { +fun apply(arg: String, f: (p: String) -> String): String { return f(arg) } diff --git a/js/js.translator/testFiles/expression/function/cases/closureWithParameterAndBoxing.kt b/js/js.translator/testFiles/expression/function/cases/closureWithParameterAndBoxing.kt index e5602935931..ba9bc917b46 100644 --- a/js/js.translator/testFiles/expression/function/cases/closureWithParameterAndBoxing.kt +++ b/js/js.translator/testFiles/expression/function/cases/closureWithParameterAndBoxing.kt @@ -1,9 +1,9 @@ package foo -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/expression/function/cases/defaultParameters.kt b/js/js.translator/testFiles/expression/function/cases/defaultParameters.kt index 4b404c94049..6256c675801 100644 --- a/js/js.translator/testFiles/expression/function/cases/defaultParameters.kt +++ b/js/js.translator/testFiles/expression/function/cases/defaultParameters.kt @@ -1,11 +1,10 @@ package foo -fun f(a : Int = 2, b : Int = 3) = a + b +fun f(a: Int = 2, b: Int = 3) = a + b -fun box() : Boolean -{ - if (f(1,2) != 3) return false; - if (f(1,3) != 4) return false; +fun box(): Boolean { + if (f(1, 2) != 3) return false; + if (f(1, 3) != 4) return false; if (f(3) != 6) return false; if (f() != 5) return false; diff --git a/js/js.translator/testFiles/expression/function/cases/enclosingThis.kt b/js/js.translator/testFiles/expression/function/cases/enclosingThis.kt index 734a7021bad..3049151e56d 100644 --- a/js/js.translator/testFiles/expression/function/cases/enclosingThis.kt +++ b/js/js.translator/testFiles/expression/function/cases/enclosingThis.kt @@ -1,8 +1,8 @@ package foo class Point(val x: Int, val y: Int) { - fun mul(): (scalar: Int)->Point { - return { (scalar: Int):Point -> Point(x * scalar, y * scalar) } + fun mul(): (scalar: Int) -> Point { + return {(scalar: Int): Point -> Point(x * scalar, y * scalar) } } } diff --git a/js/js.translator/testFiles/expression/function/cases/expressionAsFunction.kt b/js/js.translator/testFiles/expression/function/cases/expressionAsFunction.kt index a2f0685ae29..de37da41096 100644 --- a/js/js.translator/testFiles/expression/function/cases/expressionAsFunction.kt +++ b/js/js.translator/testFiles/expression/function/cases/expressionAsFunction.kt @@ -2,41 +2,41 @@ package foo import java.util.*; -val d = {(a : Int) -> a + 1} -val p = {(a : Int) -> a * 3} +val d = {(a: Int) -> a + 1 } +val p = {(a: Int) -> a * 3 } val list = ArrayList>(); -fun chain(start : Int) : Int { - var res = start; - for (func in list) { - res = (func)(res); - } - return res; +fun chain(start: Int): Int { + var res = start; + for (func in list) { + res = (func)(res); + } + return res; } -fun box() : Boolean { - if (chain(0) != 0) { - return false; - } - list.add(d); - if (list.get(0)(0) != 1) { - return false; - } - list.add(p); - if (list.get(1)(10) != 30) { - return false; - } - if (chain(0) != 3) { - return false; - } - list.add({it * it}); - list.add({it - 100}); - if (chain(2) != -19) { - return false; - } - if (({(a : Int) -> a * a}(3)) != 9) { - return false; - } - return true; +fun box(): Boolean { + if (chain(0) != 0) { + return false; + } + list.add(d); + if (list.get(0)(0) != 1) { + return false; + } + list.add(p); + if (list.get(1)(10) != 30) { + return false; + } + if (chain(0) != 3) { + return false; + } + list.add({ it * it }); + list.add({ it - 100 }); + if (chain(2) != -19) { + return false; + } + if (({(a: Int) -> a * a }(3)) != 9) { + return false; + } + return true; } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/function/cases/functionInsideFunction.kt b/js/js.translator/testFiles/expression/function/cases/functionInsideFunction.kt index fcb2a69895f..e5fba1e0a5f 100644 --- a/js/js.translator/testFiles/expression/function/cases/functionInsideFunction.kt +++ b/js/js.translator/testFiles/expression/function/cases/functionInsideFunction.kt @@ -1,16 +1,16 @@ package foo -fun box() : Boolean{ +fun box(): Boolean { fun f() = 3 return (((f() + f()) == 6) && (b() == 24)) } -fun b() : Int { +fun b(): Int { - fun a() : Int { + fun a(): Int { fun c() = 4 return c() * 3 } diff --git a/js/js.translator/testFiles/expression/function/cases/functionLiteral.kt b/js/js.translator/testFiles/expression/function/cases/functionLiteral.kt index e27b2e273f9..a86c1cc194f 100644 --- a/js/js.translator/testFiles/expression/function/cases/functionLiteral.kt +++ b/js/js.translator/testFiles/expression/function/cases/functionLiteral.kt @@ -1,8 +1,8 @@ package foo -fun box() : Boolean { - var sum = 0 - val addFive = {(a: Int) -> a + 5 } - sum = addFive(sum) - return sum == 5 +fun box(): Boolean { + var sum = 0 + val addFive = {(a: Int) -> a + 5 } + sum = addFive(sum) + return sum == 5 } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/function/cases/functionLiteralAsLastParameter.kt b/js/js.translator/testFiles/expression/function/cases/functionLiteralAsLastParameter.kt index c5b9d7d09ba..5d66d96ca70 100644 --- a/js/js.translator/testFiles/expression/function/cases/functionLiteralAsLastParameter.kt +++ b/js/js.translator/testFiles/expression/function/cases/functionLiteralAsLastParameter.kt @@ -8,7 +8,7 @@ fun box(): Boolean { 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/functionLiteralAsParameter.kt b/js/js.translator/testFiles/expression/function/cases/functionLiteralAsParameter.kt index 3fb7b7ae0e4..152291558e7 100644 --- a/js/js.translator/testFiles/expression/function/cases/functionLiteralAsParameter.kt +++ b/js/js.translator/testFiles/expression/function/cases/functionLiteralAsParameter.kt @@ -1,10 +1,10 @@ package foo -fun apply(f : (Int) -> Int, t : Int) : Int { +fun apply(f: (Int) -> Int, t: Int): Int { return f(t) } -fun box() : Boolean { - return apply({(a: Int) -> a + 5 }, 3) == 8 +fun box(): Boolean { + return apply({(a: Int) -> a + 5 }, 3) == 8 } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/function/cases/functionUsedBeforeDeclaration.kt b/js/js.translator/testFiles/expression/function/cases/functionUsedBeforeDeclaration.kt index a093c854230..2e8a2bd6bbd 100644 --- a/js/js.translator/testFiles/expression/function/cases/functionUsedBeforeDeclaration.kt +++ b/js/js.translator/testFiles/expression/function/cases/functionUsedBeforeDeclaration.kt @@ -1,13 +1,12 @@ package foo -fun box() : Boolean -{ +fun box(): Boolean { return f() } -fun f() : Boolean { - return true +fun f(): Boolean { + return true } diff --git a/js/js.translator/testFiles/expression/function/cases/functionWithTwoParametersCall.kt b/js/js.translator/testFiles/expression/function/cases/functionWithTwoParametersCall.kt index 4c82f64892f..6d1f4c2d66d 100644 --- a/js/js.translator/testFiles/expression/function/cases/functionWithTwoParametersCall.kt +++ b/js/js.translator/testFiles/expression/function/cases/functionWithTwoParametersCall.kt @@ -1,9 +1,9 @@ package foo -fun sum(param1 : Int, param2 : Int) : Int { +fun sum(param1: Int, param2: Int): Int { return param1 + param2; } -fun box() : Boolean { +fun box(): Boolean { return (sum(1, 5) == 6) } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/function/cases/implicitItParameter.kt b/js/js.translator/testFiles/expression/function/cases/implicitItParameter.kt index ecfbeb19844..60486f275c5 100644 --- a/js/js.translator/testFiles/expression/function/cases/implicitItParameter.kt +++ b/js/js.translator/testFiles/expression/function/cases/implicitItParameter.kt @@ -1,12 +1,12 @@ package foo -fun test(f : (Int) -> Boolean, p : Int) = f(p) +fun test(f: (Int) -> Boolean, p: Int) = f(p) -fun box() : Boolean { - if (!test({it + 1 == 2}, 1)) return false; +fun box(): Boolean { + if (!test({ it + 1 == 2 }, 1)) return false; - if (!test({it > 1}, 3)) return false; + if (!test({ it > 1 }, 3)) return false; - return (test({((it < 1) == false)}, 1)) + return (test({ ((it < 1) == false) }, 1)) } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/function/cases/mangling.kt b/js/js.translator/testFiles/expression/function/cases/mangling.kt index 74fb71a7da6..2b11ffdf5a8 100644 --- a/js/js.translator/testFiles/expression/function/cases/mangling.kt +++ b/js/js.translator/testFiles/expression/function/cases/mangling.kt @@ -1,96 +1,138 @@ package foo -public fun public_baz(i: Int) {} -native public fun public_baz(a: String) {} +public fun public_baz(i: Int) { +} +native public fun public_baz(a: String) { +} -fun internal_baz(i: Int) {} -native fun internal_baz(a: String) {} +fun internal_baz(i: Int) { +} +native fun internal_baz(a: String) { +} -private fun private_baz(i: Int) {} -native private fun private_baz(a: String) {} +private fun private_baz(i: Int) { +} +native private fun private_baz(a: String) { +} public class PublicClass { - public fun public_baz(i: Int) {} - native public fun public_baz(a: String) {} + public fun public_baz(i: Int) { + } + native public fun public_baz(a: String) { + } - fun internal_baz(i: Int) {} - native fun internal_baz(a: String) {} + fun internal_baz(i: Int) { + } + native fun internal_baz(a: String) { + } - private fun private_baz(i: Int) {} - native private fun private_baz(a: String) {} + private fun private_baz(i: Int) { + } + native private fun private_baz(a: String) { + } - val call_private_baz = { private_baz(0)} - val call_private_native_baz = { private_baz("native")} + val call_private_baz = { private_baz(0) } + val call_private_native_baz = { private_baz("native") } } class InternalClass { - public fun public_baz(i: Int) {} - native public fun public_baz(a: String) {} + public fun public_baz(i: Int) { + } + native public fun public_baz(a: String) { + } - fun internal_baz(i: Int) {} - native fun internal_baz(a: String) {} + fun internal_baz(i: Int) { + } + native fun internal_baz(a: String) { + } - private fun private_baz(i: Int) {} - native private fun private_baz(a: String) {} + private fun private_baz(i: Int) { + } + native private fun private_baz(a: String) { + } - val call_private_baz = { private_baz(0)} - val call_private_native_baz = { private_baz("native")} + val call_private_baz = { private_baz(0) } + val call_private_native_baz = { private_baz("native") } } private class PrivateClass { - public fun public_baz(i: Int) {} - native public fun public_baz(a: String) {} + public fun public_baz(i: Int) { + } + native public fun public_baz(a: String) { + } - fun internal_baz(i: Int) {} - native fun internal_baz(a: String) {} + fun internal_baz(i: Int) { + } + native fun internal_baz(a: String) { + } - private fun private_baz(i: Int) {} - native private fun private_baz(a: String) {} + private fun private_baz(i: Int) { + } + native private fun private_baz(a: String) { + } - val call_private_baz = { private_baz(0)} - val call_private_native_baz = { private_baz("native")} + val call_private_baz = { private_baz(0) } + val call_private_native_baz = { private_baz("native") } } open public class OpenPublicClass { - public fun public_baz(i: Int) {} - native public fun public_baz(a: String) {} + public fun public_baz(i: Int) { + } + native public fun public_baz(a: String) { + } - fun internal_baz(i: Int) {} - native fun internal_baz(a: String) {} + fun internal_baz(i: Int) { + } + native fun internal_baz(a: String) { + } - private fun private_baz(i: Int) {} - native private fun private_baz(a: String) {} + private fun private_baz(i: Int) { + } + native private fun private_baz(a: String) { + } - val call_private_baz = { private_baz(0)} - val call_private_native_baz = { private_baz("native")} + val call_private_baz = { private_baz(0) } + val call_private_native_baz = { private_baz("native") } } open class OpenInternalClass { - public fun public_baz(i: Int) {} - native public fun public_baz(a: String) {} + public fun public_baz(i: Int) { + } + native public fun public_baz(a: String) { + } - fun internal_baz(i: Int) {} - native fun internal_baz(a: String) {} + fun internal_baz(i: Int) { + } + native fun internal_baz(a: String) { + } - private fun private_baz(i: Int) {} - native private fun private_baz(a: String) {} + private fun private_baz(i: Int) { + } + native private fun private_baz(a: String) { + } - val call_private_baz = { private_baz(0)} - val call_private_native_baz = { private_baz("native")} + val call_private_baz = { private_baz(0) } + val call_private_native_baz = { private_baz("native") } } open private class OpenPrivateClass { - public fun public_baz(i: Int) {} - native public fun public_baz(a: String) {} + public fun public_baz(i: Int) { + } + native public fun public_baz(a: String) { + } - fun internal_baz(i: Int) {} - native fun internal_baz(a: String) {} + fun internal_baz(i: Int) { + } + native fun internal_baz(a: String) { + } - private fun private_baz(i: Int) {} - native private fun private_baz(a: String) {} + private fun private_baz(i: Int) { + } + native private fun private_baz(a: String) { + } - val call_private_baz = { private_baz(0)} - val call_private_native_baz = { private_baz("native")} + val call_private_baz = { private_baz(0) } + val call_private_native_baz = { private_baz("native") } } // Helpers @@ -119,7 +161,7 @@ fun Function0.extractNames(): Array { var testGroup = "" -fun test(expected: String, f: ()->Unit){ +fun test(expected: String, f: () -> Unit) { val actual = f.extractNames() if (expected != actual[1]) { @@ -127,7 +169,8 @@ fun test(expected: String, f: ()->Unit){ } } -public fun stable_mangled_baz(i: Int) {} +public fun stable_mangled_baz(i: Int) { +} val SIMPLE = "baz" val SIMPLE1 = "${SIMPLE}_1" @@ -136,12 +179,12 @@ val STABLE = { stable_mangled_baz(0) }.extractNames()[1] fun box(): String { testGroup = "Top Level" - test(STABLE) { public_baz(0) } - test(NATIVE) { public_baz("native") } + test(STABLE) { public_baz(0) } + test(NATIVE) { public_baz("native") } test(SIMPLE1) { internal_baz(0) } - test(NATIVE) { internal_baz("native") } + test(NATIVE) { internal_baz("native") } test(SIMPLE1) { private_baz(0) } - test(NATIVE) { private_baz("native") } + test(NATIVE) { private_baz("native") } testGroup = "Public Class" test(STABLE) { PublicClass().public_baz(0) } diff --git a/js/js.translator/testFiles/expression/function/cases/manglingAnyMethods.kt b/js/js.translator/testFiles/expression/function/cases/manglingAnyMethods.kt index 7e24eafb27b..54d987908d7 100644 --- a/js/js.translator/testFiles/expression/function/cases/manglingAnyMethods.kt +++ b/js/js.translator/testFiles/expression/function/cases/manglingAnyMethods.kt @@ -58,7 +58,7 @@ fun Function0.extractNames(): Array { var testGroup = "" -fun test(expected: String, f: ()->Unit){ +fun test(expected: String, f: () -> Unit) { val actual = f.extractNames() if (expected != actual[1]) { @@ -70,8 +70,8 @@ val SIMPLE_EQUALS = "equals" val SIMPLE_HASH_CODE = "hashCode" val SIMPLE_TO_STRING = "toString" val STABLE_EQUALS = { equals(0) }.extractNames()[1] -val STABLE_HASH_CODE = { hashCode()}.extractNames()[1] -val STABLE_TO_STRING = { toString()}.extractNames()[1] +val STABLE_HASH_CODE = { hashCode() }.extractNames()[1] +val STABLE_TO_STRING = { toString() }.extractNames()[1] fun box(): String { testGroup = "Public Class" diff --git a/js/js.translator/testFiles/expression/function/cases/manglingStability.kt b/js/js.translator/testFiles/expression/function/cases/manglingStability.kt index 357fee4b80f..c9e107afe37 100644 --- a/js/js.translator/testFiles/expression/function/cases/manglingStability.kt +++ b/js/js.translator/testFiles/expression/function/cases/manglingStability.kt @@ -126,7 +126,7 @@ class RegExp(regexp: String, flags: String) //Testing -fun test(testName: String, ff: Any, fb: Any){ +fun test(testName: String, ff: Any, fb: Any) { val f = ff.toString() val b = fb.toString().replaceAll("boo", "foo") @@ -135,7 +135,7 @@ fun test(testName: String, ff: Any, fb: Any){ fun box(): String { test("internal", internal_f, internal_b) - test("public", public_f,public_b ) + test("public", public_f, public_b) test("private", private_f, private_b) test("mixed", mixed_f, mixed_b) diff --git a/js/js.translator/testFiles/expression/function/cases/namedArguments.kt b/js/js.translator/testFiles/expression/function/cases/namedArguments.kt index 5511e10825f..9fc4fe73343 100644 --- a/js/js.translator/testFiles/expression/function/cases/namedArguments.kt +++ b/js/js.translator/testFiles/expression/function/cases/namedArguments.kt @@ -2,14 +2,14 @@ package foo fun test(x: Int, y: Int) = y - x -fun box() : Boolean { - if (test(1,2) != 1) { +fun box(): Boolean { + if (test(1, 2) != 1) { return false; } - if (test(x=1, y=2) != 1) { + if (test(x = 1, y = 2) != 1) { return false; } - if (test(y=2, x=1) != 1) { + if (test(y = 2, x = 1) != 1) { return false; } return true diff --git a/js/js.translator/testFiles/expression/function/cases/vararg.kt b/js/js.translator/testFiles/expression/function/cases/vararg.kt index 58796e61419..e5fa1db2bcc 100644 --- a/js/js.translator/testFiles/expression/function/cases/vararg.kt +++ b/js/js.translator/testFiles/expression/function/cases/vararg.kt @@ -1,31 +1,31 @@ package foo -fun testSize(expectedSize : Int, vararg i : Int) : Boolean { +fun testSize(expectedSize: Int, vararg i: Int): Boolean { return (i.size == expectedSize) } -fun testSum(expectedSum : Int, vararg i : Int) : Boolean { +fun testSum(expectedSum: Int, vararg i: Int): Boolean { var sum = 0 - for (j in i) { - sum += j - } + for (j in i) { + sum += j + } - return (expectedSum == sum) + return (expectedSum == sum) } -fun testSpreadOperator(vararg args : Int): Boolean { - var sum = 0; - for (a in args) sum += a +fun testSpreadOperator(vararg args: Int): Boolean { + var sum = 0; + for (a in args) sum += a - return testSize(args.size, *args) && testSum(sum, *args) + return testSize(args.size, *args) && testSum(sum, *args) } class Bar(val size: Int, val sum: Int) { - fun test(vararg args : Int) = testSize(size, *args) && testSum(sum, *args) + fun test(vararg args: Int) = testSize(size, *args) && testSum(sum, *args) } object obj { - fun test(size: Int, sum: Int, vararg args: Int) = testSize(size, *args) && testSum(sum, *args) + fun test(size: Int, sum: Int, vararg args: Int) = testSize(size, *args) && testSum(sum, *args) } fun spreadInMethodCall(size: Int, sum: Int, vararg args: Int) = Bar(size, sum).test(*args) @@ -35,35 +35,35 @@ fun spreadInObjectMethodCall(size: Int, sum: Int, vararg args: Int) = obj.test(s fun testVarargWithFunLit(vararg args: Int, f: (a: IntArray) -> Boolean): Boolean = f(args) fun box(): String { - if (!testSize(0)) - return "wrong vararg size when call function without args" + if (!testSize(0)) + return "wrong vararg size when call function without args" - if (!testSum(0)) - return "wrong vararg sum (arguments) when call function without args" + if (!testSum(0)) + return "wrong vararg sum (arguments) when call function without args" - if (!testSize(6, 1, 1, 1, 2, 3, 4)) - return "wrong vararg size when call function with some args (1)" + if (!testSize(6, 1, 1, 1, 2, 3, 4)) + return "wrong vararg size when call function with some args (1)" - if (!testSum(30, 10, 20, 0)) - return "wrong vararg sum (arguments) when call function with some args (1)" + if (!testSum(30, 10, 20, 0)) + return "wrong vararg sum (arguments) when call function with some args (1)" - if (!testSpreadOperator(30, 10, 20, 0)) - return "failed when call function using spread operator" + if (!testSpreadOperator(30, 10, 20, 0)) + return "failed when call function using spread operator" - if (!Bar(3, 30).test(10, 20, 0)) - return "failed when call method" + if (!Bar(3, 30).test(10, 20, 0)) + return "failed when call method" - if (!spreadInMethodCall(2, 3, 1, 2)) - return "failed when call method using spread operator" + if (!spreadInMethodCall(2, 3, 1, 2)) + return "failed when call method using spread operator" - if (!obj.test(5, 15, 1, 2, 3, 4, 5)) - return "failed when call method of object" + if (!obj.test(5, 15, 1, 2, 3, 4, 5)) + return "failed when call method of object" - if (!spreadInObjectMethodCall(2, 3, 1, 2)) - return "failed when call method of object using spread operator" + if (!spreadInObjectMethodCall(2, 3, 1, 2)) + return "failed when call method of object using spread operator" - if (!testVarargWithFunLit(1, 2, 3) { args -> args.size == 3 }) - return "failed when call function with vararg and fun literal" + if (!testVarargWithFunLit(1, 2, 3) { args -> args.size == 3 }) + return "failed when call function with vararg and fun literal" - return "OK" + return "OK" } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/invoke/cases/explicitInvokeLambda.kt b/js/js.translator/testFiles/expression/invoke/cases/explicitInvokeLambda.kt index 2984cc835da..972c8faa2b0 100644 --- a/js/js.translator/testFiles/expression/invoke/cases/explicitInvokeLambda.kt +++ b/js/js.translator/testFiles/expression/invoke/cases/explicitInvokeLambda.kt @@ -1,6 +1,6 @@ package foo -fun box() : String { - var foo = { (x: String) -> x + "K" } +fun box(): String { + var foo = {(x: String) -> x + "K" } return foo.invoke("O") } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/invoke/cases/invokeMethod.kt b/js/js.translator/testFiles/expression/invoke/cases/invokeMethod.kt index 62471ada5df..30466eb98f9 100644 --- a/js/js.translator/testFiles/expression/invoke/cases/invokeMethod.kt +++ b/js/js.translator/testFiles/expression/invoke/cases/invokeMethod.kt @@ -6,7 +6,7 @@ class Foo(val postfix: String) { } } -fun box() : String { +fun box(): String { val a = Foo(" world!") return a("hello") } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/misc/cases/KT-1052-2.kt b/js/js.translator/testFiles/expression/misc/cases/KT-1052-2.kt index 2694450b1ee..b3d1ba3830f 100644 --- a/js/js.translator/testFiles/expression/misc/cases/KT-1052-2.kt +++ b/js/js.translator/testFiles/expression/misc/cases/KT-1052-2.kt @@ -1,6 +1,6 @@ package foo -fun box() : Boolean { +fun box(): Boolean { if (!true.and(true)) { return false; @@ -32,21 +32,21 @@ fun box() : Boolean { return false; } if (!true.xor(false)) { - return false; - } + return false; + } if (true.xor(true)) { - return false; - } + return false; + } - if (true.not()) { - return false; + if (true.not()) { + return false; - } + } - if (!false.not()) { - return false; - } + if (!false.not()) { + return false; + } - return true; + return true; } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/misc/cases/KT-1052.kt b/js/js.translator/testFiles/expression/misc/cases/KT-1052.kt index c8dd1669711..078aee182d1 100644 --- a/js/js.translator/testFiles/expression/misc/cases/KT-1052.kt +++ b/js/js.translator/testFiles/expression/misc/cases/KT-1052.kt @@ -1,17 +1,17 @@ -fun main(args : Array) { +fun main(args: Array) { println(true.and1(true)) } -fun Boolean.and1(other : Boolean) : Boolean{ - if(other == true) { - if(this == true){ - return true ; - } - else{ - return false; +fun Boolean.and1(other: Boolean): Boolean { + if (other == true) { + if (this == true) { + return true ; + } + else { + return false; + } + } + else { + return false; } - } - else { - return false; - } } 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 699b6bf6f2d..9c9b1c17ce7 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 @@ -15,7 +15,7 @@ class Data(val rawData: Array, val width: Int, val height: Int) { 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,7 +24,7 @@ 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 @@ -37,7 +37,7 @@ trait ColorLike { } fun box(): Boolean { - val d = Data(Array(4) {0}, 1, 1) + val d = Data(Array(4) { 0 }, 1, 1) if (d[0, 0].red != 0) { return false } diff --git a/js/js.translator/testFiles/expression/misc/cases/KT-1865.kt b/js/js.translator/testFiles/expression/misc/cases/KT-1865.kt index 9f87cb1ea1b..d993fc40926 100644 --- a/js/js.translator/testFiles/expression/misc/cases/KT-1865.kt +++ b/js/js.translator/testFiles/expression/misc/cases/KT-1865.kt @@ -1,11 +1,11 @@ package foo open class A { - open fun foo(a : Int = 1) = a + open fun foo(a: Int = 1) = a } class B : A() { - override fun foo(a : Int) = a + 1 + override fun foo(a: Int) = a + 1 } fun box() = (B().foo() == 2) \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/misc/cases/KT-2314.kt b/js/js.translator/testFiles/expression/misc/cases/KT-2314.kt index 040df59e237..46fb084ef52 100644 --- a/js/js.translator/testFiles/expression/misc/cases/KT-2314.kt +++ b/js/js.translator/testFiles/expression/misc/cases/KT-2314.kt @@ -5,13 +5,13 @@ import java.util.* fun box(): Boolean { val data = arrayList("foo", "bar") if (data.head != "foo") { - return false + return false } return true } -public inline fun arrayList(vararg values: T) : ArrayList { +public inline fun arrayList(vararg values: T): ArrayList { val c = ArrayList() for (v in values) { c.add(v) @@ -19,7 +19,7 @@ public inline fun arrayList(vararg values: T) : ArrayList { return c } -public inline val ArrayList.head : T +public inline val ArrayList.head: T get() { - return get(0) + return get(0) } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/misc/cases/KT-740-3.kt b/js/js.translator/testFiles/expression/misc/cases/KT-740-3.kt index 182592dc1fe..dc75251f6c7 100644 --- a/js/js.translator/testFiles/expression/misc/cases/KT-740-3.kt +++ b/js/js.translator/testFiles/expression/misc/cases/KT-740-3.kt @@ -6,22 +6,22 @@ var c2 = 0 class A() { var p = 0 - fun divAssign(a : Int) { + fun divAssign(a: Int) { c1++; } - fun times(a : Int) : A { + fun times(a: Int): A { c2++; return this; } } -var a : A = A() -get() { - c0++ - return $a -} +var a: A = A() + get() { + c0++ + return $a + } -fun box() : String { +fun box(): String { a /= 3 if (c0 != 1) { @@ -35,7 +35,7 @@ fun box() : String { return "3" } if (c2 != 1) { - return "4" + return "4" } return "OK" } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/misc/cases/KT-740.kt b/js/js.translator/testFiles/expression/misc/cases/KT-740.kt index 0b666fa616f..e2d200827bd 100644 --- a/js/js.translator/testFiles/expression/misc/cases/KT-740.kt +++ b/js/js.translator/testFiles/expression/misc/cases/KT-740.kt @@ -4,19 +4,19 @@ var c = 0 class A() { var p = 0; - { - c++; - } + { + c++; + } } -fun box() : Boolean { - ++A().p - if (c != 1) { - return false; - } - --A().p +fun box(): Boolean { + ++A().p + if (c != 1) { + return false; + } + --A().p if (c != 2) { return false; } - return true + return true } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/misc/cases/KT-817.kt b/js/js.translator/testFiles/expression/misc/cases/KT-817.kt index 1c0c7a4b250..e5168bdb557 100644 --- a/js/js.translator/testFiles/expression/misc/cases/KT-817.kt +++ b/js/js.translator/testFiles/expression/misc/cases/KT-817.kt @@ -9,7 +9,7 @@ class Range() { fun next() = start + if (reversed) -(--count) else (--count); } -fun box() : Boolean { +fun box(): Boolean { val r = Range() if (r.next() != 9) { return false; diff --git a/js/js.translator/testFiles/expression/misc/cases/elvis.kt b/js/js.translator/testFiles/expression/misc/cases/elvis.kt index 0f130c6039f..945636d7af4 100644 --- a/js/js.translator/testFiles/expression/misc/cases/elvis.kt +++ b/js/js.translator/testFiles/expression/misc/cases/elvis.kt @@ -1,21 +1,21 @@ package foo -fun box() : Boolean { - if (f(null) != false) { - return false; - } - if (f(2) != true) { - return false; - } - if (f(1) != false) { - return true; - } - return true +fun box(): Boolean { + if (f(null) != false) { + return false; + } + if (f(2) != true) { + return false; + } + if (f(1) != false) { + return true; + } + return true } fun Int.isEven() = (this % 2) == 0 -fun f(a : Int?) : Boolean { - return a?.isEven() ?: false +fun f(a: Int?): Boolean { + return a?.isEven() ?: false } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/misc/cases/exclExcl.kt b/js/js.translator/testFiles/expression/misc/cases/exclExcl.kt index 98447c129a6..86331bbeca4 100644 --- a/js/js.translator/testFiles/expression/misc/cases/exclExcl.kt +++ b/js/js.translator/testFiles/expression/misc/cases/exclExcl.kt @@ -1,8 +1,8 @@ package foo -fun box() : Boolean { - val a : Int? = 0 +fun box(): Boolean { + val a: Int? = 0 - return (a!! + 3) == 3 + return (a!! + 3) == 3 } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/misc/cases/exclExclResultIsComputedOnce.kt b/js/js.translator/testFiles/expression/misc/cases/exclExclResultIsComputedOnce.kt index 6fa48df9b58..1051f1192df 100644 --- a/js/js.translator/testFiles/expression/misc/cases/exclExclResultIsComputedOnce.kt +++ b/js/js.translator/testFiles/expression/misc/cases/exclExclResultIsComputedOnce.kt @@ -2,11 +2,11 @@ package foo var c = 0 val a: Int? - get() { - c++ - return 2 - } + get() { + c++ + return 2 + } -fun box() : Boolean { - return c == 0 && (a!! + 3) == 5 && c == 1 +fun box(): Boolean { + return c == 0 && (a!! + 3) == 5 && c == 1 } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/misc/cases/exclExclThrows.kt b/js/js.translator/testFiles/expression/misc/cases/exclExclThrows.kt index 08bc45ebea7..46f332d56c9 100644 --- a/js/js.translator/testFiles/expression/misc/cases/exclExclThrows.kt +++ b/js/js.translator/testFiles/expression/misc/cases/exclExclThrows.kt @@ -1,8 +1,8 @@ package foo -fun box() : Boolean { - val a : Int? = null +fun box(): Boolean { + val a: Int? = null - return (a!! + 3) == 3 + return (a!! + 3) == 3 } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/misc/cases/extensionLiteralCalledInsideExtensionFunction.kt b/js/js.translator/testFiles/expression/misc/cases/extensionLiteralCalledInsideExtensionFunction.kt index fe46faf30df..5a9974dfb48 100644 --- a/js/js.translator/testFiles/expression/misc/cases/extensionLiteralCalledInsideExtensionFunction.kt +++ b/js/js.translator/testFiles/expression/misc/cases/extensionLiteralCalledInsideExtensionFunction.kt @@ -1,18 +1,18 @@ package foo -fun A.create(init : A.() -> Unit) : A { - init() - return this +fun A.create(init: A.() -> Unit): A { + init() + return this } -fun box() : Boolean { - val a = A().create { - c = 1 + t - } - return a.c == 4 +fun box(): Boolean { + val a = A().create { + c = 1 + t + } + return a.c == 4 } class A() { - val t = 3 - var c = 2 + val t = 3 + var c = 2 } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/misc/cases/extensionLiteralCreatedAtPackageLevel.kt b/js/js.translator/testFiles/expression/misc/cases/extensionLiteralCreatedAtPackageLevel.kt index 1f1bbb2117c..7ac6c19926c 100644 --- a/js/js.translator/testFiles/expression/misc/cases/extensionLiteralCreatedAtPackageLevel.kt +++ b/js/js.translator/testFiles/expression/misc/cases/extensionLiteralCreatedAtPackageLevel.kt @@ -1,17 +1,17 @@ package foo class A() { - fun foo() = 1 - fun a(f : A.()->Int) : Int { - return f() - } + fun foo() = 1 + fun a(f: A.() -> Int): Int { + return f() + } } var d = 0 -val p : A.()->Int = { - d = foo() - d++ +val p: A.() -> Int = { + d = foo() + d++ } val c = A().a(p) diff --git a/js/js.translator/testFiles/expression/misc/cases/funInConstructor.kt b/js/js.translator/testFiles/expression/misc/cases/funInConstructor.kt index c77cc52ba7b..0483f125ade 100644 --- a/js/js.translator/testFiles/expression/misc/cases/funInConstructor.kt +++ b/js/js.translator/testFiles/expression/misc/cases/funInConstructor.kt @@ -3,9 +3,10 @@ package foo class A() { fun lold() = true - val p = {{ - lold() - }() + val p = { + { + lold() + }() } } diff --git a/js/js.translator/testFiles/expression/misc/cases/funInConstructorBlock.kt b/js/js.translator/testFiles/expression/misc/cases/funInConstructorBlock.kt index ac416808bf6..24a288efc6e 100644 --- a/js/js.translator/testFiles/expression/misc/cases/funInConstructorBlock.kt +++ b/js/js.translator/testFiles/expression/misc/cases/funInConstructorBlock.kt @@ -2,9 +2,9 @@ package foo class A() { fun lold() = true - val p: ()->Boolean + val p: () -> Boolean { - $p = {{lold()}()} + $p = { { lold() }() } } } diff --git a/js/js.translator/testFiles/expression/misc/cases/functionExpression.kt b/js/js.translator/testFiles/expression/misc/cases/functionExpression.kt index ec7a4146568..36fb93aadcf 100644 --- a/js/js.translator/testFiles/expression/misc/cases/functionExpression.kt +++ b/js/js.translator/testFiles/expression/misc/cases/functionExpression.kt @@ -1,28 +1,28 @@ package foo -fun Any.foo1() : ()-> String { - return { "239" + this } +fun Any.foo1(): () -> String { + return { "239" + this } } -fun Int.foo2() : (i : Int) -> Int { - return { x -> x + this } +fun Int.foo2(): (i: Int) -> Int { + return { x -> x + this } } -fun fooT1(t : T) = { t.toString() } +fun fooT1(t: T) = { t.toString() } -fun fooT2(t: T) = { (x:T) -> t.toString() + x.toString() } +fun fooT2(t: T) = {(x: T) -> t.toString() + x.toString() } -fun box() : Any? { - if( (10.foo1())() != "23910") return "foo1 fail" - if( (10.foo2())(1) != 11 ) return "foo2 fail" +fun box(): Any? { + if ( (10.foo1())() != "23910") return "foo1 fail" + if ( (10.foo2())(1) != 11 ) return "foo2 fail" - if(1.{Int.() -> this + 1}() != 2) return "test 3 failed"; - if( {1}() != 1) return "test 4 failed"; - if( {(x : Int) -> x}(1) != 1) return "test 5 failed"; - if( 1.{Int.(x : Int) -> x + this}(1) != 2) return "test 6 failed"; - val tmp = 1.({Int.() -> this})() - if(tmp != 1) return "test 7 failed, res: $tmp ${tmp is Int}"; - if( (fooT1("mama"))() != "mama") return "test 8 failed"; - if( (fooT2("mama"))("papa") != "mamapapa") return "test 9 failed"; - return "OK" + if (1.{ Int.() -> this + 1 }() != 2) return "test 3 failed"; + if ( { 1 }() != 1) return "test 4 failed"; + if ( {(x: Int) -> x }(1) != 1) return "test 5 failed"; + if ( 1.{ Int.(x: Int) -> x + this }(1) != 2) return "test 6 failed"; + val tmp = 1.({ Int.() -> this })() + if (tmp != 1) return "test 7 failed, res: $tmp ${tmp is Int}"; + if ( (fooT1("mama"))() != "mama") return "test 8 failed"; + if ( (fooT2("mama"))("papa") != "mamapapa") return "test 9 failed"; + return "OK" } diff --git a/js/js.translator/testFiles/expression/misc/cases/inheritFromJetIterator.kt b/js/js.translator/testFiles/expression/misc/cases/inheritFromJetIterator.kt index 50439e5a594..4151df02e5a 100644 --- a/js/js.translator/testFiles/expression/misc/cases/inheritFromJetIterator.kt +++ b/js/js.translator/testFiles/expression/misc/cases/inheritFromJetIterator.kt @@ -1,9 +1,9 @@ package foo class TabIterator : Iterator { - override fun hasNext():Boolean = false + override fun hasNext(): Boolean = false - override fun next():Any? { + override fun next(): Any? { return null } } diff --git a/js/js.translator/testFiles/expression/misc/cases/intRange.kt b/js/js.translator/testFiles/expression/misc/cases/intRange.kt index eb8e627da85..c3d1c1cf5ab 100644 --- a/js/js.translator/testFiles/expression/misc/cases/intRange.kt +++ b/js/js.translator/testFiles/expression/misc/cases/intRange.kt @@ -2,16 +2,17 @@ package foo import js.* -class RangeIterator(val start : Int, var count : Int, val reversed : Boolean) { +class RangeIterator(val start: Int, var count: Int, val reversed: Boolean) { var i = start - fun next() : Int { + fun next(): Int { --count if (reversed) { i-- return i + 1 - } else { + } + else { i++ return i - 1 } @@ -21,15 +22,16 @@ class RangeIterator(val start : Int, var count : Int, val reversed : Boolean) { fun hasNext() = (count > 0); } -class NumberRange(val start : Int, val size : Int, val reversed : Boolean) { +class NumberRange(val start: Int, val size: Int, val reversed: Boolean) { - val end : Int - get() = if (reversed) start - size + 1 else start + size - 1 + val end: Int + get() = if (reversed) start - size + 1 else start + size - 1 - fun contains(number : Int) : Boolean { + fun contains(number: Int): Boolean { if (reversed) { return (number <= start) && (number > start - size); - } else { + } + else { return (number >= start) && (number < start + size); } } @@ -38,10 +40,9 @@ class NumberRange(val start : Int, val size : Int, val reversed : Boolean) { } - fun box() = testRange() && testReversedRange(); -fun testRange() : Boolean { +fun testRange(): Boolean { val oneToFive = NumberRange(1, 4, false); if (oneToFive.contains(5)) return false; @@ -70,7 +71,7 @@ fun testRange() : Boolean { } -fun testReversedRange() : Boolean { +fun testReversedRange(): Boolean { println("Testing reversed range."); diff --git a/js/js.translator/testFiles/expression/misc/cases/lazyProperty.kt b/js/js.translator/testFiles/expression/misc/cases/lazyProperty.kt index 16eae2156bf..6838ac0fa67 100644 --- a/js/js.translator/testFiles/expression/misc/cases/lazyProperty.kt +++ b/js/js.translator/testFiles/expression/misc/cases/lazyProperty.kt @@ -1,11 +1,11 @@ -fun main(args : Array) { - println("Hello, world!") - println(p) +fun main(args: Array) { + println("Hello, world!") + println(p) } val p: Int -get() { - println("Gotcha") - return 3 -} \ No newline at end of file + get() { + println("Gotcha") + return 3 + } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/misc/cases/localProperty.kt b/js/js.translator/testFiles/expression/misc/cases/localProperty.kt index 2f69f45afba..a0005c2f171 100644 --- a/js/js.translator/testFiles/expression/misc/cases/localProperty.kt +++ b/js/js.translator/testFiles/expression/misc/cases/localProperty.kt @@ -2,14 +2,13 @@ package foo val y = 3 -fun f(a:Int) : Int { - val x = 42 - val y = 50 +fun f(a: Int): Int { + val x = 42 + val y = 50 - return y + return y } -fun box() : Int -{ +fun box(): Int { return f(y) } diff --git a/js/js.translator/testFiles/expression/misc/cases/localVarAsFunction.kt b/js/js.translator/testFiles/expression/misc/cases/localVarAsFunction.kt index a4c6daaecba..48aeffb3b2d 100644 --- a/js/js.translator/testFiles/expression/misc/cases/localVarAsFunction.kt +++ b/js/js.translator/testFiles/expression/misc/cases/localVarAsFunction.kt @@ -2,17 +2,17 @@ package foo var c = 2 -fun loop(times : Int) { - var left = times - while(left > 0) { - val u : (value : Int) -> Unit = { +fun loop(times: Int) { + var left = times + while (left > 0) { + val u: (value: Int) -> Unit = { c++ } u(left--) - } + } } -fun box() : Any? { +fun box(): Any? { loop(5) return if (c == 7) return "OK" else c } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/misc/cases/mainFunInNestedPackage.kt b/js/js.translator/testFiles/expression/misc/cases/mainFunInNestedPackage.kt index 68f27fdb447..3aa9dd2ed41 100644 --- a/js/js.translator/testFiles/expression/misc/cases/mainFunInNestedPackage.kt +++ b/js/js.translator/testFiles/expression/misc/cases/mainFunInNestedPackage.kt @@ -2,6 +2,6 @@ package a.b.c import js.* -fun main(args : Array) { - println("ayee") +fun main(args: Array) { + println("ayee") } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/misc/cases/packageLevelVarInPackage.kt b/js/js.translator/testFiles/expression/misc/cases/packageLevelVarInPackage.kt index 4732cce011d..d5c9d6174a4 100644 --- a/js/js.translator/testFiles/expression/misc/cases/packageLevelVarInPackage.kt +++ b/js/js.translator/testFiles/expression/misc/cases/packageLevelVarInPackage.kt @@ -6,7 +6,7 @@ fun incC(i: Int) { c += c + i } -fun box() : Any? { +fun box(): Any? { for (i in 0..2) { incC(i) } diff --git a/js/js.translator/testFiles/expression/misc/cases/packageLevelVarInRoot.kt b/js/js.translator/testFiles/expression/misc/cases/packageLevelVarInRoot.kt index b482152fdb2..12c91e0db68 100644 --- a/js/js.translator/testFiles/expression/misc/cases/packageLevelVarInRoot.kt +++ b/js/js.translator/testFiles/expression/misc/cases/packageLevelVarInRoot.kt @@ -4,7 +4,7 @@ fun incC(i: Int) { c += c + i } -fun box() : Any? { +fun box(): Any? { for (i in 0..2) { incC(i) } diff --git a/js/js.translator/testFiles/expression/misc/cases/packagePropertyCalledAsFun.kt b/js/js.translator/testFiles/expression/misc/cases/packagePropertyCalledAsFun.kt index b148cb89d2b..073a35c92b1 100644 --- a/js/js.translator/testFiles/expression/misc/cases/packagePropertyCalledAsFun.kt +++ b/js/js.translator/testFiles/expression/misc/cases/packagePropertyCalledAsFun.kt @@ -2,6 +2,6 @@ package foo fun lold() = true -val p = {{lold()}()} +val p = { { lold() }() } fun box() = p() && foo.p() \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/misc/cases/propertiesWithExplicitlyDefinedAccessorsWithoutBodies.kt b/js/js.translator/testFiles/expression/misc/cases/propertiesWithExplicitlyDefinedAccessorsWithoutBodies.kt index 29a23fa27ad..378777cf676 100644 --- a/js/js.translator/testFiles/expression/misc/cases/propertiesWithExplicitlyDefinedAccessorsWithoutBodies.kt +++ b/js/js.translator/testFiles/expression/misc/cases/propertiesWithExplicitlyDefinedAccessorsWithoutBodies.kt @@ -2,13 +2,13 @@ package foo class A() { - private var c : Int = 3 - private get - private set + private var c: Int = 3 + private get + private set - fun f() = c + 1 + fun f() = c + 1 } -fun box() : Boolean { - return A().f() == 4 +fun box(): Boolean { + return A().f() == 4 } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/misc/cases/propertyAsFunCalledOnConstructor.kt b/js/js.translator/testFiles/expression/misc/cases/propertyAsFunCalledOnConstructor.kt index f07ca55cb79..3c84eaca999 100644 --- a/js/js.translator/testFiles/expression/misc/cases/propertyAsFunCalledOnConstructor.kt +++ b/js/js.translator/testFiles/expression/misc/cases/propertyAsFunCalledOnConstructor.kt @@ -1,10 +1,10 @@ package foo class A() { - val p = {true} + val p = { true } } -fun box() : Boolean { - return A().p() +fun box(): Boolean { + return A().p() } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/misc/cases/safecallComputesExpressionOnlyOnce.kt b/js/js.translator/testFiles/expression/misc/cases/safecallComputesExpressionOnlyOnce.kt index e48f4d2da46..77476b72b02 100644 --- a/js/js.translator/testFiles/expression/misc/cases/safecallComputesExpressionOnlyOnce.kt +++ b/js/js.translator/testFiles/expression/misc/cases/safecallComputesExpressionOnlyOnce.kt @@ -2,9 +2,9 @@ package foo var i = 0 -fun test() : Int? = i++ +fun test(): Int? = i++ -fun box() : Boolean { +fun box(): Boolean { if (i != 0) return false test()?.plus(1) if (i != 1) return false diff --git a/js/js.translator/testFiles/expression/misc/cases/stringInterpolationEvaluationOrder.kt b/js/js.translator/testFiles/expression/misc/cases/stringInterpolationEvaluationOrder.kt index cbb30252f7e..f80820bef8e 100644 --- a/js/js.translator/testFiles/expression/misc/cases/stringInterpolationEvaluationOrder.kt +++ b/js/js.translator/testFiles/expression/misc/cases/stringInterpolationEvaluationOrder.kt @@ -9,16 +9,16 @@ class A() { } fun f(): String { - s += "3" - return "" + s += "3" + return "" } class B() { val a: A - get() { - s += "2" - return A() - } + get() { + s += "2" + return A() + } fun test() { s += "1" diff --git a/js/js.translator/testFiles/expression/string/cases/intInTemplate.kt b/js/js.translator/testFiles/expression/string/cases/intInTemplate.kt index 2fa031bd831..6e609ef5fd7 100644 --- a/js/js.translator/testFiles/expression/string/cases/intInTemplate.kt +++ b/js/js.translator/testFiles/expression/string/cases/intInTemplate.kt @@ -1,6 +1,6 @@ package foo -fun box() : String { +fun box(): String { var number = 3 return ("my age is $number"); } diff --git a/js/js.translator/testFiles/expression/string/cases/kt2227.kt b/js/js.translator/testFiles/expression/string/cases/kt2227.kt index 1b8198cdf38..b260ffc3f73 100644 --- a/js/js.translator/testFiles/expression/string/cases/kt2227.kt +++ b/js/js.translator/testFiles/expression/string/cases/kt2227.kt @@ -1,6 +1,6 @@ package foo fun box(): Boolean { - if ("${3}" != "3") return false - return "${3}" == "3" + if ("${3}" != "3") return false + return "${3}" == "3" } \ No newline at end of file diff --git a/js/js.translator/testFiles/expression/string/cases/kt2227_2.kt b/js/js.translator/testFiles/expression/string/cases/kt2227_2.kt index 7ae8bfb2186..0b0320b1426 100644 --- a/js/js.translator/testFiles/expression/string/cases/kt2227_2.kt +++ b/js/js.translator/testFiles/expression/string/cases/kt2227_2.kt @@ -3,10 +3,10 @@ package foo var i = 0 class A() { - override fun toString(): String { - i++ - return "bar" - } + override fun toString(): String { + i++ + return "bar" + } } fun box(): Boolean { diff --git a/js/js.translator/testFiles/expression/string/cases/multipleExpressionsInTemplate.kt b/js/js.translator/testFiles/expression/string/cases/multipleExpressionsInTemplate.kt index cede8ae7ef9..8c90a477294 100644 --- a/js/js.translator/testFiles/expression/string/cases/multipleExpressionsInTemplate.kt +++ b/js/js.translator/testFiles/expression/string/cases/multipleExpressionsInTemplate.kt @@ -1,6 +1,6 @@ package foo -fun box() : String { +fun box(): String { var right = 2 var left = 3 return ("left = $left\nright = $right\nsum = ${left + right}\n"); diff --git a/js/js.translator/testFiles/expression/string/cases/numbersInTemplate.kt b/js/js.translator/testFiles/expression/string/cases/numbersInTemplate.kt index b2dd0c10838..8f47b0eee0d 100644 --- a/js/js.translator/testFiles/expression/string/cases/numbersInTemplate.kt +++ b/js/js.translator/testFiles/expression/string/cases/numbersInTemplate.kt @@ -1,8 +1,8 @@ package foo -fun box() : String { +fun box(): String { val number = 3 - val s1 = "${number-1}${number}" + val s1 = "${number - 1}${number}" val s2 = "${5}${4}" return "${s1}${s2}" } diff --git a/js/js.translator/testFiles/expression/string/cases/objectToStringCallInTemplate.kt b/js/js.translator/testFiles/expression/string/cases/objectToStringCallInTemplate.kt index 8d4598d7d7a..298dd6cfe8e 100644 --- a/js/js.translator/testFiles/expression/string/cases/objectToStringCallInTemplate.kt +++ b/js/js.translator/testFiles/expression/string/cases/objectToStringCallInTemplate.kt @@ -1,10 +1,10 @@ package foo -class A(var i : Int) { +class A(var i: Int) { override fun toString() = "a$i" } -fun box() : Boolean { +fun box(): Boolean { var p = A(2); var n = A(1); if ("$p$n" != "a2a1") { diff --git a/js/js.translator/testFiles/expression/string/cases/stringAssignment.kt b/js/js.translator/testFiles/expression/string/cases/stringAssignment.kt index 9f3c327965f..ace91c6b4c0 100644 --- a/js/js.translator/testFiles/expression/string/cases/stringAssignment.kt +++ b/js/js.translator/testFiles/expression/string/cases/stringAssignment.kt @@ -1,6 +1,6 @@ package foo -fun box() : Boolean { +fun box(): Boolean { val a = "bar"; var b = "foo"; diff --git a/js/js.translator/testFiles/expression/string/cases/stringConstant.kt b/js/js.translator/testFiles/expression/string/cases/stringConstant.kt index 9961104c902..568a2962308 100644 --- a/js/js.translator/testFiles/expression/string/cases/stringConstant.kt +++ b/js/js.translator/testFiles/expression/string/cases/stringConstant.kt @@ -1,6 +1,6 @@ package foo -fun box() : Boolean { +fun box(): Boolean { val a = "String"; return true; diff --git a/js/js.translator/testFiles/expression/string/cases/stringInTemplate.kt b/js/js.translator/testFiles/expression/string/cases/stringInTemplate.kt index 5a021f9aec2..6046c46c77e 100644 --- a/js/js.translator/testFiles/expression/string/cases/stringInTemplate.kt +++ b/js/js.translator/testFiles/expression/string/cases/stringInTemplate.kt @@ -1,6 +1,6 @@ package foo -fun box() : String { +fun box(): String { var name = "Hello" return ("o${name}o"); } diff --git a/js/js.translator/testFiles/expression/string/cases/stringSplit.kt b/js/js.translator/testFiles/expression/string/cases/stringSplit.kt index 5685dfe1b3d..9362587f4a5 100644 --- a/js/js.translator/testFiles/expression/string/cases/stringSplit.kt +++ b/js/js.translator/testFiles/expression/string/cases/stringSplit.kt @@ -7,27 +7,27 @@ fun F.to(second: S): Pair = Pair(this, second) fun box(): String { val testInput = "test data\t1foo 2 bar" val tests = array( - " " to array("test", "data\t1foo", "", "2", "bar"), - "\\s+" to array("test", "data", "1foo", "2", "bar"), - "[sd]" to array("te", "t ", "ata\t1foo 2 bar"), - "[\\d]" to array("test data\t", "foo ", " bar") + " " to array("test", "data\t1foo", "", "2", "bar"), + "\\s+" to array("test", "data", "1foo", "2", "bar"), + "[sd]" to array("te", "t ", "ata\t1foo 2 bar"), + "[\\d]" to array("test data\t", "foo ", " bar") ) for (test in tests) { - val regexp = test.first - val expected = test.second - val result = testInput.split(regexp) + val regexp = test.first + val expected = test.second + val result = testInput.split(regexp) - if (result != expected) return "Wrong result for '$regexp' -- Expected: $expected | Actual: $result" + if (result != expected) return "Wrong result for '$regexp' -- Expected: $expected | Actual: $result" } for (test in tests) { - val regexp = test.first - val limit = 2 - val expected = Array(limit) { test.second[it] } - val result = testInput.split(regexp, limit) + val regexp = test.first + val limit = 2 + val expected = Array(limit) { test.second[it] } + val result = testInput.split(regexp, limit) - if (result != expected) return "Wrong result for '$regexp' -- Expected: $expected | Actual: $result" + if (result != expected) return "Wrong result for '$regexp' -- Expected: $expected | Actual: $result" } return "OK" diff --git a/js/js.translator/testFiles/expression/stringTemplates/cases/objectWithToString.kt b/js/js.translator/testFiles/expression/stringTemplates/cases/objectWithToString.kt index 73e67172c62..020ba81bdd9 100644 --- a/js/js.translator/testFiles/expression/stringTemplates/cases/objectWithToString.kt +++ b/js/js.translator/testFiles/expression/stringTemplates/cases/objectWithToString.kt @@ -1,9 +1,9 @@ package foo class Foo(val name: String) { - override fun toString(): String { - return name + "S" - } + override public fun toString(): String { + return name + "S" + } } fun box(): String { diff --git a/js/js.translator/testFiles/expression/stringTemplates/cases/stringValues.kt b/js/js.translator/testFiles/expression/stringTemplates/cases/stringValues.kt index 8b0d7e7ef2e..736733f858e 100644 --- a/js/js.translator/testFiles/expression/stringTemplates/cases/stringValues.kt +++ b/js/js.translator/testFiles/expression/stringTemplates/cases/stringValues.kt @@ -2,7 +2,7 @@ package foo // test String template must have one or more entries. public class Fe { - fun open(method:String, url: String, async: Boolean = true, user: String = "", password: String = "") = "$method $url $async $user $password" + fun open(method: String, url: String, async: Boolean = true, user: String = "", password: String = "") = "$method $url $async $user $password" } fun box(): Boolean { diff --git a/js/js.translator/testFiles/expression/toString/cases/toString.kt b/js/js.translator/testFiles/expression/toString/cases/toString.kt index ed4e7d5dbac..fa829164eee 100644 --- a/js/js.translator/testFiles/expression/toString/cases/toString.kt +++ b/js/js.translator/testFiles/expression/toString/cases/toString.kt @@ -7,7 +7,7 @@ class Foo(val name: String) { } } -fun box() : String { +fun box(): String { val a = Foo("James") return a.toString() } \ No newline at end of file diff --git a/js/js.translator/testFiles/extensionFunction/cases/extensionForSuperclass.kt b/js/js.translator/testFiles/extensionFunction/cases/extensionForSuperclass.kt index 35204e71d9e..ce9f53df9b5 100644 --- a/js/js.translator/testFiles/extensionFunction/cases/extensionForSuperclass.kt +++ b/js/js.translator/testFiles/extensionFunction/cases/extensionForSuperclass.kt @@ -4,7 +4,7 @@ open class A() { open fun c() = 2 } -class B(): A() { +class B() : A() { override fun c() = 3 } @@ -12,6 +12,6 @@ fun B.t() = d() + 1 fun A.d() = c() + 3 -fun box() : Boolean { +fun box(): Boolean { return A().d() == 5 && B().d() == 6 && B().t() == 7 } diff --git a/js/js.translator/testFiles/extensionFunction/cases/extensionFunctionCalledFromExtensionFunction.kt b/js/js.translator/testFiles/extensionFunction/cases/extensionFunctionCalledFromExtensionFunction.kt index 028df1d7d1c..1b89fd70f63 100644 --- a/js/js.translator/testFiles/extensionFunction/cases/extensionFunctionCalledFromExtensionFunction.kt +++ b/js/js.translator/testFiles/extensionFunction/cases/extensionFunctionCalledFromExtensionFunction.kt @@ -7,6 +7,6 @@ class A() { fun A.one() = 1 fun A.two() = one() + one() -fun box() : Boolean { +fun box(): Boolean { return (A().two() == 2) } \ No newline at end of file diff --git a/js/js.translator/testFiles/extensionFunction/cases/extensionFunctionOnExpression.kt b/js/js.translator/testFiles/extensionFunction/cases/extensionFunctionOnExpression.kt index 7b3c4b004da..d393571dcc5 100644 --- a/js/js.translator/testFiles/extensionFunction/cases/extensionFunctionOnExpression.kt +++ b/js/js.translator/testFiles/extensionFunction/cases/extensionFunctionOnExpression.kt @@ -1,10 +1,10 @@ package foo -fun Int.same() : Int { +fun Int.same(): Int { return this } -fun Int.quadruple() : Int { +fun Int.quadruple(): Int { return same() * 4; } diff --git a/js/js.translator/testFiles/extensionFunction/cases/extensionInsideFunctionLiteral.kt b/js/js.translator/testFiles/extensionFunction/cases/extensionInsideFunctionLiteral.kt index 9d69e2fd859..1b09621fbd7 100644 --- a/js/js.translator/testFiles/extensionFunction/cases/extensionInsideFunctionLiteral.kt +++ b/js/js.translator/testFiles/extensionFunction/cases/extensionInsideFunctionLiteral.kt @@ -5,14 +5,14 @@ class M() { fun eval() { var d = { - var c = {Int.() -> this + 3} + var c = { Int.() -> this + 3 } m += 3.c() } d(); } } -fun box() : Boolean { +fun box(): Boolean { var a = M() if (a.m != 0) return false; a.eval() diff --git a/js/js.translator/testFiles/extensionFunction/cases/extensionLiteralPassedToFunction.kt b/js/js.translator/testFiles/extensionFunction/cases/extensionLiteralPassedToFunction.kt index f0ddd9aed53..637b7b8e625 100644 --- a/js/js.translator/testFiles/extensionFunction/cases/extensionLiteralPassedToFunction.kt +++ b/js/js.translator/testFiles/extensionFunction/cases/extensionLiteralPassedToFunction.kt @@ -3,5 +3,5 @@ package foo fun apply(i: Int, f: Int.(Int) -> Int) = i.f(1); fun box(): Boolean { - return apply(1, {i -> i + this}) == 2 + return apply(1, { i -> i + this }) == 2 } \ No newline at end of file diff --git a/js/js.translator/testFiles/extensionFunction/cases/extensionOnClassWithExplicitAndImplicitReceiver.kt b/js/js.translator/testFiles/extensionFunction/cases/extensionOnClassWithExplicitAndImplicitReceiver.kt index 98f2d52bee7..37f77669c71 100644 --- a/js/js.translator/testFiles/extensionFunction/cases/extensionOnClassWithExplicitAndImplicitReceiver.kt +++ b/js/js.translator/testFiles/extensionFunction/cases/extensionOnClassWithExplicitAndImplicitReceiver.kt @@ -2,21 +2,21 @@ package foo public class Foo { - public fun blah(): Int { - return 5 - } + public fun blah(): Int { + return 5 + } } -public inline fun Foo.fooImp() : String { - return "impl" + blah() +public inline fun Foo.fooImp(): String { + return "impl" + blah() } -public inline fun Foo.fooExp() : String { - return "expl" + this.blah() +public inline fun Foo.fooExp(): String { + return "expl" + this.blah() } -fun box() : Boolean { +fun box(): Boolean { var a = Foo() if (a.fooImp() != "impl5") return false if (a.fooExp() != "expl5") return false diff --git a/js/js.translator/testFiles/extensionFunction/cases/extensionUsedInsideClass.kt b/js/js.translator/testFiles/extensionFunction/cases/extensionUsedInsideClass.kt index 7e345e3ad93..20710830d01 100644 --- a/js/js.translator/testFiles/extensionFunction/cases/extensionUsedInsideClass.kt +++ b/js/js.translator/testFiles/extensionFunction/cases/extensionUsedInsideClass.kt @@ -1,10 +1,10 @@ package foo -class A(var a : Int) { +class A(var a: Int) { fun eval() = f(); } -fun A.f() : Int { +fun A.f(): Int { a = 3 return 10 } diff --git a/js/js.translator/testFiles/extensionFunction/cases/extensionWithImplicitReceiver.kt b/js/js.translator/testFiles/extensionFunction/cases/extensionWithImplicitReceiver.kt index ccab0e9f2f5..1a7848c2e53 100644 --- a/js/js.translator/testFiles/extensionFunction/cases/extensionWithImplicitReceiver.kt +++ b/js/js.translator/testFiles/extensionFunction/cases/extensionWithImplicitReceiver.kt @@ -1,10 +1,10 @@ package foo -fun Int.same() : Int { +fun Int.same(): Int { return this } -fun Int.quadruple() : Int { +fun Int.quadruple(): Int { return same() * 4; } diff --git a/js/js.translator/testFiles/extensionFunction/cases/generic.kt b/js/js.translator/testFiles/extensionFunction/cases/generic.kt index 206e55f5a43..b50c4593496 100644 --- a/js/js.translator/testFiles/extensionFunction/cases/generic.kt +++ b/js/js.translator/testFiles/extensionFunction/cases/generic.kt @@ -3,22 +3,22 @@ package foo import java.util.* fun ArrayList.findAll(predicate: (T) -> Boolean): ArrayList { - val result = ArrayList() - for(t in this) { - if (predicate(t)) result.add(t) - } - return result + val result = ArrayList() + for (t in this) { + if (predicate(t)) result.add(t) + } + return result } fun box(): String { - val list: ArrayList = ArrayList() + val list: ArrayList = ArrayList() - list.add(2) - list.add(3) - list.add(5) + list.add(2) + list.add(3) + list.add(5) - val m: ArrayList = list.findAll({(name: Int) -> name < 4}) - return if (m.size() == 2) "OK" else "fail" + val m: ArrayList = list.findAll({(name: Int) -> name < 4 }) + return if (m.size() == 2) "OK" else "fail" } diff --git a/js/js.translator/testFiles/extensionFunction/cases/implicitReceiverInExtension.kt b/js/js.translator/testFiles/extensionFunction/cases/implicitReceiverInExtension.kt index b34d5341ac7..fa24a7455fe 100644 --- a/js/js.translator/testFiles/extensionFunction/cases/implicitReceiverInExtension.kt +++ b/js/js.translator/testFiles/extensionFunction/cases/implicitReceiverInExtension.kt @@ -1,7 +1,7 @@ package foo -fun T.toPrefixedString(prefix: String = "", suffix: String="") = prefix + toString() + suffix +fun T.toPrefixedString(prefix: String = "", suffix: String = "") = prefix + toString() + suffix -fun box() : Boolean { - return ("mama".toPrefixedString(suffix="321", prefix="papa") == "papamama321") +fun box(): Boolean { + return ("mama".toPrefixedString(suffix = "321", prefix = "papa") == "papamama321") } diff --git a/js/js.translator/testFiles/extensionFunction/cases/intExtension.kt b/js/js.translator/testFiles/extensionFunction/cases/intExtension.kt index 884014c87aa..ebfa0b2c9bf 100644 --- a/js/js.translator/testFiles/extensionFunction/cases/intExtension.kt +++ b/js/js.translator/testFiles/extensionFunction/cases/intExtension.kt @@ -1,6 +1,6 @@ package foo -fun Int.quadruple() : Int { +fun Int.quadruple(): Int { return this * 4; } diff --git a/js/js.translator/testFiles/extensionFunction/cases/superClassMemberInExtension.kt b/js/js.translator/testFiles/extensionFunction/cases/superClassMemberInExtension.kt index 0901eadadee..fc56b174e97 100644 --- a/js/js.translator/testFiles/extensionFunction/cases/superClassMemberInExtension.kt +++ b/js/js.translator/testFiles/extensionFunction/cases/superClassMemberInExtension.kt @@ -4,11 +4,11 @@ open class A() { open fun c() = 2 } -class B(): A() { +class B() : A() { } fun B.d() = c() + 3 -fun box() : Boolean { +fun box(): Boolean { return B().d() == 5 } diff --git a/js/js.translator/testFiles/extensionFunction/cases/virtualExtension.kt b/js/js.translator/testFiles/extensionFunction/cases/virtualExtension.kt index 383c0191f5f..77718fbd38a 100644 --- a/js/js.translator/testFiles/extensionFunction/cases/virtualExtension.kt +++ b/js/js.translator/testFiles/extensionFunction/cases/virtualExtension.kt @@ -1,8 +1,8 @@ package foo -class A(var a : Int) { +class A(var a: Int) { - fun Int.modify() : Int { + fun Int.modify(): Int { return this * 3; } diff --git a/js/js.translator/testFiles/extensionFunction/cases/virtualExtensionOverride.kt b/js/js.translator/testFiles/extensionFunction/cases/virtualExtensionOverride.kt index e03d60be4b2..2eea0cc8f42 100644 --- a/js/js.translator/testFiles/extensionFunction/cases/virtualExtensionOverride.kt +++ b/js/js.translator/testFiles/extensionFunction/cases/virtualExtensionOverride.kt @@ -9,7 +9,7 @@ open class A(var a: Int) { fun eval() = a.modify(); } -class B(a: Int): A(a) { +class B(a: Int) : A(a) { override fun Int.modify(): Int { return this - 2; } diff --git a/js/js.translator/testFiles/extensionProperty/cases/absExtension.kt b/js/js.translator/testFiles/extensionProperty/cases/absExtension.kt index d0399758498..00bbe54958a 100644 --- a/js/js.translator/testFiles/extensionProperty/cases/absExtension.kt +++ b/js/js.translator/testFiles/extensionProperty/cases/absExtension.kt @@ -1,9 +1,9 @@ package foo; -val Double.abs : Double +val Double.abs: Double get() = if (this > 0) this else -this -fun box() : Boolean { +fun box(): Boolean { if (4.0.abs != 4.0) return false; if ((-5.2).abs != 5.2) return false; diff --git a/js/js.translator/testFiles/extensionProperty/cases/propertyWithGetterAndSetter.kt b/js/js.translator/testFiles/extensionProperty/cases/propertyWithGetterAndSetter.kt index a562b82128b..766d4d6bd7d 100644 --- a/js/js.translator/testFiles/extensionProperty/cases/propertyWithGetterAndSetter.kt +++ b/js/js.translator/testFiles/extensionProperty/cases/propertyWithGetterAndSetter.kt @@ -4,15 +4,15 @@ class Test() { var a = 0 } -var Test.b : Int +var Test.b: Int get() = a * 3 - set(c : Int) { + set(c: Int) { a = c - 1 } -val Test.d : Int = 44 +val Test.d: Int = 44 -fun box() : Boolean { +fun box(): Boolean { val c = Test() if (c.a != 0) return false; if (c.b != 0) return false; diff --git a/js/js.translator/testFiles/extensionProperty/cases/simplePropertyWithGetter.kt b/js/js.translator/testFiles/extensionProperty/cases/simplePropertyWithGetter.kt index 8fbc52a9e0a..eb85eb77335 100644 --- a/js/js.translator/testFiles/extensionProperty/cases/simplePropertyWithGetter.kt +++ b/js/js.translator/testFiles/extensionProperty/cases/simplePropertyWithGetter.kt @@ -1,13 +1,12 @@ package foo -val String.prop : Int - get() = length +val String.prop: Int + get() = length -val Int.quadruple : Int - get() = this * 4 +val Int.quadruple: Int + get() = this * 4 -fun box() : Boolean -{ +fun box(): Boolean { if ("1".prop != 1) return false; if ("11".prop != 2) return false; if (("121" + "123").prop != 6) return false; diff --git a/js/js.translator/testFiles/inheritance/cases/abstractVarOverride.kt b/js/js.translator/testFiles/inheritance/cases/abstractVarOverride.kt index 19e92f0cf7e..e061724b084 100644 --- a/js/js.translator/testFiles/inheritance/cases/abstractVarOverride.kt +++ b/js/js.translator/testFiles/inheritance/cases/abstractVarOverride.kt @@ -1,16 +1,16 @@ package foo open abstract class A() { - abstract var pos : Int; + abstract var pos: Int; } class B() : A() { - override var pos : Int = 2 + override var pos: Int = 2 } -fun box() : Boolean { +fun box(): Boolean { - val a : A = B() + val a: A = B() if (a.pos != 2) { return false; } diff --git a/js/js.translator/testFiles/inheritance/cases/complexInitializationOrder.kt b/js/js.translator/testFiles/inheritance/cases/complexInitializationOrder.kt index 9004131ad03..bc7c83c7266 100644 --- a/js/js.translator/testFiles/inheritance/cases/complexInitializationOrder.kt +++ b/js/js.translator/testFiles/inheritance/cases/complexInitializationOrder.kt @@ -32,6 +32,6 @@ class E() : A() { } } -fun box() : Boolean { +fun box(): Boolean { return (C().order == "ABC") && (D().order == "ABD") && (E().order == "AE") } \ No newline at end of file diff --git a/js/js.translator/testFiles/inheritance/cases/crazyInheritance.kt b/js/js.translator/testFiles/inheritance/cases/crazyInheritance.kt index 336c3c27de1..b80fc0f0302 100644 --- a/js/js.translator/testFiles/inheritance/cases/crazyInheritance.kt +++ b/js/js.translator/testFiles/inheritance/cases/crazyInheritance.kt @@ -11,17 +11,17 @@ open class A { } } -trait T: A { +trait T : A { override fun f1() = "T1" override fun f2() = "T2" } -trait B: A { +trait B : A { override fun f1() = "B1" override fun f3() = "B3" } -trait N: B, T { +trait N : B, T { override fun f1() = "N1" } @@ -29,16 +29,20 @@ trait X { fun f4() = "X4" } -class C: A(), N, X { +class C : A(), N, X { override fun f4() = "C4" } fun box(): String { val a = A() - val t = object : T, A() {} - val b = object : B, A() {} - val n = object : N, A() {} - val x = object : X {} + val t = object : T, A() { + } + val b = object : B, A() { + } + val n = object : N, A() { + } + val x = object : X { + } val c = C() if (a.getSum() != "A1|A2|A3|A4") return "Bad a.getSum(), it: ${a.getSum()}" diff --git a/js/js.translator/testFiles/inheritance/cases/definitionOrder.kt b/js/js.translator/testFiles/inheritance/cases/definitionOrder.kt index 10d2673d36e..7a64ff234d9 100644 --- a/js/js.translator/testFiles/inheritance/cases/definitionOrder.kt +++ b/js/js.translator/testFiles/inheritance/cases/definitionOrder.kt @@ -39,6 +39,6 @@ abstract class L abstract class H : L() abstract class Dummy -fun box() : Boolean { +fun box(): Boolean { return (C().order == "ABC") && (D().order == "ABD") && (E().order == "AE") } \ No newline at end of file diff --git a/js/js.translator/testFiles/inheritance/cases/fromFakeClasses.kt b/js/js.translator/testFiles/inheritance/cases/fromFakeClasses.kt index 6fe87617178..bd5bfd42b7b 100644 --- a/js/js.translator/testFiles/inheritance/cases/fromFakeClasses.kt +++ b/js/js.translator/testFiles/inheritance/cases/fromFakeClasses.kt @@ -1,8 +1,8 @@ package foo -class FromAny: Any() +class FromAny : Any() -class FromItrable(val n: Int): Iterable { +class FromItrable(val n: Int) : Iterable { override fun iterator() = object: Iterator { var i = 0 override fun next() = i++ @@ -23,7 +23,8 @@ fun box(): String { val s = it.stringify() if (s != "012") return "s /*$s*/ != 012" - var ao = object : Any() {} + var ao = object : Any() { + } var ito = object : Iterable { override public fun iterator() = object: Iterator { var i = 0 diff --git a/js/js.translator/testFiles/inheritance/cases/initializationOrder.kt b/js/js.translator/testFiles/inheritance/cases/initializationOrder.kt index faf44b8ab6e..4a47185a814 100644 --- a/js/js.translator/testFiles/inheritance/cases/initializationOrder.kt +++ b/js/js.translator/testFiles/inheritance/cases/initializationOrder.kt @@ -21,6 +21,6 @@ class C() : B() { } } -fun box() : Boolean { +fun box(): Boolean { return (C().order == "ABC") && (B().order == "AB") && (A().order == "A") } \ No newline at end of file diff --git a/js/js.translator/testFiles/inheritance/cases/initializersOfBasicClassExecute.kt b/js/js.translator/testFiles/inheritance/cases/initializersOfBasicClassExecute.kt index 52176e10fbe..8e8b86762d3 100644 --- a/js/js.translator/testFiles/inheritance/cases/initializersOfBasicClassExecute.kt +++ b/js/js.translator/testFiles/inheritance/cases/initializersOfBasicClassExecute.kt @@ -8,6 +8,6 @@ class B() : A() { } -fun box() : Int { +fun box(): Int { return (B().a) } diff --git a/js/js.translator/testFiles/inheritance/cases/kt3499.kt b/js/js.translator/testFiles/inheritance/cases/kt3499.kt index 2fd7f4a19a0..d0b2f907a66 100644 --- a/js/js.translator/testFiles/inheritance/cases/kt3499.kt +++ b/js/js.translator/testFiles/inheritance/cases/kt3499.kt @@ -3,7 +3,7 @@ package foo trait A : B, E trait B open class C { - fun foo() = true + fun foo() = true } trait D trait E diff --git a/js/js.translator/testFiles/inheritance/cases/methodOverride.kt b/js/js.translator/testFiles/inheritance/cases/methodOverride.kt index e25befd297f..673c0d4e940 100644 --- a/js/js.translator/testFiles/inheritance/cases/methodOverride.kt +++ b/js/js.translator/testFiles/inheritance/cases/methodOverride.kt @@ -9,7 +9,7 @@ open class A { } } -class B: A() { +class B : A() { override fun f2(): Int { return 2 } diff --git a/js/js.translator/testFiles/inheritance/cases/valOverride.kt b/js/js.translator/testFiles/inheritance/cases/valOverride.kt index db26372be7c..da99bce36be 100644 --- a/js/js.translator/testFiles/inheritance/cases/valOverride.kt +++ b/js/js.translator/testFiles/inheritance/cases/valOverride.kt @@ -9,7 +9,7 @@ class D() : C() { } fun box(): Boolean { - val d : C = D() - if(d.a != 2) return false + val d: C = D() + if (d.a != 2) return false return true } \ No newline at end of file diff --git a/js/js.translator/testFiles/inheritance/cases/valuePassedToAncestorConstructor.kt b/js/js.translator/testFiles/inheritance/cases/valuePassedToAncestorConstructor.kt index 4f8e39011c6..bdfbdbd4bd8 100644 --- a/js/js.translator/testFiles/inheritance/cases/valuePassedToAncestorConstructor.kt +++ b/js/js.translator/testFiles/inheritance/cases/valuePassedToAncestorConstructor.kt @@ -4,7 +4,7 @@ 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 { diff --git a/js/js.translator/testFiles/inline/cases/extension.kt b/js/js.translator/testFiles/inline/cases/extension.kt index 5b663dc267d..929be5c12d0 100644 --- a/js/js.translator/testFiles/inline/cases/extension.kt +++ b/js/js.translator/testFiles/inline/cases/extension.kt @@ -1,7 +1,7 @@ package foo class A() { - val a = 5 + val a = 5 } inline fun A.myInlineExtension() = a + 1 diff --git a/js/js.translator/testFiles/inline/cases/extensionWithParameter.kt b/js/js.translator/testFiles/inline/cases/extensionWithParameter.kt index 00d2c01afcc..aecd6b2c651 100644 --- a/js/js.translator/testFiles/inline/cases/extensionWithParameter.kt +++ b/js/js.translator/testFiles/inline/cases/extensionWithParameter.kt @@ -1,9 +1,9 @@ package foo class A() { - val a = 5 + val a = 5 } -inline fun A.myInlineExtension(i : Int) = a + i +inline fun A.myInlineExtension(i: Int) = a + i fun box() = A().myInlineExtension(1) == 6 \ No newline at end of file diff --git a/js/js.translator/testFiles/inline/cases/functionWithBlockBody.kt b/js/js.translator/testFiles/inline/cases/functionWithBlockBody.kt index 57eb6cfa0a5..82d48b3db9e 100644 --- a/js/js.translator/testFiles/inline/cases/functionWithBlockBody.kt +++ b/js/js.translator/testFiles/inline/cases/functionWithBlockBody.kt @@ -2,6 +2,6 @@ package foo fun box() = !myInlineFun() -inline fun myInlineFun() : Boolean { - return false +inline fun myInlineFun(): Boolean { + return false } diff --git a/js/js.translator/testFiles/inline/cases/functionWithOneParameter.kt b/js/js.translator/testFiles/inline/cases/functionWithOneParameter.kt index a14c70cd95b..902b2295aa2 100644 --- a/js/js.translator/testFiles/inline/cases/functionWithOneParameter.kt +++ b/js/js.translator/testFiles/inline/cases/functionWithOneParameter.kt @@ -1,9 +1,9 @@ package foo -fun box() : Boolean { - val t = myInlineFun(1 == 2) - val f = myInlineFun(1 == 2) - return t and f +fun box(): Boolean { + val t = myInlineFun(1 == 2) + val f = myInlineFun(1 == 2) + return t and f } -inline fun myInlineFun(t : Boolean) = !t +inline fun myInlineFun(t: Boolean) = !t diff --git a/js/js.translator/testFiles/inline/cases/functionWithTwoParameters.kt b/js/js.translator/testFiles/inline/cases/functionWithTwoParameters.kt index 862cc5d1be4..03ffa2386d4 100644 --- a/js/js.translator/testFiles/inline/cases/functionWithTwoParameters.kt +++ b/js/js.translator/testFiles/inline/cases/functionWithTwoParameters.kt @@ -1,13 +1,13 @@ package foo -fun box() : Boolean { - if (myInlineFun(3, 2) != 1) { - return false; - } - if (myInlineFun(100, -100) != 200) { - return false; - } - return true; +fun box(): Boolean { + if (myInlineFun(3, 2) != 1) { + return false; + } + if (myInlineFun(100, -100) != 200) { + return false; + } + return true; } -inline fun myInlineFun(l : Int, r : Int) = l - r +inline fun myInlineFun(l: Int, r: Int) = l - r diff --git a/js/js.translator/testFiles/inline/cases/method.kt b/js/js.translator/testFiles/inline/cases/method.kt index fdf57de7c2c..a5e7f06dcc8 100644 --- a/js/js.translator/testFiles/inline/cases/method.kt +++ b/js/js.translator/testFiles/inline/cases/method.kt @@ -1,11 +1,11 @@ package foo -fun box() : Boolean { - return (!(A().myInlineMethod())) +fun box(): Boolean { + return (!(A().myInlineMethod())) } class A() { - inline fun myInlineMethod() : Boolean { - return false - } + inline fun myInlineMethod(): Boolean { + return false + } } \ No newline at end of file diff --git a/js/js.translator/testFiles/inline/cases/methodWithIndirectlyReferencedThis.kt b/js/js.translator/testFiles/inline/cases/methodWithIndirectlyReferencedThis.kt index 002a31b8932..eabd64fdbe4 100644 --- a/js/js.translator/testFiles/inline/cases/methodWithIndirectlyReferencedThis.kt +++ b/js/js.translator/testFiles/inline/cases/methodWithIndirectlyReferencedThis.kt @@ -1,13 +1,13 @@ package foo -fun box() : Boolean { - return !(A(false).wrap()) and A(true).wrap() +fun box(): Boolean { + return !(A(false).wrap()) and A(true).wrap() } -class A(val a : Boolean) { - inline fun myInlineMethod() : Boolean { - return a - } +class A(val a: Boolean) { + inline fun myInlineMethod(): Boolean { + return a + } - fun wrap() = myInlineMethod() + fun wrap() = myInlineMethod() } \ No newline at end of file diff --git a/js/js.translator/testFiles/inline/cases/methodWithReferenceToThis.kt b/js/js.translator/testFiles/inline/cases/methodWithReferenceToThis.kt index fbffdf28b88..2aaaa7722dc 100644 --- a/js/js.translator/testFiles/inline/cases/methodWithReferenceToThis.kt +++ b/js/js.translator/testFiles/inline/cases/methodWithReferenceToThis.kt @@ -1,11 +1,11 @@ package foo -fun box() : Boolean { - return !(A(false).myInlineMethod()) and A(true).myInlineMethod() +fun box(): Boolean { + return !(A(false).myInlineMethod()) and A(true).myInlineMethod() } -class A(val a : Boolean) { - inline fun myInlineMethod() : Boolean { - return a - } +class A(val a: Boolean) { + inline fun myInlineMethod(): Boolean { + return a + } } \ No newline at end of file diff --git a/js/js.translator/testFiles/java/arrayList/cases/access.kt b/js/js.translator/testFiles/java/arrayList/cases/access.kt index 58c151430c2..b7072d63538 100644 --- a/js/js.translator/testFiles/java/arrayList/cases/access.kt +++ b/js/js.translator/testFiles/java/arrayList/cases/access.kt @@ -1,10 +1,10 @@ package foo - import java.util.ArrayList; +import java.util.ArrayList; - fun box() : Boolean { - val a = ArrayList(); - a.add(1) - a.add(2) - return (a.size() == 2) && (a.get(1) == 2) && (a.get(0) == 1); - } \ No newline at end of file +fun box(): Boolean { + val a = ArrayList(); + a.add(1) + a.add(2) + return (a.size() == 2) && (a.get(1) == 2) && (a.get(0) == 1); +} \ No newline at end of file diff --git a/js/js.translator/testFiles/java/arrayList/cases/arrayAccess.kt b/js/js.translator/testFiles/java/arrayList/cases/arrayAccess.kt index b47cfa6e040..131c57f03e3 100644 --- a/js/js.translator/testFiles/java/arrayList/cases/arrayAccess.kt +++ b/js/js.translator/testFiles/java/arrayList/cases/arrayAccess.kt @@ -2,7 +2,7 @@ package foo import java.util.ArrayList; -fun box() : Boolean { +fun box(): Boolean { val a = ArrayList(); a.add(1) a.add(2) diff --git a/js/js.translator/testFiles/java/arrayList/cases/constructWithCapacity.kt b/js/js.translator/testFiles/java/arrayList/cases/constructWithCapacity.kt index cce4f2b8a4e..dd548d8d5ab 100644 --- a/js/js.translator/testFiles/java/arrayList/cases/constructWithCapacity.kt +++ b/js/js.translator/testFiles/java/arrayList/cases/constructWithCapacity.kt @@ -3,6 +3,6 @@ package foo import java.util.ArrayList fun box(): Boolean { - val al = ArrayList(10) - return al.size() == 0 + val al = ArrayList(10) + return al.size() == 0 } \ No newline at end of file diff --git a/js/js.translator/testFiles/java/arrayList/cases/constructWithSideEffectParam.kt b/js/js.translator/testFiles/java/arrayList/cases/constructWithSideEffectParam.kt index 553ea3f8240..e6c3d51fb1f 100644 --- a/js/js.translator/testFiles/java/arrayList/cases/constructWithSideEffectParam.kt +++ b/js/js.translator/testFiles/java/arrayList/cases/constructWithSideEffectParam.kt @@ -4,11 +4,11 @@ import java.util.ArrayList var baz = 0 fun withSideEffect(v: Int): Int { - baz = v - return v + baz = v + return v } fun box(): Boolean { - val al = ArrayList(withSideEffect(2)) - return al.size() == 0 && baz == 2 + val al = ArrayList(withSideEffect(2)) + return al.size() == 0 && baz == 2 } \ No newline at end of file diff --git a/js/js.translator/testFiles/java/arrayList/cases/emptyList.kt b/js/js.translator/testFiles/java/arrayList/cases/emptyList.kt index ec624c39ad9..ef1c4ace7bb 100644 --- a/js/js.translator/testFiles/java/arrayList/cases/emptyList.kt +++ b/js/js.translator/testFiles/java/arrayList/cases/emptyList.kt @@ -2,7 +2,7 @@ package foo import java.util.ArrayList; -fun box() : Boolean { +fun box(): Boolean { val a = ArrayList(); return a.size() == 0; } \ No newline at end of file diff --git a/js/js.translator/testFiles/java/arrayList/cases/indexOOB.kt b/js/js.translator/testFiles/java/arrayList/cases/indexOOB.kt index 52d1f6936a7..58b1462e784 100644 --- a/js/js.translator/testFiles/java/arrayList/cases/indexOOB.kt +++ b/js/js.translator/testFiles/java/arrayList/cases/indexOOB.kt @@ -2,7 +2,7 @@ package foo import java.util.ArrayList; -fun box() : Boolean { +fun box(): Boolean { val arr = ArrayList(); var i = 0; while (i++ < 10) { diff --git a/js/js.translator/testFiles/java/arrayList/cases/indexOf.kt b/js/js.translator/testFiles/java/arrayList/cases/indexOf.kt index a80bf87117c..0ee14825c89 100644 --- a/js/js.translator/testFiles/java/arrayList/cases/indexOf.kt +++ b/js/js.translator/testFiles/java/arrayList/cases/indexOf.kt @@ -13,7 +13,7 @@ fun listOf(vararg a: T): List { return list } -fun test(list: List, elements: List, expected: List, method: List.(T)->Int, methodName: String): String? { +fun test(list: List, elements: List, expected: List, method: List.(T) -> Int, methodName: String): String? { for (i in 0..elements.size() - 1) { val actual = list.method(elements[i]) if (actual != expected[i]) return "$methodName failed when find: ${elements[i]}, expected: ${expected[i]}, actual: $actual" @@ -22,13 +22,13 @@ fun test(list: List, elements: List, expected: List, method: List< } fun box(): String { - // 0 1 2 3 4 5 6 7 8 9 - val list = listOf(3, "2", -1, null, 0, "2", -1, null, 0, 8) - val findingElements = listOf(77, null, 0, 8, -15, "2", 5, 3, -1, "3") - val expectedIndexOf = listOf(-1, 3, 4, 9, -1, 1,-1, 0, 2, -1) - val expectedLastIndexOf = listOf(-1, 7, 8, 9, -1, 5,-1, 0, 6, -1) + // 0 1 2 3 4 5 6 7 8 9 + val list = listOf(3, "2", -1, null, 0, "2", -1, null, 0, 8) + val findingElements = listOf(77, null, 0, 8, -15, "2", 5, 3, -1, "3") + val expectedIndexOf = listOf(-1, 3, 4, 9, -1, 1, -1, 0, 2, -1) + val expectedLastIndexOf = listOf(-1, 7, 8, 9, -1, 5, -1, 0, 6, -1) - return test(list, findingElements, expectedIndexOf, { indexOf(it) }, "indexOf") ?: - test(list, findingElements, expectedLastIndexOf, { lastIndexOf(it) }, "lastIndexOf") ?: - "OK" - } \ No newline at end of file + return test(list, findingElements, expectedIndexOf, { indexOf(it) }, "indexOf") ?: + test(list, findingElements, expectedLastIndexOf, { lastIndexOf(it) }, "lastIndexOf") ?: + "OK" +} \ No newline at end of file diff --git a/js/js.translator/testFiles/java/arrayList/cases/isEmpty.kt b/js/js.translator/testFiles/java/arrayList/cases/isEmpty.kt index 7f9c7283f87..334c8d92507 100644 --- a/js/js.translator/testFiles/java/arrayList/cases/isEmpty.kt +++ b/js/js.translator/testFiles/java/arrayList/cases/isEmpty.kt @@ -2,7 +2,7 @@ package foo import java.util.ArrayList; -fun box() : Boolean { +fun box(): Boolean { val a = ArrayList(); a.add(3) return !(a.isEmpty()) && (ArrayList().isEmpty()); diff --git a/js/js.translator/testFiles/java/arrayList/cases/iterate.kt b/js/js.translator/testFiles/java/arrayList/cases/iterate.kt index 74da14b2f0a..23e222f424a 100644 --- a/js/js.translator/testFiles/java/arrayList/cases/iterate.kt +++ b/js/js.translator/testFiles/java/arrayList/cases/iterate.kt @@ -2,7 +2,7 @@ package foo import java.util.ArrayList; -fun box() : Boolean { +fun box(): Boolean { var i = 0 val arr = ArrayList(); while (i++ < 10) { diff --git a/js/js.translator/testFiles/java/arrayList/cases/misc.kt b/js/js.translator/testFiles/java/arrayList/cases/misc.kt index 0d694323b8a..275f1de8d07 100644 --- a/js/js.translator/testFiles/java/arrayList/cases/misc.kt +++ b/js/js.translator/testFiles/java/arrayList/cases/misc.kt @@ -2,7 +2,7 @@ package foo import java.util.ArrayList -fun assertThat(a:Any, b:Any) { +fun assertThat(a: Any, b: Any) { if (a != b) { throw Exception("$a is not equal to $b") } diff --git a/js/js.translator/testFiles/java/arrayList/cases/remove.kt b/js/js.translator/testFiles/java/arrayList/cases/remove.kt index 2f9cecc0fad..221ee4b8580 100644 --- a/js/js.translator/testFiles/java/arrayList/cases/remove.kt +++ b/js/js.translator/testFiles/java/arrayList/cases/remove.kt @@ -2,7 +2,7 @@ package foo import java.util.ArrayList -fun box() : Boolean { +fun box(): Boolean { val arr = ArrayList() for (i in 0..5) { arr.add(i) diff --git a/js/js.translator/testFiles/java/arrayList/cases/removeAll.kt b/js/js.translator/testFiles/java/arrayList/cases/removeAll.kt index 62f49b861c8..d60a09b8bef 100644 --- a/js/js.translator/testFiles/java/arrayList/cases/removeAll.kt +++ b/js/js.translator/testFiles/java/arrayList/cases/removeAll.kt @@ -31,7 +31,7 @@ fun box(): String { val withOtherElements = listOf(3, 54, null) return test(list, subset, removed = true, expected = listOf(0, 8, 5, "3", 77, -15)) ?: - test(list, empty, removed = false, expected = list) ?: - test(list, withOtherElements, removed = true, expected = listOf("2", -1, 0, 8, 5, "3", 77, -15)) ?: - "OK" + test(list, empty, removed = false, expected = list) ?: + test(list, withOtherElements, removed = true, expected = listOf("2", -1, 0, 8, 5, "3", 77, -15)) ?: + "OK" } diff --git a/js/js.translator/testFiles/java/arrayList/cases/removeWithIndexOutOfBounds.kt b/js/js.translator/testFiles/java/arrayList/cases/removeWithIndexOutOfBounds.kt index 8a869490e81..1a814b54788 100644 --- a/js/js.translator/testFiles/java/arrayList/cases/removeWithIndexOutOfBounds.kt +++ b/js/js.translator/testFiles/java/arrayList/cases/removeWithIndexOutOfBounds.kt @@ -2,7 +2,7 @@ package foo import java.util.ArrayList -fun box() : Boolean { +fun box(): Boolean { var threwForEmptyList = false val arr = ArrayList() @@ -10,7 +10,7 @@ fun box() : Boolean { arr.remove(2) } catch(e: IndexOutOfBoundsException) { - threwForEmptyList = true + threwForEmptyList = true } for (i in 0..10) { diff --git a/js/js.translator/testFiles/java/arrayList/cases/retainAll.kt b/js/js.translator/testFiles/java/arrayList/cases/retainAll.kt index 5d3e3f20d99..57454603d7e 100644 --- a/js/js.translator/testFiles/java/arrayList/cases/retainAll.kt +++ b/js/js.translator/testFiles/java/arrayList/cases/retainAll.kt @@ -31,8 +31,8 @@ fun box(): String { val withOtherElements = listOf(3, 54, null) return test(list, subset, removed = true, expected = subset) ?: - test(list, empty, removed = true, expected = empty) ?: - test(list, withOtherElements, removed = true, expected = listOf(3, null)) ?: - test(list, list, removed = false, expected = list) ?: - "OK" + test(list, empty, removed = true, expected = empty) ?: + test(list, withOtherElements, removed = true, expected = listOf(3, null)) ?: + test(list, list, removed = false, expected = list) ?: + "OK" } diff --git a/js/js.translator/testFiles/jsTester/jsTester.js b/js/js.translator/testFiles/jsTester/jsTester.js index cec3bbfcf30..b72a4aaabe9 100644 --- a/js/js.translator/testFiles/jsTester/jsTester.js +++ b/js/js.translator/testFiles/jsTester/jsTester.js @@ -41,8 +41,8 @@ var JsTests = (function () { reporter.testSuccess(testName); }; return { - test:test, - assert:assert + test: test, + assert: assert } })(); diff --git a/js/js.translator/testFiles/jsTester/jsTester.kt b/js/js.translator/testFiles/jsTester/jsTester.kt index 068af79ee30..65a8f7ee686 100644 --- a/js/js.translator/testFiles/jsTester/jsTester.kt +++ b/js/js.translator/testFiles/jsTester/jsTester.kt @@ -3,9 +3,9 @@ package kotlin.test import kotlin.test.* import js.* -public var asserter : Asserter = JsTestsAsserter() +public var asserter: Asserter = JsTestsAsserter() -public class JsTestsAsserter(): Asserter { +public class JsTestsAsserter() : Asserter { public override fun assertTrue(message: String, actual: Boolean) { assert(actual, message) } diff --git a/js/js.translator/testFiles/multiPackage/cases/createClassFromOtherPackage/b.kt b/js/js.translator/testFiles/multiPackage/cases/createClassFromOtherPackage/b.kt index a73ba23e674..b7cafb21ba8 100644 --- a/js/js.translator/testFiles/multiPackage/cases/createClassFromOtherPackage/b.kt +++ b/js/js.translator/testFiles/multiPackage/cases/createClassFromOtherPackage/b.kt @@ -1,5 +1,5 @@ package b.foo class A() { - fun tadada(a : A) = true + fun tadada(a: A) = true } \ No newline at end of file diff --git a/js/js.translator/testFiles/multiPackage/cases/createClassFromOtherPackageUsingImport/b.kt b/js/js.translator/testFiles/multiPackage/cases/createClassFromOtherPackageUsingImport/b.kt index a73ba23e674..b7cafb21ba8 100644 --- a/js/js.translator/testFiles/multiPackage/cases/createClassFromOtherPackageUsingImport/b.kt +++ b/js/js.translator/testFiles/multiPackage/cases/createClassFromOtherPackageUsingImport/b.kt @@ -1,5 +1,5 @@ package b.foo class A() { - fun tadada(a : A) = true + fun tadada(a: A) = true } \ No newline at end of file diff --git a/js/js.translator/testFiles/multiPackage/cases/nestedPackageFunctionCalledFromOtherPackage/b.kt b/js/js.translator/testFiles/multiPackage/cases/nestedPackageFunctionCalledFromOtherPackage/b.kt index 46d2f58d420..c03267e2bb4 100644 --- a/js/js.translator/testFiles/multiPackage/cases/nestedPackageFunctionCalledFromOtherPackage/b.kt +++ b/js/js.translator/testFiles/multiPackage/cases/nestedPackageFunctionCalledFromOtherPackage/b.kt @@ -1,2 +1,3 @@ package b.bar + fun f() = true \ No newline at end of file diff --git a/js/js.translator/testFiles/multideclaration/cases/multiValForArray.kt b/js/js.translator/testFiles/multideclaration/cases/multiValForArray.kt index 5b85d3288fe..054c545873c 100644 --- a/js/js.translator/testFiles/multideclaration/cases/multiValForArray.kt +++ b/js/js.translator/testFiles/multideclaration/cases/multiValForArray.kt @@ -1,15 +1,16 @@ package foo + class A { - fun component1() : Int = 1 + fun component1(): Int = 1 } -fun A.component2() : String = "n" +fun A.component2(): String = "n" fun box(): String { - val list = Array(1, {A()}) + val list = Array(1, { A() }) var i = 0; var s = "" - for ((a,b) in list) { + for ((a, b) in list) { i = a; s = b; } diff --git a/js/js.translator/testFiles/multideclaration/cases/multiValForMap.kt b/js/js.translator/testFiles/multideclaration/cases/multiValForMap.kt index fc5d62a0301..bf517a4b16a 100644 --- a/js/js.translator/testFiles/multideclaration/cases/multiValForMap.kt +++ b/js/js.translator/testFiles/multideclaration/cases/multiValForMap.kt @@ -3,18 +3,18 @@ package foo import java.util.HashMap -public inline fun Map.iterator(): Iterator> { +public inline fun Map.iterator(): Iterator> { val entrySet = this.entrySet() return entrySet.iterator() } /** Returns the key of the entry */ -fun Map.Entry.component1() : K { +fun Map.Entry.component1(): K { return getKey() } /** Returns the value of the entry */ -fun Map.Entry.component2() : V { +fun Map.Entry.component2(): V { return getValue() } @@ -25,11 +25,12 @@ fun box(): String { var s1 = "" var s2 = "" - for ((k,v) in map) { + for ((k, v) in map) { when (k) { 2 -> s2 = v 1 -> s1 = v - else -> {} + else -> { + } } } diff --git a/js/js.translator/testFiles/multideclaration/cases/multiValForRange.kt b/js/js.translator/testFiles/multideclaration/cases/multiValForRange.kt index 52e89b36be9..1813c2eb8c5 100644 --- a/js/js.translator/testFiles/multideclaration/cases/multiValForRange.kt +++ b/js/js.translator/testFiles/multideclaration/cases/multiValForRange.kt @@ -1,12 +1,13 @@ package foo -class C(val i: Int): Comparable, A() { + +class C(val i: Int) : Comparable, A() { public override fun compareTo(other: C): Int { return if (other is C) other.i - i else 0 } } -fun ComparableRange.iterator() : Iterator { +fun ComparableRange.iterator(): Iterator { var curI: Int = start.i - 1 return object :Iterator { @@ -22,14 +23,14 @@ fun ComparableRange.iterator() : Iterator { } open class A { - fun component1() : Int = 1 + fun component1(): Int = 1 } -fun A.component2() : String = "n" +fun A.component2(): String = "n" fun box(): String { var i = 0; var s = "" - for ((a,b) in C(0)..C(2)) { + for ((a, b) in C(0)..C(2)) { i = a; s = b; } diff --git a/js/js.translator/testFiles/multideclaration/cases/multiValInFor.kt b/js/js.translator/testFiles/multideclaration/cases/multiValInFor.kt index 7e1d2cf10ad..e614482aa32 100644 --- a/js/js.translator/testFiles/multideclaration/cases/multiValInFor.kt +++ b/js/js.translator/testFiles/multideclaration/cases/multiValInFor.kt @@ -3,9 +3,9 @@ package foo import java.util.ArrayList class A { - fun component1() : Int = 1 + fun component1(): Int = 1 } -fun A.component2() : String = "n" +fun A.component2(): String = "n" fun box(): String { val list = ArrayList() @@ -13,7 +13,7 @@ fun box(): String { var i = 0; var s = "" - for ((a,b) in list) { + for ((a, b) in list) { i = a; s = b; } diff --git a/js/js.translator/testFiles/multideclaration/cases/multiValInIntFor.kt b/js/js.translator/testFiles/multideclaration/cases/multiValInIntFor.kt index 5d04d336703..b34903d2a9e 100644 --- a/js/js.translator/testFiles/multideclaration/cases/multiValInIntFor.kt +++ b/js/js.translator/testFiles/multideclaration/cases/multiValInIntFor.kt @@ -1,10 +1,10 @@ package foo -fun Int.component1() : Int { +fun Int.component1(): Int { return this + 10; } -fun Int.component2() : String = "b" +fun Int.component2(): String = "b" fun box(): String { var i = 0; diff --git a/js/js.translator/testFiles/multideclaration/cases/multiValInIntRangeFor.kt b/js/js.translator/testFiles/multideclaration/cases/multiValInIntRangeFor.kt index 5ffb6e7718a..0ca4fa5126d 100644 --- a/js/js.translator/testFiles/multideclaration/cases/multiValInIntRangeFor.kt +++ b/js/js.translator/testFiles/multideclaration/cases/multiValInIntRangeFor.kt @@ -1,10 +1,10 @@ package foo -fun Int.component1() : Int { +fun Int.component1(): Int { return this + 10; } -fun Int.component2() : String = "b" +fun Int.component2(): String = "b" fun box(): String { var i = 0; diff --git a/js/js.translator/testFiles/nameClashes/cases/methodOverload.kt b/js/js.translator/testFiles/nameClashes/cases/methodOverload.kt index 9eb324e06fb..2fbdfba3df8 100644 --- a/js/js.translator/testFiles/nameClashes/cases/methodOverload.kt +++ b/js/js.translator/testFiles/nameClashes/cases/methodOverload.kt @@ -3,18 +3,18 @@ package foo class A() { fun eval() = 3 - fun eval(a : Int) = 4 - fun eval(a : String) = 5 - fun eval(a : String, b : Int) = 6 + fun eval(a: Int) = 4 + fun eval(a: String) = 5 + fun eval(a: String, b: Int) = 6 } -fun box() : Boolean { +fun box(): Boolean { if (A().eval() != 3) return false; if (A().eval(2) != 4) return false; if (A().eval("3") != 5) return false; - if (A().eval("a", 3) != 6) return false; + if (A().eval("a", 3) != 6) return false; return true; } \ No newline at end of file diff --git a/js/js.translator/testFiles/nameClashes/cases/overloadExtension.kt b/js/js.translator/testFiles/nameClashes/cases/overloadExtension.kt index 2f376417509..2fcca16bebb 100644 --- a/js/js.translator/testFiles/nameClashes/cases/overloadExtension.kt +++ b/js/js.translator/testFiles/nameClashes/cases/overloadExtension.kt @@ -1,7 +1,9 @@ package foo -fun Int.foo() {} -fun String.foo() {} +fun Int.foo() { +} +fun String.foo() { +} val Int.bar = 1 val String.bar = 2 diff --git a/js/js.translator/testFiles/native/cases/class.kt b/js/js.translator/testFiles/native/cases/class.kt index 9b1d3e907be..26b42e537ea 100644 --- a/js/js.translator/testFiles/native/cases/class.kt +++ b/js/js.translator/testFiles/native/cases/class.kt @@ -3,13 +3,13 @@ package foo import js.* native -class A(b : Int) { - fun g() : Int = js.noImpl - fun m() : Int = js.noImpl +class A(b: Int) { + fun g(): Int = js.noImpl + fun m(): Int = js.noImpl } -fun box() : Boolean { +fun box(): Boolean { if (A(2).g() != 4) { return false; } diff --git a/js/js.translator/testFiles/native/cases/kt1519.kt b/js/js.translator/testFiles/native/cases/kt1519.kt index 212e021eb4d..525937024a3 100644 --- a/js/js.translator/testFiles/native/cases/kt1519.kt +++ b/js/js.translator/testFiles/native/cases/kt1519.kt @@ -2,18 +2,18 @@ package foo native class Wow() { - val x : Int = js.noImpl - val y : Int = js.noImpl + val x: Int = js.noImpl + val y: Int = js.noImpl } native -fun Wow.sum() : Int = js.noImpl +fun Wow.sum(): Int = js.noImpl -fun Wow.dblSum() : Int { +fun Wow.dblSum(): Int { return 2 * sum() } -fun box() : Boolean { +fun box(): Boolean { return (Wow().dblSum() == 6) } \ No newline at end of file diff --git a/js/js.translator/testFiles/native/cases/kt2209.kt b/js/js.translator/testFiles/native/cases/kt2209.kt index 8095a1f8026..8b7c5222eb4 100644 --- a/js/js.translator/testFiles/native/cases/kt2209.kt +++ b/js/js.translator/testFiles/native/cases/kt2209.kt @@ -2,23 +2,23 @@ package foo native trait Chrome { - val extension:Extension + val extension: Extension } native trait Extension { - val lastError:LastError? + val lastError: LastError? } native trait LastError { - val message:String + val message: String } native -val chrome:Chrome = noImpl +val chrome: Chrome = noImpl -fun box() : Boolean { +fun box(): Boolean { val lastError = chrome.extension.lastError?.message return lastError == null } \ No newline at end of file diff --git a/js/js.translator/testFiles/native/cases/library.kt b/js/js.translator/testFiles/native/cases/library.kt index a9833340c6c..756e5fcac5e 100644 --- a/js/js.translator/testFiles/native/cases/library.kt +++ b/js/js.translator/testFiles/native/cases/library.kt @@ -1,8 +1,10 @@ package foo library class A() { - library fun f() {} - library fun f(a: Int) {} + library fun f() { + } + library fun f(a: Int) { + } } library fun getResult() = false diff --git a/js/js.translator/testFiles/native/cases/simple.kt b/js/js.translator/testFiles/native/cases/simple.kt index 5a9540ae8b4..deec6621517 100644 --- a/js/js.translator/testFiles/native/cases/simple.kt +++ b/js/js.translator/testFiles/native/cases/simple.kt @@ -3,6 +3,6 @@ package foo import js.* native -fun returnFalse() : Boolean = js.noImpl +fun returnFalse(): Boolean = js.noImpl fun box() = !returnFalse() \ No newline at end of file diff --git a/js/js.translator/testFiles/native/cases/simpleUndefined.kt b/js/js.translator/testFiles/native/cases/simpleUndefined.kt index 88a4d526cab..14e0e1bace7 100644 --- a/js/js.translator/testFiles/native/cases/simpleUndefined.kt +++ b/js/js.translator/testFiles/native/cases/simpleUndefined.kt @@ -6,6 +6,6 @@ native val c: Any? = js.noImpl fun box(): Boolean { - if (c != null) return false - return (c == null) + if (c != null) return false + return (c == null) } \ No newline at end of file diff --git a/js/js.translator/testFiles/native/cases/undefined.kt b/js/js.translator/testFiles/native/cases/undefined.kt index d62755570c9..73987ce63cf 100644 --- a/js/js.translator/testFiles/native/cases/undefined.kt +++ b/js/js.translator/testFiles/native/cases/undefined.kt @@ -4,17 +4,19 @@ import js.* /*function g should return 0 if a parameter is undefined 1 if parameter is 1 and 3 if parameter is 3*/ native -fun f(g : (Int?)-> Int) : Boolean = js.noImpl +fun f(g: (Int?) -> Int): Boolean = js.noImpl -fun box() : Boolean { +fun box(): Boolean { val b = { - (a : Int?) -> + (a: Int?) -> if (a == null) { 0 - } else if (a == 1) { + } + else if (a == 1) { 1 - } else { + } + else { 3 } } diff --git a/js/js.translator/testFiles/native/cases/vararg.kt b/js/js.translator/testFiles/native/cases/vararg.kt index 15f62c4ed47..a28e0fc4d87 100644 --- a/js/js.translator/testFiles/native/cases/vararg.kt +++ b/js/js.translator/testFiles/native/cases/vararg.kt @@ -3,35 +3,35 @@ package foo import js.* native -fun paramCount(vararg a : Int) : Int = js.noImpl +fun paramCount(vararg a: Int): Int = js.noImpl native("paramCount") -fun anotherParamCount(vararg a : Int) : Int = js.noImpl +fun anotherParamCount(vararg a: Int): Int = js.noImpl // test spread operator -fun count(vararg a : Int) = paramCount(*a) +fun count(vararg a: Int) = paramCount(*a) // test spread operator -fun anotherCount(vararg a : Int) = anotherParamCount(*a) +fun anotherCount(vararg a: Int) = anotherParamCount(*a) native -fun test3(bar:Bar, dummy: Int, vararg args: Int): Boolean = js.noImpl +fun test3(bar: Bar, dummy: Int, vararg args: Int): Boolean = js.noImpl native fun Bar.test2(order: Int, dummy: Int, vararg args: Int): Boolean = js.noImpl native class Bar(val size: Int, order: Int = 0) { - fun test(order: Int, dummy: Int, vararg args: Int): Boolean = js.noImpl - class object { - fun startNewTest(): Boolean = js.noImpl - var hasOrderProblem: Boolean = false - } + fun test(order: Int, dummy: Int, vararg args: Int): Boolean = js.noImpl + class object { + fun startNewTest(): Boolean = js.noImpl + var hasOrderProblem: Boolean = false + } } native object obj { - fun test(size: Int, vararg args: Int): Boolean = js.noImpl + fun test(size: Int, vararg args: Int): Boolean = js.noImpl } fun spreadInMethodCall(size: Int, vararg args: Int) = Bar(size).test(0, 1, *args) @@ -46,76 +46,76 @@ native fun testNativeVarargWithFunLit(vararg args: Int, f: (a: IntArray) -> Boolean): Boolean = js.noImpl fun testSpreadOperatorWithSafeCall(a: Bar?, expected: Boolean?, vararg args: Int): Boolean { - return a?.test(0, 1, *args) == expected + return a?.test(0, 1, *args) == expected } fun testSpreadOperatorWithSureCall(a: Bar?, vararg args: Int): Boolean { - return a!!.test(0, 1, *args) + return a!!.test(0, 1, *args) } fun testCallOrder(vararg args: Int) = - Bar.startNewTest() && - Bar(args.size, 0).test(1, 1, *args) && Bar(args.size, 2).test(3, 1, *args) && - !Bar.hasOrderProblem + Bar.startNewTest() && + Bar(args.size, 0).test(1, 1, *args) && Bar(args.size, 2).test(3, 1, *args) && + !Bar.hasOrderProblem fun box(): String { - if (paramCount() != 0) - return "failed when call native function without args" + if (paramCount() != 0) + return "failed when call native function without args" - if (paramCount(1, 2 ,3) != 3) - return "failed when call native function with some args" + if (paramCount(1, 2, 3) != 3) + return "failed when call native function with some args" - if (anotherParamCount(1, 2 ,3) != 3) - return "failed when call native function with some args witch declareted with custom name" + if (anotherParamCount(1, 2, 3) != 3) + return "failed when call native function with some args witch declareted with custom name" - if (count() != 0) - return "failed when call native function without args using spread operator" + if (count() != 0) + return "failed when call native function without args using spread operator" - if (count(1, 1, 1, 1) != 4) - return "failed when call native function with some args using spread operator" + if (count(1, 1, 1, 1) != 4) + return "failed when call native function with some args using spread operator" - if (anotherCount(1, 2 ,3) != 3) - return "failed when call native function with some args using spread operator witch declareted with custom name" + if (anotherCount(1, 2, 3) != 3) + return "failed when call native function with some args using spread operator witch declareted with custom name" - if (!Bar(5).test(0, 1, 1, 2, 3, 4, 5)) - return "failed when call method with some args" + if (!Bar(5).test(0, 1, 1, 2, 3, 4, 5)) + return "failed when call method with some args" - if (!spreadInMethodCall(2, 1, 2)) - return "failed when call method using spread operator" + if (!spreadInMethodCall(2, 1, 2)) + return "failed when call method using spread operator" - if (!(obj.test(5, 1, 2, 3, 4, 5))) - return "failed when call method of object" + if (!(obj.test(5, 1, 2, 3, 4, 5))) + return "failed when call method of object" - if (!(spreadInObjectMethodCall(2, 1, 2))) - return "failed when call method of object using spread operator" + if (!(spreadInObjectMethodCall(2, 1, 2))) + return "failed when call method of object using spread operator" - if (!spreadInMethodCallWithReceiver(2, 1, 2)) - return "failed when call method using spread operator with receiver" + if (!spreadInMethodCallWithReceiver(2, 1, 2)) + return "failed when call method using spread operator with receiver" - if (!spreadInPackageMethodCall(2, 1, 2)) - return "failed when call package method using spread operator" + if (!spreadInPackageMethodCall(2, 1, 2)) + return "failed when call package method using spread operator" - if (!(testNativeVarargWithFunLit(1, 2, 3) { args -> args.size == 3 })) - return "failed when call native function with vararg and fun literal" + if (!(testNativeVarargWithFunLit(1, 2, 3) { args -> args.size == 3 })) + return "failed when call native function with vararg and fun literal" - if (!(testSpreadOperatorWithSafeCall(null, null))) - return "failed when test spread operator with SafeCall (?.) using null receiver" + if (!(testSpreadOperatorWithSafeCall(null, null))) + return "failed when test spread operator with SafeCall (?.) using null receiver" - if (!(testSpreadOperatorWithSafeCall(Bar(3), true, 1, 2, 3))) - return "failed when test spread operator with SafeCall (?.)" + if (!(testSpreadOperatorWithSafeCall(Bar(3), true, 1, 2, 3))) + return "failed when test spread operator with SafeCall (?.)" - if (!(testSpreadOperatorWithSureCall(Bar(3), 1, 2, 3))) - return "failed when test spread operator with SureCall (!!)" + if (!(testSpreadOperatorWithSureCall(Bar(3), 1, 2, 3))) + return "failed when test spread operator with SureCall (!!)" - if (!(testCallOrder())) - return "failed when test calling order when using spread operator without args" + if (!(testCallOrder())) + return "failed when test calling order when using spread operator without args" - if (!(testCallOrder(1, 2, 3, 4))) - return "failed when test calling order when using spread operator with some args" + if (!(testCallOrder(1, 2, 3, 4))) + return "failed when test calling order when using spread operator with some args" - val baz: Bar? = Bar(1) - if (!(baz!!)?.test(0, 1, 1)) - return "failed when combined SureCall and SafeCall, maybe we lost cached expression" + val baz: Bar? = Bar(1) + if (!(baz!!)?.test(0, 1, 1)) + return "failed when combined SureCall and SafeCall, maybe we lost cached expression" - return "OK" + return "OK" } \ No newline at end of file diff --git a/js/js.translator/testFiles/native/native/class.js b/js/js.translator/testFiles/native/native/class.js index b3a093c13f5..2c2ca7a186e 100644 --- a/js/js.translator/testFiles/native/native/class.js +++ b/js/js.translator/testFiles/native/native/class.js @@ -1,8 +1,8 @@ function A(b) { - this.g = function() { + this.g = function () { return 2 * b; } - this.m = function() { + this.m = function () { return b - 1; } } \ No newline at end of file diff --git a/js/js.translator/testFiles/native/native/inheritanceFromNativeClass.js b/js/js.translator/testFiles/native/native/inheritanceFromNativeClass.js index 6eee65e132b..a0fd2ddba16 100644 --- a/js/js.translator/testFiles/native/native/inheritanceFromNativeClass.js +++ b/js/js.translator/testFiles/native/native/inheritanceFromNativeClass.js @@ -2,22 +2,22 @@ function A(a) { this.a = a; } -A.prototype.g = function() { +A.prototype.g = function () { return 2 * this.a; }; -A.prototype.m = function() { +A.prototype.m = function () { return this.a - 1; }; -A.prototype.foo = function(i) { +A.prototype.foo = function (i) { return "A.foo(" + i + ")"; }; -A.prototype.boo = function(i) { +A.prototype.boo = function (i) { return "A.boo(" + i + ")"; }; -A.prototype.bar = function(i) { +A.prototype.bar = function (i) { return "A.bar(" + i + ")"; } \ No newline at end of file diff --git a/js/js.translator/testFiles/native/native/kt1519.js b/js/js.translator/testFiles/native/native/kt1519.js index 55fc8d9e433..7f8e96e7539 100644 --- a/js/js.translator/testFiles/native/native/kt1519.js +++ b/js/js.translator/testFiles/native/native/kt1519.js @@ -3,6 +3,6 @@ function Wow() { this.y = 2; } -Wow.prototype.sum = function() { +Wow.prototype.sum = function () { return this.x + this.y; }; \ No newline at end of file diff --git a/js/js.translator/testFiles/native/native/kt2209.js b/js/js.translator/testFiles/native/native/kt2209.js index 9c1c4b865ca..ed24a06c8df 100644 --- a/js/js.translator/testFiles/native/native/kt2209.js +++ b/js/js.translator/testFiles/native/native/kt2209.js @@ -1 +1 @@ -var chrome = {extension: {lastError:null}} +var chrome = {extension: {lastError:null}}; diff --git a/js/js.translator/testFiles/native/native/library.js b/js/js.translator/testFiles/native/native/library.js index 4b604330213..e233e06b9e7 100644 --- a/js/js.translator/testFiles/native/native/library.js +++ b/js/js.translator/testFiles/native/native/library.js @@ -2,17 +2,17 @@ var c = 0; Kotlin.A = Kotlin.createClassNow(null, - function () { - this.f = function(i) { - if (i === undefined && c === 0) { - c = 1; - } - if (i === 2 && c === 1) { - c = 2; - } - } - } - ); + function () { + this.f = function (i) { + if (i === undefined && c === 0) { + c = 1; + } + if (i === 2 && c === 1) { + c = 2; + } + } + } + ); Kotlin.getResult = function () { return c === 2; }; diff --git a/js/js.translator/testFiles/native/native/vararg.js b/js/js.translator/testFiles/native/native/vararg.js index e8b64248b4d..870db6e112d 100644 --- a/js/js.translator/testFiles/native/native/vararg.js +++ b/js/js.translator/testFiles/native/native/vararg.js @@ -32,7 +32,7 @@ function test3(bar, dummy /*, args */) { } var obj = { - test : function (size /*, args */) { + test: function (size /*, args */) { return (arguments.length - 1) === size; } }; diff --git a/js/js.translator/testFiles/number/cases/kt2342.kt b/js/js.translator/testFiles/number/cases/kt2342.kt index 75f68a3580a..0169c627213 100644 --- a/js/js.translator/testFiles/number/cases/kt2342.kt +++ b/js/js.translator/testFiles/number/cases/kt2342.kt @@ -1,9 +1,9 @@ package foo fun test(a: Int, b: Int, expected: Int): String { - val result = a / b - if (expected == result) return "OK" - return "$a / $b = $result. Expected $expected" + val result = a / b + if (expected == result) return "OK" + return "$a / $b = $result. Expected $expected" } fun box(): String { diff --git a/js/js.translator/testFiles/number/cases/numberConversions.kt b/js/js.translator/testFiles/number/cases/numberConversions.kt index 3fb6b67abe8..d3378a8b5d7 100644 --- a/js/js.translator/testFiles/number/cases/numberConversions.kt +++ b/js/js.translator/testFiles/number/cases/numberConversions.kt @@ -39,4 +39,4 @@ fun testFloatingPointConversions(c: Number): Boolean { } fun box(): Boolean = testIntegerConversions(3) && testFloatingPointConversions(3.6) && testFloatingPointConversions(3.6.toFloat()) && - testIntegerConversions(3.toByte()) && testIntegerConversions(3.toShort()) \ No newline at end of file +testIntegerConversions(3.toByte()) && testIntegerConversions(3.toShort()) \ No newline at end of file diff --git a/js/js.translator/testFiles/object/cases/objectDeclarationWithVars.kt b/js/js.translator/testFiles/object/cases/objectDeclarationWithVars.kt index e054596f99c..e825c4ed019 100644 --- a/js/js.translator/testFiles/object/cases/objectDeclarationWithVars.kt +++ b/js/js.translator/testFiles/object/cases/objectDeclarationWithVars.kt @@ -5,7 +5,7 @@ object State { val b = 1 } -fun box() : Boolean { +fun box(): Boolean { if (State.c != 2) return false if (State.b != 1) return false return true diff --git a/js/js.translator/testFiles/object/cases/objectInObject.kt b/js/js.translator/testFiles/object/cases/objectInObject.kt index 430701ca6e8..f310a4475cc 100644 --- a/js/js.translator/testFiles/object/cases/objectInObject.kt +++ b/js/js.translator/testFiles/object/cases/objectInObject.kt @@ -1,19 +1,25 @@ package foo object A { - object query {val status = "complete"} + object query { + val status = "complete" + } } object B { - private val ov = "d" - object query {val status = "complete" + ov} + private val ov = "d" + object query { + val status = "complete" + ov + } } class C { - class object { - fun ov() = "d" - } - object query {val status = "complete" + ov()} + class object { + fun ov() = "d" + } + object query { + val status = "complete" + ov() + } } fun box() = A.query.status == "complete" && B.query.status == "completed" diff --git a/js/js.translator/testFiles/object/cases/objectInheritingFromATrait.kt b/js/js.translator/testFiles/object/cases/objectInheritingFromATrait.kt index ac3ad2197cd..d90b7107fc9 100644 --- a/js/js.translator/testFiles/object/cases/objectInheritingFromATrait.kt +++ b/js/js.translator/testFiles/object/cases/objectInheritingFromATrait.kt @@ -1,15 +1,15 @@ package foo trait Foo { - fun execute(handler: ()->Unit) { + fun execute(handler: () -> Unit) { execute(false, handler) } - fun execute(onlyIfAttached: Boolean, handler: ()->Unit) + fun execute(onlyIfAttached: Boolean, handler: () -> Unit) } object foo : Foo { - override fun execute(onlyIfAttached: Boolean, handler: ()->Unit) { + override fun execute(onlyIfAttached: Boolean, handler: () -> Unit) { handler() } } diff --git a/js/js.translator/testFiles/object/cases/objectInheritingFromClass.kt b/js/js.translator/testFiles/object/cases/objectInheritingFromClass.kt index 667de61ec3b..19e62783645 100644 --- a/js/js.translator/testFiles/object/cases/objectInheritingFromClass.kt +++ b/js/js.translator/testFiles/object/cases/objectInheritingFromClass.kt @@ -1,6 +1,6 @@ package foo -abstract class A(val s:String) { +abstract class A(val s: String) { } object B : A("test") { diff --git a/js/js.translator/testFiles/object/cases/objectWithMethods.kt b/js/js.translator/testFiles/object/cases/objectWithMethods.kt index a05fd859306..34b655478b7 100644 --- a/js/js.translator/testFiles/object/cases/objectWithMethods.kt +++ b/js/js.translator/testFiles/object/cases/objectWithMethods.kt @@ -1,20 +1,20 @@ package foo class Test { - private val a = object { - fun c() = 3 - fun b() = 2 - } + private val a = object { + fun c() = 3 + fun b() = 2 + } - fun doTest(): Boolean { - if (a.c() != 3) { - return false; + fun doTest(): Boolean { + if (a.c() != 3) { + return false; + } + if (a.b() != 2) { + return false; + } + return true; } - if (a.b() != 2) { - return false; - } - return true; - } } fun box(): Boolean { diff --git a/js/js.translator/testFiles/operatorOverloading/cases/binaryDivOverload.kt b/js/js.translator/testFiles/operatorOverloading/cases/binaryDivOverload.kt index 2e80158891e..0e93f2616c6 100644 --- a/js/js.translator/testFiles/operatorOverloading/cases/binaryDivOverload.kt +++ b/js/js.translator/testFiles/operatorOverloading/cases/binaryDivOverload.kt @@ -2,7 +2,7 @@ package foo class A() { - fun div(other : A) = "hooray" + fun div(other: A) = "hooray" } diff --git a/js/js.translator/testFiles/operatorOverloading/cases/compareTo.kt b/js/js.translator/testFiles/operatorOverloading/cases/compareTo.kt index fe76441d36e..9bc2bce596d 100644 --- a/js/js.translator/testFiles/operatorOverloading/cases/compareTo.kt +++ b/js/js.translator/testFiles/operatorOverloading/cases/compareTo.kt @@ -1,11 +1,11 @@ package foo - class A(t : Int) { +class A(t: Int) { var i = t - fun compareTo(other : A) = (this.i - other.i) - } - -fun box() : Boolean{ - return (A(3) > A(2)) && (A(2) >= A(2)) && (A(1) >= A(0)) && (A(2) <= A(2)) && (A(3) <= A(4)) && (A(0) < A(100)) + fun compareTo(other: A) = (this.i - other.i) +} + +fun box(): Boolean { + return (A(3) > A(2)) && (A(2) >= A(2)) && (A(1) >= A(0)) && (A(2) <= A(2)) && (A(3) <= A(4)) && (A(0) < A(100)) } diff --git a/js/js.translator/testFiles/operatorOverloading/cases/operatorOverloadOnPropertyCallGetterAndSetterOnlyOnce.kt b/js/js.translator/testFiles/operatorOverloading/cases/operatorOverloadOnPropertyCallGetterAndSetterOnlyOnce.kt index e3d5422427c..21c816f3baa 100644 --- a/js/js.translator/testFiles/operatorOverloading/cases/operatorOverloadOnPropertyCallGetterAndSetterOnlyOnce.kt +++ b/js/js.translator/testFiles/operatorOverloading/cases/operatorOverloadOnPropertyCallGetterAndSetterOnlyOnce.kt @@ -1,32 +1,32 @@ package foo -class MyInt(i : Int) { - var b = i - fun inc() : MyInt { - b = b + 1; - return this; +class MyInt(i: Int) { + var b = i + fun inc(): MyInt { + b = b + 1; + return this; } } class A() { - - var gc = 0 - var sc = 0 - - var b = MyInt(0) - get() { - gc = gc + 1; - return $b; - } - set(a : MyInt) { - sc = sc + 1; - } + var gc = 0 + var sc = 0 + + + var b = MyInt(0) + get() { + gc = gc + 1; + return $b; + } + set(a: MyInt) { + sc = sc + 1; + } } -fun box() : Boolean { - val t = A() - val d = t.b++; - return (t.sc == 1) && (t.gc == 1); +fun box(): Boolean { + val t = A() + val d = t.b++; + return (t.sc == 1) && (t.gc == 1); } \ No newline at end of file diff --git a/js/js.translator/testFiles/operatorOverloading/cases/overloadUnaryOperationsViaExtensionFunctions.kt b/js/js.translator/testFiles/operatorOverloading/cases/overloadUnaryOperationsViaExtensionFunctions.kt index c4d11c822ee..219cd22c5fe 100644 --- a/js/js.translator/testFiles/operatorOverloading/cases/overloadUnaryOperationsViaExtensionFunctions.kt +++ b/js/js.translator/testFiles/operatorOverloading/cases/overloadUnaryOperationsViaExtensionFunctions.kt @@ -1,6 +1,7 @@ package foo -class A(val c: Int) {} +class A(val c: Int) { +} fun A.inc() = A(5) diff --git a/js/js.translator/testFiles/operatorOverloading/cases/overloadedCallOnProperty.kt b/js/js.translator/testFiles/operatorOverloading/cases/overloadedCallOnProperty.kt index e539c6936a2..2daccf41a6a 100644 --- a/js/js.translator/testFiles/operatorOverloading/cases/overloadedCallOnProperty.kt +++ b/js/js.translator/testFiles/operatorOverloading/cases/overloadedCallOnProperty.kt @@ -3,9 +3,9 @@ package foo var a = MyInt() class MyInt() { - var b = 0 + var b = 0 - fun inc() : MyInt { + fun inc(): MyInt { val res = MyInt(); res.b = b; res.b++; @@ -14,7 +14,7 @@ class MyInt() { } -fun box() : Boolean { +fun box(): Boolean { a++; a++; return (a.b == 2); diff --git a/js/js.translator/testFiles/operatorOverloading/cases/plusAndMinusAsAnExpression.kt b/js/js.translator/testFiles/operatorOverloading/cases/plusAndMinusAsAnExpression.kt index 2e228a78db0..fdd66ad6be3 100644 --- a/js/js.translator/testFiles/operatorOverloading/cases/plusAndMinusAsAnExpression.kt +++ b/js/js.translator/testFiles/operatorOverloading/cases/plusAndMinusAsAnExpression.kt @@ -7,7 +7,7 @@ class A() { } -fun box() : Boolean { +fun box(): Boolean { var c = A() return (+c + -c == "hooraynot really") } \ No newline at end of file diff --git a/js/js.translator/testFiles/operatorOverloading/cases/plusAssignNoReassign.kt b/js/js.translator/testFiles/operatorOverloading/cases/plusAssignNoReassign.kt index 263dab36a02..48c8e9616b4 100644 --- a/js/js.translator/testFiles/operatorOverloading/cases/plusAssignNoReassign.kt +++ b/js/js.translator/testFiles/operatorOverloading/cases/plusAssignNoReassign.kt @@ -3,13 +3,13 @@ package foo class A() { var message = "" - fun plusAssign(other : A) { + fun plusAssign(other: A) { message = message + "!" } } -fun box() : Boolean { +fun box(): Boolean { var c = A() c += A() c += A() diff --git a/js/js.translator/testFiles/operatorOverloading/cases/plusOverload.kt b/js/js.translator/testFiles/operatorOverloading/cases/plusOverload.kt index 189610ae5f6..bd4396c0a97 100644 --- a/js/js.translator/testFiles/operatorOverloading/cases/plusOverload.kt +++ b/js/js.translator/testFiles/operatorOverloading/cases/plusOverload.kt @@ -1,12 +1,12 @@ package foo - class myInt(a : Int) { +class myInt(a: Int) { val value = a; - fun plus(other : myInt) : myInt = myInt(value + other.value) - } + fun plus(other: myInt): myInt = myInt(value + other.value) +} -fun box() : Boolean { +fun box(): Boolean { - return (myInt(3) + myInt(5)).value == 8 + return (myInt(3) + myInt(5)).value == 8 } \ No newline at end of file diff --git a/js/js.translator/testFiles/operatorOverloading/cases/postfixInc.kt b/js/js.translator/testFiles/operatorOverloading/cases/postfixInc.kt index ec911c90cc7..d5292dc656f 100644 --- a/js/js.translator/testFiles/operatorOverloading/cases/postfixInc.kt +++ b/js/js.translator/testFiles/operatorOverloading/cases/postfixInc.kt @@ -1,9 +1,9 @@ package foo class MyInt() { - var b = 0 + var b = 0 - fun inc() : MyInt { + fun inc(): MyInt { val res = MyInt() res.b++; return res; @@ -11,7 +11,7 @@ class MyInt() { } -fun box() : Boolean { +fun box(): Boolean { var c = MyInt() c++; return (c.b == 1); diff --git a/js/js.translator/testFiles/operatorOverloading/cases/postfixOnProperty.kt b/js/js.translator/testFiles/operatorOverloading/cases/postfixOnProperty.kt index 82d1e58dcb3..3a9c59a065d 100644 --- a/js/js.translator/testFiles/operatorOverloading/cases/postfixOnProperty.kt +++ b/js/js.translator/testFiles/operatorOverloading/cases/postfixOnProperty.kt @@ -3,16 +3,16 @@ package foo var a = MyInt() class MyInt() { - var b = 0 + var b = 0 - fun inc() : MyInt { - b = b + 1; - return this; + fun inc(): MyInt { + b = b + 1; + return this; } } -fun box() : Boolean { +fun box(): Boolean { val d = a++; return (a.b == 1) && (d.b == 1); } \ No newline at end of file diff --git a/js/js.translator/testFiles/operatorOverloading/cases/prefixDecOverload.kt b/js/js.translator/testFiles/operatorOverloading/cases/prefixDecOverload.kt index 7ac38374bc7..31d22751532 100644 --- a/js/js.translator/testFiles/operatorOverloading/cases/prefixDecOverload.kt +++ b/js/js.translator/testFiles/operatorOverloading/cases/prefixDecOverload.kt @@ -1,17 +1,17 @@ package foo class MyInt() { - var b = 0 + var b = 0 - fun dec() : MyInt { - val res = MyInt() - res.b++; - return res; + fun dec(): MyInt { + val res = MyInt() + res.b++; + return res; } } -fun box() : Boolean { +fun box(): Boolean { var c = MyInt() --c; return (c.b == 1); diff --git a/js/js.translator/testFiles/operatorOverloading/cases/prefixIncReturnsCorrectValue.kt b/js/js.translator/testFiles/operatorOverloading/cases/prefixIncReturnsCorrectValue.kt index 74010cc9d0e..ba9d0bb1538 100644 --- a/js/js.translator/testFiles/operatorOverloading/cases/prefixIncReturnsCorrectValue.kt +++ b/js/js.translator/testFiles/operatorOverloading/cases/prefixIncReturnsCorrectValue.kt @@ -1,17 +1,17 @@ package foo class MyInt() { - var b = 0 + var b = 0 - fun dec() : MyInt { - b = b + 1; - return this; - } + fun dec(): MyInt { + b = b + 1; + return this; + } } - fun box() : Boolean { - var c = MyInt() - val d = --c; - return (c.b == 1); - } \ No newline at end of file +fun box(): Boolean { + var c = MyInt() + val d = --c; + return (c.b == 1); +} \ No newline at end of file diff --git a/js/js.translator/testFiles/operatorOverloading/cases/unaryOnIntProperty.kt b/js/js.translator/testFiles/operatorOverloading/cases/unaryOnIntProperty.kt index 82bddf2cc80..29f2dfeaca1 100644 --- a/js/js.translator/testFiles/operatorOverloading/cases/unaryOnIntProperty.kt +++ b/js/js.translator/testFiles/operatorOverloading/cases/unaryOnIntProperty.kt @@ -1,15 +1,15 @@ package foo -class MyInt(i : Int) { - var b = i - fun inc() : MyInt { - b = b++; - return this; +class MyInt(i: Int) { + var b = i + fun inc(): MyInt { + b = b++; + return this; } } -fun box() : Boolean { - var t = MyInt(0) - t++; - return (t.b == 0) +fun box(): Boolean { + var t = MyInt(0) + t++; + return (t.b == 0) } \ No newline at end of file diff --git a/js/js.translator/testFiles/operatorOverloading/cases/unaryOnIntPropertyAsStatement.kt b/js/js.translator/testFiles/operatorOverloading/cases/unaryOnIntPropertyAsStatement.kt index 601d9b31a8f..f5bd9a49de7 100644 --- a/js/js.translator/testFiles/operatorOverloading/cases/unaryOnIntPropertyAsStatement.kt +++ b/js/js.translator/testFiles/operatorOverloading/cases/unaryOnIntPropertyAsStatement.kt @@ -1,15 +1,15 @@ package foo -class MyInt(i : Int) { - var b = i - fun inc() : MyInt { - b++; - return this; +class MyInt(i: Int) { + var b = i + fun inc(): MyInt { + b++; + return this; } } -fun box() : Boolean { - var t = MyInt(0) - t++; - return (t.b == 1) +fun box(): Boolean { + var t = MyInt(0) + t++; + return (t.b == 1) } \ No newline at end of file diff --git a/js/js.translator/testFiles/operatorOverloading/cases/usingModInCaseModAssignNotAvailable.kt b/js/js.translator/testFiles/operatorOverloading/cases/usingModInCaseModAssignNotAvailable.kt index 44a386fb728..b303d6c5986 100644 --- a/js/js.translator/testFiles/operatorOverloading/cases/usingModInCaseModAssignNotAvailable.kt +++ b/js/js.translator/testFiles/operatorOverloading/cases/usingModInCaseModAssignNotAvailable.kt @@ -2,12 +2,12 @@ package foo class A() { var p = "yeah" - fun mod(other : A) : A { + fun mod(other: A): A { return A(); } } -fun box() : Boolean { +fun box(): Boolean { var c = A() val d = c; c %= A(); diff --git a/js/js.translator/testFiles/package/cases/classCreatedInDeeplyNestedPackage.kt b/js/js.translator/testFiles/package/cases/classCreatedInDeeplyNestedPackage.kt index 47d68ea3b2c..5c6abc900b3 100644 --- a/js/js.translator/testFiles/package/cases/classCreatedInDeeplyNestedPackage.kt +++ b/js/js.translator/testFiles/package/cases/classCreatedInDeeplyNestedPackage.kt @@ -3,5 +3,5 @@ package foo1.foo2.foo3.foo5.foo6.foo7.foo8 fun box() = A().doBox() class A() { - fun doBox() = true + fun doBox() = true } \ No newline at end of file diff --git a/js/js.translator/testFiles/patternMatching/cases/kt1665.kt b/js/js.translator/testFiles/patternMatching/cases/kt1665.kt index e7a782d1a09..f95c24a929c 100644 --- a/js/js.translator/testFiles/patternMatching/cases/kt1665.kt +++ b/js/js.translator/testFiles/patternMatching/cases/kt1665.kt @@ -1,11 +1,11 @@ package foo fun box(): String { - val a = 10 - val b = 3 - when { - a > b -> return "OK" - b > a -> return "b" - else -> return "else" - } + val a = 10 + val b = 3 + when { + a > b -> return "OK" + b > a -> return "b" + else -> return "else" + } } \ No newline at end of file diff --git a/js/js.translator/testFiles/patternMatching/cases/matchNullableType.kt b/js/js.translator/testFiles/patternMatching/cases/matchNullableType.kt index 0c5dd0b1e73..e4680f48ca8 100644 --- a/js/js.translator/testFiles/patternMatching/cases/matchNullableType.kt +++ b/js/js.translator/testFiles/patternMatching/cases/matchNullableType.kt @@ -4,10 +4,10 @@ class A() { } -fun box() : Boolean { - var a = null : A? - when(a) { - is A? -> return true - else -> return false - } +fun box(): Boolean { + var a = null : A? + when(a) { + is A? -> return true + else -> return false + } } \ No newline at end of file diff --git a/js/js.translator/testFiles/patternMatching/cases/multipleCases.kt b/js/js.translator/testFiles/patternMatching/cases/multipleCases.kt index de35c3d1c8c..c98defa288f 100644 --- a/js/js.translator/testFiles/patternMatching/cases/multipleCases.kt +++ b/js/js.translator/testFiles/patternMatching/cases/multipleCases.kt @@ -1,17 +1,21 @@ package foo -fun box() : Int { - val c = 3 - val d = 5 - var z = 0 - when(c) { - 5, 3 -> z++; - else -> {z = -1000;} - } +fun box(): Int { + val c = 3 + val d = 5 + var z = 0 + when(c) { + 5, 3 -> z++; + else -> { + z = -1000; + } + } - when(d) { - 5, 3 -> z++; - else -> {z = -1000;} - } - return z + when(d) { + 5, 3 -> z++; + else -> { + z = -1000; + } + } + return z } \ No newline at end of file diff --git a/js/js.translator/testFiles/patternMatching/cases/whenAsExpression.kt b/js/js.translator/testFiles/patternMatching/cases/whenAsExpression.kt index c56b7b5ed02..453fb22c769 100644 --- a/js/js.translator/testFiles/patternMatching/cases/whenAsExpression.kt +++ b/js/js.translator/testFiles/patternMatching/cases/whenAsExpression.kt @@ -1,7 +1,7 @@ package foo -fun box() : Boolean { +fun box(): Boolean { return (when(1) { 2 -> 3 diff --git a/js/js.translator/testFiles/patternMatching/cases/whenAsExpressionWithThrow.kt b/js/js.translator/testFiles/patternMatching/cases/whenAsExpressionWithThrow.kt index 77f35cf338f..54b15d5944e 100644 --- a/js/js.translator/testFiles/patternMatching/cases/whenAsExpressionWithThrow.kt +++ b/js/js.translator/testFiles/patternMatching/cases/whenAsExpressionWithThrow.kt @@ -1,6 +1,6 @@ package foo -fun box() : Boolean { +fun box(): Boolean { (when (1) { diff --git a/js/js.translator/testFiles/patternMatching/cases/whenEvaluatesArgumentOnlyOnce.kt b/js/js.translator/testFiles/patternMatching/cases/whenEvaluatesArgumentOnlyOnce.kt index ecc7e97c523..66f576e571f 100644 --- a/js/js.translator/testFiles/patternMatching/cases/whenEvaluatesArgumentOnlyOnce.kt +++ b/js/js.translator/testFiles/patternMatching/cases/whenEvaluatesArgumentOnlyOnce.kt @@ -1,12 +1,12 @@ package foo -fun box() : Boolean { - var a = 0 - var i = 0 - when(i++) { - -100 -> a++ - 100 -> a++ - else -> a++ - } - return (a == 1) && (i == 1) +fun box(): Boolean { + var a = 0 + var i = 0 + when(i++) { + -100 -> a++ + 100 -> a++ + else -> a++ + } + return (a == 1) && (i == 1) } \ No newline at end of file diff --git a/js/js.translator/testFiles/patternMatching/cases/whenExecutesOnlyOnce.kt b/js/js.translator/testFiles/patternMatching/cases/whenExecutesOnlyOnce.kt index df7f96eced2..4d910a39e15 100644 --- a/js/js.translator/testFiles/patternMatching/cases/whenExecutesOnlyOnce.kt +++ b/js/js.translator/testFiles/patternMatching/cases/whenExecutesOnlyOnce.kt @@ -4,12 +4,12 @@ class A() { } -fun box() : Boolean { - var a = 0 - when(A()) { - is A -> a++; - is A -> a++; - else -> a++; - } - return (a == 1) +fun box(): Boolean { + var a = 0 + when(A()) { + is A -> a++; + is A -> a++; + else -> a++; + } + return (a == 1) } \ No newline at end of file diff --git a/js/js.translator/testFiles/patternMatching/cases/whenNotType.kt b/js/js.translator/testFiles/patternMatching/cases/whenNotType.kt index 554dc5c8b1e..2dae1b2301b 100644 --- a/js/js.translator/testFiles/patternMatching/cases/whenNotType.kt +++ b/js/js.translator/testFiles/patternMatching/cases/whenNotType.kt @@ -4,9 +4,9 @@ class A() { } -fun box() : Boolean { - when(A()) { - !is A -> return false; - else -> return true; - } +fun box(): Boolean { + when(A()) { + !is A -> return false; + else -> return true; + } } \ No newline at end of file diff --git a/js/js.translator/testFiles/patternMatching/cases/whenType.kt b/js/js.translator/testFiles/patternMatching/cases/whenType.kt index adad4fa5cd2..80dff939ffb 100644 --- a/js/js.translator/testFiles/patternMatching/cases/whenType.kt +++ b/js/js.translator/testFiles/patternMatching/cases/whenType.kt @@ -4,9 +4,9 @@ class A() { } -fun box() : Boolean { - when(A()) { - is A -> return true; - else -> return false; - } +fun box(): Boolean { + when(A()) { + is A -> return true; + else -> return false; + } } \ No newline at end of file diff --git a/js/js.translator/testFiles/patternMatching/cases/whenValue.kt b/js/js.translator/testFiles/patternMatching/cases/whenValue.kt index fe86c6e9a1d..4a75b074649 100644 --- a/js/js.translator/testFiles/patternMatching/cases/whenValue.kt +++ b/js/js.translator/testFiles/patternMatching/cases/whenValue.kt @@ -1,11 +1,17 @@ package foo -fun box() : Boolean { - var a = 4 - when(a) { - 3 -> {a = 10;} - 4 -> {a = 20;} - else -> {a = 30;} - } - return (a == 20) +fun box(): Boolean { + var a = 4 + when(a) { + 3 -> { + a = 10; + } + 4 -> { + a = 20; + } + else -> { + a = 30; + } + } + return (a == 20) } \ No newline at end of file diff --git a/js/js.translator/testFiles/patternMatching/cases/whenValueOrType.kt b/js/js.translator/testFiles/patternMatching/cases/whenValueOrType.kt index de255e489a3..773acdc7076 100644 --- a/js/js.translator/testFiles/patternMatching/cases/whenValueOrType.kt +++ b/js/js.translator/testFiles/patternMatching/cases/whenValueOrType.kt @@ -8,20 +8,20 @@ class B() { } -fun box() : Boolean { - var c : Int = 0 - var a = A() : Any? - var b = null : Any? - when(a) { - null -> c = 10; - is B -> c = 10000 - is A -> c = 20; - else -> c = 1000 - } - when(b) { - null -> c += 5 - is B -> c += 100 - else -> c = 1000 - } - return (c == 25) +fun box(): Boolean { + var c: Int = 0 + var a = A() : Any? + var b = null : Any? + when(a) { + null -> c = 10; + is B -> c = 10000 + is A -> c = 20; + else -> c = 1000 + } + when(b) { + null -> c += 5 + is B -> c += 100 + else -> c = 1000 + } + return (c == 25) } \ No newline at end of file diff --git a/js/js.translator/testFiles/patternMatching/cases/whenWithIf.kt b/js/js.translator/testFiles/patternMatching/cases/whenWithIf.kt index f7df3292b4c..e4abf41920f 100644 --- a/js/js.translator/testFiles/patternMatching/cases/whenWithIf.kt +++ b/js/js.translator/testFiles/patternMatching/cases/whenWithIf.kt @@ -1,19 +1,24 @@ package foo -fun box() : Boolean { +fun box(): Boolean { - var c = when(3) { - 3 -> 1 - 2 -> 100 - else -> 100 - } + when (2) { - 1 -> 100 - else -> 1 - } + when (0) { - 1 -> if (true) 100 else 100 - 0 -> if (false) {100} else {1} - else -> 100 - } + var c = when(3) { + 3 -> 1 + 2 -> 100 + else -> 100 + } + when (2) { + 1 -> 100 + else -> 1 + } + when (0) { + 1 -> if (true) 100 else 100 + 0 -> if (false) { + 100 + } + else { + 1 + } + else -> 100 + } - return c == 3 + return c == 3 } \ No newline at end of file diff --git a/js/js.translator/testFiles/patternMatching/cases/whenWithoutExpression.kt b/js/js.translator/testFiles/patternMatching/cases/whenWithoutExpression.kt index b8d933a30ce..c6053f5e152 100644 --- a/js/js.translator/testFiles/patternMatching/cases/whenWithoutExpression.kt +++ b/js/js.translator/testFiles/patternMatching/cases/whenWithoutExpression.kt @@ -1,6 +1,6 @@ package foo fun box() = when { - 1 > 3 -> false - else -> true + 1 > 3 -> false + else -> true } \ No newline at end of file diff --git a/js/js.translator/testFiles/propertyAccess/cases/accessToInstanceProperty.kt b/js/js.translator/testFiles/propertyAccess/cases/accessToInstanceProperty.kt index 41c7a3e78a4..e8002f251e2 100644 --- a/js/js.translator/testFiles/propertyAccess/cases/accessToInstanceProperty.kt +++ b/js/js.translator/testFiles/propertyAccess/cases/accessToInstanceProperty.kt @@ -1,10 +1,10 @@ package foo class Test() { - var a : Int = 100 + var a: Int = 100 } -fun box() : Boolean { +fun box(): Boolean { var test = Test() test.a = 1 return (1 == test.a) diff --git a/js/js.translator/testFiles/propertyAccess/cases/classUsesPackageProperties.kt b/js/js.translator/testFiles/propertyAccess/cases/classUsesPackageProperties.kt index a86b58135f7..669ddd04053 100644 --- a/js/js.translator/testFiles/propertyAccess/cases/classUsesPackageProperties.kt +++ b/js/js.translator/testFiles/propertyAccess/cases/classUsesPackageProperties.kt @@ -3,15 +3,15 @@ package foo var a = 0 class A() { - { - a++ - } + { + a++ + } } - fun box() : Boolean { +fun box(): Boolean { var c = A() c = A() c = A() return (a == 3) - } \ No newline at end of file +} \ No newline at end of file diff --git a/js/js.translator/testFiles/propertyAccess/cases/customGetter.kt b/js/js.translator/testFiles/propertyAccess/cases/customGetter.kt index 71985e128a6..3d3d6eb4b43 100644 --- a/js/js.translator/testFiles/propertyAccess/cases/customGetter.kt +++ b/js/js.translator/testFiles/propertyAccess/cases/customGetter.kt @@ -1,13 +1,13 @@ package foo class Test() { - val a : Int - get() { - return 5; - } + val a: Int + get() { + return 5; + } } -fun box() : Boolean { +fun box(): Boolean { var test = Test() - return (test.a ==5) + return (test.a == 5) } \ No newline at end of file diff --git a/js/js.translator/testFiles/propertyAccess/cases/customSetter.kt b/js/js.translator/testFiles/propertyAccess/cases/customSetter.kt index b4661d3886b..4d7e5007522 100644 --- a/js/js.translator/testFiles/propertyAccess/cases/customSetter.kt +++ b/js/js.translator/testFiles/propertyAccess/cases/customSetter.kt @@ -1,13 +1,13 @@ package foo class Test() { - var a : Int = 5 - set(b : Int) { - $a = 3 - } + var a: Int = 5 + set(b: Int) { + $a = 3 + } } -fun box() : Boolean { +fun box(): Boolean { var test = Test() test.a = 5 return (test.a == 3) diff --git a/js/js.translator/testFiles/propertyAccess/cases/enumerable.kt b/js/js.translator/testFiles/propertyAccess/cases/enumerable.kt index 9293e7ba318..847ef407819 100644 --- a/js/js.translator/testFiles/propertyAccess/cases/enumerable.kt +++ b/js/js.translator/testFiles/propertyAccess/cases/enumerable.kt @@ -4,25 +4,27 @@ import js.enumerable import js.native native -fun _enumerate(o:T):T = noImpl +fun _enumerate(o: T): T = noImpl native -fun _findFirst(o:Any):T = noImpl +fun _findFirst(o: Any): T = noImpl enumerable class Test() { - val a:Int = 100 - val b:String = "s" + val a: Int = 100 + val b: String = "s" } class P() { enumerable - val a:Int = 100 - val b:String = "s" + val a: Int = 100 + val b: String = "s" } -fun box():Boolean { +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; + 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/extensionLiteralSafeCall.kt b/js/js.translator/testFiles/propertyAccess/cases/extensionLiteralSafeCall.kt index c811204e80d..ca2c09df7cc 100644 --- a/js/js.translator/testFiles/propertyAccess/cases/extensionLiteralSafeCall.kt +++ b/js/js.translator/testFiles/propertyAccess/cases/extensionLiteralSafeCall.kt @@ -1,14 +1,14 @@ package foo -fun f(a : Int?, b : Int.(Int)->Int) = a?.b(2) +fun f(a: Int?, b: Int.(Int) -> Int) = a?.b(2) -fun box() : Boolean { - val c1 = f (null) { - it + this - } != null - if (c1) return false; - if (f(3) { - it + this - } != 5) return false - return true; +fun box(): Boolean { + val c1 = f (null) { + it + this + } != null + if (c1) return false; + if (f(3) { + it + this + } != 5) return false + return true; } diff --git a/js/js.translator/testFiles/propertyAccess/cases/initInstanceProperties.kt b/js/js.translator/testFiles/propertyAccess/cases/initInstanceProperties.kt index 4bff8d97a43..913c68de7ce 100644 --- a/js/js.translator/testFiles/propertyAccess/cases/initInstanceProperties.kt +++ b/js/js.translator/testFiles/propertyAccess/cases/initInstanceProperties.kt @@ -1,12 +1,12 @@ package foo class Test() { - val a : Int = 100 - var b : Int = a - val c : Int = a + b + val a: Int = 100 + var b: Int = a + val c: Int = a + b } -fun box() : Boolean { +fun box(): Boolean { val test = Test() return (100 == test.a && 100 == test.b && 200 == test.c) } diff --git a/js/js.translator/testFiles/propertyAccess/cases/overloadedOverriddenFunctionPropertyName.kt b/js/js.translator/testFiles/propertyAccess/cases/overloadedOverriddenFunctionPropertyName.kt index 01966f781e7..efde8db356e 100644 --- a/js/js.translator/testFiles/propertyAccess/cases/overloadedOverriddenFunctionPropertyName.kt +++ b/js/js.translator/testFiles/propertyAccess/cases/overloadedOverriddenFunctionPropertyName.kt @@ -4,7 +4,7 @@ trait I { fun test(): String } -class P: I { +class P : I { override fun test(): String { return "a" + test("b") } diff --git a/js/js.translator/testFiles/propertyAccess/cases/packageCustomAccessors.kt b/js/js.translator/testFiles/propertyAccess/cases/packageCustomAccessors.kt index a1baf765e19..404c3ae3438 100644 --- a/js/js.translator/testFiles/propertyAccess/cases/packageCustomAccessors.kt +++ b/js/js.translator/testFiles/propertyAccess/cases/packageCustomAccessors.kt @@ -1,15 +1,15 @@ package foo -var a : Int +var a: Int -get() { - return 5 -} -set(b) { + get() { + return 5 + } + set(b) { -} + } -fun box() : Boolean { +fun box(): Boolean { return (a == 5) } \ No newline at end of file diff --git a/js/js.translator/testFiles/propertyAccess/cases/packagePropertySet.kt b/js/js.translator/testFiles/propertyAccess/cases/packagePropertySet.kt index 462e4e06809..fca6761f59b 100644 --- a/js/js.translator/testFiles/propertyAccess/cases/packagePropertySet.kt +++ b/js/js.translator/testFiles/propertyAccess/cases/packagePropertySet.kt @@ -2,7 +2,7 @@ package foo var b = 3 -fun box() : Boolean { +fun box(): Boolean { b = 2 return (b == 2) } \ No newline at end of file diff --git a/js/js.translator/testFiles/propertyAccess/cases/setter.kt b/js/js.translator/testFiles/propertyAccess/cases/setter.kt index 377ff8c8693..b4e1432eaa2 100644 --- a/js/js.translator/testFiles/propertyAccess/cases/setter.kt +++ b/js/js.translator/testFiles/propertyAccess/cases/setter.kt @@ -1,10 +1,10 @@ package foo class Test() { - var a : Int = 1 + var a: Int = 1 } -fun box() : Int { +fun box(): Int { var a = Test() var b = Test() b.a = 100 diff --git a/js/js.translator/testFiles/propertyAccess/cases/twoClassesWithProperties.kt b/js/js.translator/testFiles/propertyAccess/cases/twoClassesWithProperties.kt index 59ff5566d7c..ff7213899bf 100644 --- a/js/js.translator/testFiles/propertyAccess/cases/twoClassesWithProperties.kt +++ b/js/js.translator/testFiles/propertyAccess/cases/twoClassesWithProperties.kt @@ -1,13 +1,13 @@ package foo class A() { - val a : Int = 1 + val a: Int = 1 } class B() { - val b : Int = 2 + val b: Int = 2 } -fun box() : Boolean { +fun box(): Boolean { return ((A().a == 1) && (B().b == 2)); } \ No newline at end of file diff --git a/js/js.translator/testFiles/propertyOverride/cases/checkSupertypeOrder.kt b/js/js.translator/testFiles/propertyOverride/cases/checkSupertypeOrder.kt index b6707504a3c..73ac6fb79dc 100644 --- a/js/js.translator/testFiles/propertyOverride/cases/checkSupertypeOrder.kt +++ b/js/js.translator/testFiles/propertyOverride/cases/checkSupertypeOrder.kt @@ -11,7 +11,7 @@ open class B { open val bal = 239 } -class C1: B(), A { +class C1 : B(), A { override val bal: Int = 14 fun getBalA(): Int { @@ -23,7 +23,7 @@ class C1: B(), A { } } -class C2: A, B() { +class C2 : A, B() { override val bal: Int = 14 fun getBalA(): Int { diff --git a/js/js.translator/testFiles/propertyOverride/cases/overrideNotDirectlySuper.kt b/js/js.translator/testFiles/propertyOverride/cases/overrideNotDirectlySuper.kt index b0c82cac5fb..bb2aafc96db 100644 --- a/js/js.translator/testFiles/propertyOverride/cases/overrideNotDirectlySuper.kt +++ b/js/js.translator/testFiles/propertyOverride/cases/overrideNotDirectlySuper.kt @@ -5,7 +5,7 @@ open class A { fun getAInA(): Int = a } -open class AA: A() +open class AA : A() class B : AA() { override var a = 2 diff --git a/js/js.translator/testFiles/propertyOverride/cases/overrideValFromTraits.kt b/js/js.translator/testFiles/propertyOverride/cases/overrideValFromTraits.kt index f97f46b56c9..6edcf2080f7 100644 --- a/js/js.translator/testFiles/propertyOverride/cases/overrideValFromTraits.kt +++ b/js/js.translator/testFiles/propertyOverride/cases/overrideValFromTraits.kt @@ -33,7 +33,7 @@ trait B { var realBar: Int } -class C: A, B { +class C : A, B { override val bal: Int = 1 override var bar: Int = 2 get() { diff --git a/js/js.translator/testFiles/range/cases/explicitRange.kt b/js/js.translator/testFiles/range/cases/explicitRange.kt index ad3329d5203..711a18241f0 100644 --- a/js/js.translator/testFiles/range/cases/explicitRange.kt +++ b/js/js.translator/testFiles/range/cases/explicitRange.kt @@ -2,7 +2,7 @@ package foo import js.* -fun box() : Boolean { +fun box(): Boolean { var twoToFive = IntRange(2, 5) diff --git a/js/js.translator/testFiles/range/cases/intInRange.kt b/js/js.translator/testFiles/range/cases/intInRange.kt index d5eeb48618d..752dd9ab538 100644 --- a/js/js.translator/testFiles/range/cases/intInRange.kt +++ b/js/js.translator/testFiles/range/cases/intInRange.kt @@ -1,8 +1,7 @@ package foo - -fun box() : Boolean { +fun box(): Boolean { if (1 in -2..0) return false; if (1 in -10..-4) return false; diff --git a/js/js.translator/testFiles/range/cases/intUpTo.kt b/js/js.translator/testFiles/range/cases/intUpTo.kt index b59e1c04e54..f051b34c0e1 100644 --- a/js/js.translator/testFiles/range/cases/intUpTo.kt +++ b/js/js.translator/testFiles/range/cases/intUpTo.kt @@ -2,10 +2,10 @@ package foo import java.util.ArrayList -fun box() : Boolean { +fun box(): Boolean { var elems = ArrayList() for (i in 0 rangeTo 5) { - elems.add(i) + elems.add(i) } - return elems[0] == 0 && elems[1] == 1 && elems[2] == 2 && elems[3] == 3 && elems[4] == 4 && elems[5] == 5 + return elems[0] == 0 && elems[1] == 1 && elems[2] == 2 && elems[3] == 3 && elems[4] == 4 && elems[5] == 5 } \ No newline at end of file diff --git a/js/js.translator/testFiles/range/cases/iteratingOverRanges.kt b/js/js.translator/testFiles/range/cases/iteratingOverRanges.kt index c66bd5f319a..3ae4c518897 100644 --- a/js/js.translator/testFiles/range/cases/iteratingOverRanges.kt +++ b/js/js.translator/testFiles/range/cases/iteratingOverRanges.kt @@ -2,7 +2,7 @@ package foo import js.* -fun box() : Boolean { +fun box(): Boolean { var d = 0 for (i in 1..6) { diff --git a/js/js.translator/testFiles/range/cases/rangeSugarSyntax.kt b/js/js.translator/testFiles/range/cases/rangeSugarSyntax.kt index 679e2df74f9..34b1a4542da 100644 --- a/js/js.translator/testFiles/range/cases/rangeSugarSyntax.kt +++ b/js/js.translator/testFiles/range/cases/rangeSugarSyntax.kt @@ -2,7 +2,7 @@ package foo import js.* -fun box() : Boolean { +fun box(): Boolean { var twoToFive = 2..5 diff --git a/js/js.translator/testFiles/range/cases/rangeToDoesNotIterate.kt b/js/js.translator/testFiles/range/cases/rangeToDoesNotIterate.kt index a319283e54d..0972ea91c7e 100644 --- a/js/js.translator/testFiles/range/cases/rangeToDoesNotIterate.kt +++ b/js/js.translator/testFiles/range/cases/rangeToDoesNotIterate.kt @@ -2,9 +2,9 @@ package foo import java.util.ArrayList -fun box() : Boolean { +fun box(): Boolean { for (i in 0 rangeTo -1) { - return false + return false } return true } \ No newline at end of file diff --git a/js/js.translator/testFiles/rtti/cases/rttiForClass.kt b/js/js.translator/testFiles/rtti/cases/rttiForClass.kt index ebe92c52cac..975a4f83d3a 100644 --- a/js/js.translator/testFiles/rtti/cases/rttiForClass.kt +++ b/js/js.translator/testFiles/rtti/cases/rttiForClass.kt @@ -4,9 +4,9 @@ class D open class A -open class B: A() +open class B : A() -open class C: B() +open class C : B() fun box(): String { val a: Any = A() diff --git a/js/js.translator/testFiles/rtti/cases/rttiForTrait.kt b/js/js.translator/testFiles/rtti/cases/rttiForTrait.kt index 6f82b71ddad..a9eccbbf436 100644 --- a/js/js.translator/testFiles/rtti/cases/rttiForTrait.kt +++ b/js/js.translator/testFiles/rtti/cases/rttiForTrait.kt @@ -5,12 +5,13 @@ open class A trait B -class C: A(), B +class C : A(), B fun box(): String { val a = A() - val b = object : B {} + val b = object : B { + } val c = C() if (a is B) return "a is B" diff --git a/js/js.translator/testFiles/rtti/cases/rttiForTrait2.kt b/js/js.translator/testFiles/rtti/cases/rttiForTrait2.kt index d0d7f96d419..14c76c57ae6 100644 --- a/js/js.translator/testFiles/rtti/cases/rttiForTrait2.kt +++ b/js/js.translator/testFiles/rtti/cases/rttiForTrait2.kt @@ -6,18 +6,18 @@ trait C : A trait D : B, C trait E : C -open class CB: B -class CB2: CB() +open class CB : B +class CB2 : CB() -class CD: D +class CD : D fun testPhrase(o: Any): String { var s = "" - s += if(o is A) "Y" else "N" - s += if(o is B) "Y" else "N" - s += if(o is C) "Y" else "N" - s += if(o is D) "Y" else "N" - s += if(o is E) "Y" else "N" + s += if (o is A) "Y" else "N" + s += if (o is B) "Y" else "N" + s += if (o is C) "Y" else "N" + s += if (o is D) "Y" else "N" + s += if (o is E) "Y" else "N" return s } @@ -25,7 +25,8 @@ fun box(): String { val b = CB() val b2 = CB2() val d = CD() - val e = object : E {} + val e = object : E { + } if (testPhrase(b) != "YYNNN") return "bad b, it: ${testPhrase(b)}" if (testPhrase(b2) != "YYNNN") return "bad b2, it: ${testPhrase(b2)}" diff --git a/js/js.translator/testFiles/safeCall/cases/safeAccess.kt b/js/js.translator/testFiles/safeCall/cases/safeAccess.kt index 7eace25a6fe..70dde21cf8a 100644 --- a/js/js.translator/testFiles/safeCall/cases/safeAccess.kt +++ b/js/js.translator/testFiles/safeCall/cases/safeAccess.kt @@ -4,9 +4,9 @@ class A() { var c = 3 } -fun box() : Boolean { - var a1 : A? = A() - var a2 : A? = null +fun box(): Boolean { + var a1: A? = A() + var a2: A? = null a1?.c = 4 a2?.c = 5 if (a1?.c != 4) { diff --git a/js/js.translator/testFiles/safeCall/cases/safeCall.kt b/js/js.translator/testFiles/safeCall/cases/safeCall.kt index b6b446186f4..eaf9401a6d6 100644 --- a/js/js.translator/testFiles/safeCall/cases/safeCall.kt +++ b/js/js.translator/testFiles/safeCall/cases/safeCall.kt @@ -1,12 +1,12 @@ package foo class A() { - fun doSomething() { - } + fun doSomething() { + } } -fun box() : Boolean { - var a : A? = null; +fun box(): Boolean { + var a: A? = null; a?.doSomething() return true; } \ No newline at end of file diff --git a/js/js.translator/testFiles/safeCall/cases/safeCallReturnsNullIfFails.kt b/js/js.translator/testFiles/safeCall/cases/safeCallReturnsNullIfFails.kt index ee07ddde69e..0e7d26fd1c3 100644 --- a/js/js.translator/testFiles/safeCall/cases/safeCallReturnsNullIfFails.kt +++ b/js/js.translator/testFiles/safeCall/cases/safeCallReturnsNullIfFails.kt @@ -1,10 +1,10 @@ package foo class A() { - val x = 4 + val x = 4 } -fun box() : Boolean { - var a : A? = null; +fun box(): Boolean { + var a: A? = null; return (a?.x == null); } \ No newline at end of file diff --git a/js/js.translator/testFiles/safeCall/cases/safeExtensionFunctionCall.kt b/js/js.translator/testFiles/safeCall/cases/safeExtensionFunctionCall.kt index f37ce75f76f..ef2876ad9d7 100644 --- a/js/js.translator/testFiles/safeCall/cases/safeExtensionFunctionCall.kt +++ b/js/js.translator/testFiles/safeCall/cases/safeExtensionFunctionCall.kt @@ -4,33 +4,33 @@ class A() { var c = 3 } -fun A.i() : Int { +fun A.i(): Int { c = c + 1 - return c + return c } -fun box() : String { - var a1 : A? = A() - var a2 : A? = null - if (a1?.i() != 4) { - return "1"; - } - if (a1?.c != 4) { - return "2"; +fun box(): String { + var a1: A? = A() + var a2: A? = null + if (a1?.i() != 4) { + return "1"; + } + if (a1?.c != 4) { + return "2"; + } + if (a2?.c != null) { + return "3"; } - if (a2?.c != null) { - return "3"; - } a2?.i() - if (a1?.c != 4) { + if (a1?.c != 4) { return "4"; - } + } a2 = a1 - if (a2?.i() != 5) { - return "5"; - } - if ((a2?.i() != 6) || (a1?.c != 6)) { - return "6" - } - return "OK" + if (a2?.i() != 5) { + return "5"; + } + if ((a2?.i() != 6) || (a1?.c != 6)) { + return "6" + } + return "OK" } \ No newline at end of file diff --git a/js/js.translator/testFiles/simple/cases/assign.kt b/js/js.translator/testFiles/simple/cases/assign.kt index cd9759ab40b..4cea8e71836 100644 --- a/js/js.translator/testFiles/simple/cases/assign.kt +++ b/js/js.translator/testFiles/simple/cases/assign.kt @@ -1,9 +1,9 @@ package foo fun f(): Int { - var x: Int = 1 - x = x + 1 - return x + var x: Int = 1 + x = x + 1 + return x } -fun box() = f() == 2 \ No newline at end of file +fun box() = f() == 2 \ No newline at end of file diff --git a/js/js.translator/testFiles/simple/cases/breakDoWhile.kt b/js/js.translator/testFiles/simple/cases/breakDoWhile.kt index 7d48ddf291f..d52ce128a4d 100644 --- a/js/js.translator/testFiles/simple/cases/breakDoWhile.kt +++ b/js/js.translator/testFiles/simple/cases/breakDoWhile.kt @@ -1,13 +1,14 @@ package foo -fun box() : Boolean { +fun box(): Boolean { var i = 0 - do { + do { if (i == 3) { - break; + break; } ++i; - } while ( i < 100) + } + while ( i < 100) - return i == 3 + return i == 3 } \ No newline at end of file diff --git a/js/js.translator/testFiles/simple/cases/breakWhile.kt b/js/js.translator/testFiles/simple/cases/breakWhile.kt index 9ca23bb26c0..329fe414d94 100644 --- a/js/js.translator/testFiles/simple/cases/breakWhile.kt +++ b/js/js.translator/testFiles/simple/cases/breakWhile.kt @@ -1,13 +1,13 @@ package foo -fun box() : Boolean { +fun box(): Boolean { var i = 0 - while ( i < 100) { - if (i == 3) { - break; - } - ++i; - } + while ( i < 100) { + if (i == 3) { + break; + } + ++i; + } - return i == 3 + return i == 3 } \ No newline at end of file diff --git a/js/js.translator/testFiles/simple/cases/comparison.kt b/js/js.translator/testFiles/simple/cases/comparison.kt index d8aec58a973..9b18a6b5349 100644 --- a/js/js.translator/testFiles/simple/cases/comparison.kt +++ b/js/js.translator/testFiles/simple/cases/comparison.kt @@ -1,6 +1,6 @@ package foo -fun box() : Boolean { +fun box(): Boolean { val a = 2; val b = 3; var c = 4; diff --git a/js/js.translator/testFiles/simple/cases/complexExpressionAsConstructorParameter.kt b/js/js.translator/testFiles/simple/cases/complexExpressionAsConstructorParameter.kt index 2238bd53d76..f2762a6e546 100644 --- a/js/js.translator/testFiles/simple/cases/complexExpressionAsConstructorParameter.kt +++ b/js/js.translator/testFiles/simple/cases/complexExpressionAsConstructorParameter.kt @@ -1,11 +1,11 @@ package foo -class Test(a : Int, b : Int) { +class Test(a: Int, b: Int) { val c = a val d = b } -fun box() : Boolean { - val test = Test(1 + 6*3, 10 % 2) +fun box(): Boolean { + val test = Test(1 + 6 * 3, 10 % 2) return (test.c == 19) && (test.d == 0) } \ No newline at end of file diff --git a/js/js.translator/testFiles/simple/cases/constructorWithParameter.kt b/js/js.translator/testFiles/simple/cases/constructorWithParameter.kt index 10957cea0cd..9f54dc399e1 100644 --- a/js/js.translator/testFiles/simple/cases/constructorWithParameter.kt +++ b/js/js.translator/testFiles/simple/cases/constructorWithParameter.kt @@ -1,10 +1,10 @@ package foo -class Test(a : Int) { +class Test(a: Int) { val b = a } -fun box() : Boolean { +fun box(): Boolean { var test = Test(1) return (test.b == 1) } \ No newline at end of file diff --git a/js/js.translator/testFiles/simple/cases/constructorWithPropertiesAsParameters.kt b/js/js.translator/testFiles/simple/cases/constructorWithPropertiesAsParameters.kt index fd412f54205..94867ed75bd 100644 --- a/js/js.translator/testFiles/simple/cases/constructorWithPropertiesAsParameters.kt +++ b/js/js.translator/testFiles/simple/cases/constructorWithPropertiesAsParameters.kt @@ -1,10 +1,10 @@ package foo -class A(var b : Int, var a : String) { +class A(var b: Int, var a: String) { } -fun box() : Boolean { +fun box(): Boolean { val c = A(1, "1") c.b = 2 c.a = "2" diff --git a/js/js.translator/testFiles/simple/cases/continueDoWhile.kt b/js/js.translator/testFiles/simple/cases/continueDoWhile.kt index c9a2917e967..f9a3dedb33e 100644 --- a/js/js.translator/testFiles/simple/cases/continueDoWhile.kt +++ b/js/js.translator/testFiles/simple/cases/continueDoWhile.kt @@ -1,15 +1,16 @@ package foo -fun box() : Boolean { +fun box(): Boolean { var i = 0 var b = true - do { - ++i; - if (i >= 1) { - continue; - } - b =false; - } while (i < 100) + do { + ++i; + if (i >= 1) { + continue; + } + b = false; + } + while (i < 100) - return b + return b } \ No newline at end of file diff --git a/js/js.translator/testFiles/simple/cases/continueWhile.kt b/js/js.translator/testFiles/simple/cases/continueWhile.kt index 3b59b920ca3..830acbf2638 100644 --- a/js/js.translator/testFiles/simple/cases/continueWhile.kt +++ b/js/js.translator/testFiles/simple/cases/continueWhile.kt @@ -1,15 +1,15 @@ package foo -fun box() : Boolean { +fun box(): Boolean { var i = 0 var b = true - while (i < 100) { - ++i; - if (i >= 1) { - continue; - } - b =false; - } + while (i < 100) { + ++i; + if (i >= 1) { + continue; + } + b = false; + } - return b + return b } \ No newline at end of file diff --git a/js/js.translator/testFiles/simple/cases/doWhile.kt b/js/js.translator/testFiles/simple/cases/doWhile.kt index 098444f05ee..61d15ec79b8 100644 --- a/js/js.translator/testFiles/simple/cases/doWhile.kt +++ b/js/js.translator/testFiles/simple/cases/doWhile.kt @@ -1,6 +1,6 @@ package foo -fun box() : Boolean { +fun box(): Boolean { val a = 50; var b = 0; @@ -8,7 +8,8 @@ fun box() : Boolean { do { b = b + 1; c = c + 2; - } while (b < a) + } + while (b < a) if (c == 100) { return true; } diff --git a/js/js.translator/testFiles/simple/cases/doWhile2.kt b/js/js.translator/testFiles/simple/cases/doWhile2.kt index cc4ce89dfdf..fad8812c88b 100644 --- a/js/js.translator/testFiles/simple/cases/doWhile2.kt +++ b/js/js.translator/testFiles/simple/cases/doWhile2.kt @@ -1,10 +1,11 @@ package foo -fun box() : Boolean { +fun box(): Boolean { var x = 2; do { x = 1; - } while(3 < 2) + } + while (3 < 2) if (x == 1) { return true; } diff --git a/js/js.translator/testFiles/simple/cases/elseif.kt b/js/js.translator/testFiles/simple/cases/elseif.kt index 636c724140d..c88b830d961 100644 --- a/js/js.translator/testFiles/simple/cases/elseif.kt +++ b/js/js.translator/testFiles/simple/cases/elseif.kt @@ -1,16 +1,19 @@ package foo -fun bor() : Int { +fun bor(): Int { val a = 2; val b = 3; var c = 4; if (a < 2) { return a; - } else if (a > 2) { + } + else if (a > 2) { return b; - } else if (a == c) { + } + else if (a == c) { return c; - } else { + } + else { return 5; } } diff --git a/js/js.translator/testFiles/simple/cases/if.kt b/js/js.translator/testFiles/simple/cases/if.kt index 0c76fb23ac6..5e9d46ae66e 100644 --- a/js/js.translator/testFiles/simple/cases/if.kt +++ b/js/js.translator/testFiles/simple/cases/if.kt @@ -1,6 +1,6 @@ package foo -fun bol() : Int { +fun bol(): Int { val a = 2; val b = 3; var c = 4; @@ -12,7 +12,8 @@ fun bol() : Int { } if (a == c) { return c; - } else { + } + else { return 5; } } diff --git a/js/js.translator/testFiles/simple/cases/ifElseAsExpression.kt b/js/js.translator/testFiles/simple/cases/ifElseAsExpression.kt index 3c04703732f..0d3c6a4f39f 100644 --- a/js/js.translator/testFiles/simple/cases/ifElseAsExpression.kt +++ b/js/js.translator/testFiles/simple/cases/ifElseAsExpression.kt @@ -1,7 +1,6 @@ package foo -fun box() : Boolean -{ +fun box(): Boolean { val a = 2; return if (a == 2) true else false; } \ No newline at end of file diff --git a/js/js.translator/testFiles/simple/cases/methodDeclarationAndCall.kt b/js/js.translator/testFiles/simple/cases/methodDeclarationAndCall.kt index ef5681a4701..e81ea327b10 100644 --- a/js/js.translator/testFiles/simple/cases/methodDeclarationAndCall.kt +++ b/js/js.translator/testFiles/simple/cases/methodDeclarationAndCall.kt @@ -1,12 +1,12 @@ package foo class Test() { - fun method() : Boolean { + fun method(): Boolean { return true; } } -fun box() : Boolean { +fun box(): Boolean { var test = Test() return test.method() } \ No newline at end of file diff --git a/js/js.translator/testFiles/simple/cases/minusAssignOnProperty.kt b/js/js.translator/testFiles/simple/cases/minusAssignOnProperty.kt index ac10db08aad..dcb5aa58c2c 100644 --- a/js/js.translator/testFiles/simple/cases/minusAssignOnProperty.kt +++ b/js/js.translator/testFiles/simple/cases/minusAssignOnProperty.kt @@ -2,9 +2,9 @@ package foo var a = 3 -fun box() : Boolean { - a -= 10 +fun box(): Boolean { + a -= 10 - return (a == -7) + return (a == -7) } \ No newline at end of file diff --git a/js/js.translator/testFiles/simple/cases/notBoolean.kt b/js/js.translator/testFiles/simple/cases/notBoolean.kt index 9db648c1fde..c7439ab023e 100644 --- a/js/js.translator/testFiles/simple/cases/notBoolean.kt +++ b/js/js.translator/testFiles/simple/cases/notBoolean.kt @@ -1,6 +1,5 @@ package foo -fun box() : Boolean -{ +fun box(): Boolean { return !false; } \ No newline at end of file diff --git a/js/js.translator/testFiles/simple/cases/plusAssign.kt b/js/js.translator/testFiles/simple/cases/plusAssign.kt index 98d0639de18..61eb55bfc10 100644 --- a/js/js.translator/testFiles/simple/cases/plusAssign.kt +++ b/js/js.translator/testFiles/simple/cases/plusAssign.kt @@ -1,7 +1,7 @@ package foo -fun box() : Boolean { +fun box(): Boolean { var a = 3 a += 3 return (a == 6) diff --git a/js/js.translator/testFiles/simple/cases/positiveAndNegativeNumbers.kt b/js/js.translator/testFiles/simple/cases/positiveAndNegativeNumbers.kt index a8cf0a029dc..68e46cd475b 100644 --- a/js/js.translator/testFiles/simple/cases/positiveAndNegativeNumbers.kt +++ b/js/js.translator/testFiles/simple/cases/positiveAndNegativeNumbers.kt @@ -1,7 +1,6 @@ package foo -fun box() : Boolean -{ +fun box(): Boolean { val b = -3 val c = +3 return (c - b) == 6 diff --git a/js/js.translator/testFiles/simple/cases/postfixIntOperations.kt b/js/js.translator/testFiles/simple/cases/postfixIntOperations.kt index 2ef8b2b120b..5113c249386 100644 --- a/js/js.translator/testFiles/simple/cases/postfixIntOperations.kt +++ b/js/js.translator/testFiles/simple/cases/postfixIntOperations.kt @@ -1,6 +1,6 @@ package foo -fun box() : Boolean { +fun box(): Boolean { var a = 3; val b = a++; a--; diff --git a/js/js.translator/testFiles/simple/cases/prefixIntOperations.kt b/js/js.translator/testFiles/simple/cases/prefixIntOperations.kt index 736c85b2c96..e0306f72a3c 100644 --- a/js/js.translator/testFiles/simple/cases/prefixIntOperations.kt +++ b/js/js.translator/testFiles/simple/cases/prefixIntOperations.kt @@ -1,6 +1,6 @@ package foo -fun box() : Boolean { +fun box(): Boolean { var a = 3; val b = ++a; --a; diff --git a/js/js.translator/testFiles/simple/cases/propertiesAsParametersInitialized.kt b/js/js.translator/testFiles/simple/cases/propertiesAsParametersInitialized.kt index 7cc31640fbd..dd127af5224 100644 --- a/js/js.translator/testFiles/simple/cases/propertiesAsParametersInitialized.kt +++ b/js/js.translator/testFiles/simple/cases/propertiesAsParametersInitialized.kt @@ -1,10 +1,10 @@ package foo -class A(var b : Int, var a : String) { +class A(var b: Int, var a: String) { } -fun box() : Boolean { +fun box(): Boolean { val c = A(2, "2") return (c.b == 2 && c.a == "2") } \ No newline at end of file diff --git a/js/js.translator/testFiles/simple/cases/propertyAccess.kt b/js/js.translator/testFiles/simple/cases/propertyAccess.kt index 4954151c052..7851ac1afd4 100644 --- a/js/js.translator/testFiles/simple/cases/propertyAccess.kt +++ b/js/js.translator/testFiles/simple/cases/propertyAccess.kt @@ -4,6 +4,6 @@ class Test() { val p = true } -fun box() : Boolean { +fun box(): Boolean { return Test().p } \ No newline at end of file diff --git a/js/js.translator/testFiles/simple/cases/simpleInitializer.kt b/js/js.translator/testFiles/simple/cases/simpleInitializer.kt index 125ac11824e..edd388072b8 100644 --- a/js/js.translator/testFiles/simple/cases/simpleInitializer.kt +++ b/js/js.translator/testFiles/simple/cases/simpleInitializer.kt @@ -1,13 +1,12 @@ package foo class Test() { -var a : Int -{ - $a = 3 -} + var a: Int + { + $a = 3 + } } -fun box() : Boolean -{ +fun box(): Boolean { return (Test().a == 3); } diff --git a/js/js.translator/testFiles/simple/cases/while.kt b/js/js.translator/testFiles/simple/cases/while.kt index 702150c4f63..e5fa2e3f37b 100644 --- a/js/js.translator/testFiles/simple/cases/while.kt +++ b/js/js.translator/testFiles/simple/cases/while.kt @@ -1,6 +1,6 @@ package foo -fun box() : Boolean { +fun box(): Boolean { val a = 50; var b = 0; diff --git a/js/js.translator/testFiles/simple/cases/while2.kt b/js/js.translator/testFiles/simple/cases/while2.kt index 726da361b94..1b2daf0054e 100644 --- a/js/js.translator/testFiles/simple/cases/while2.kt +++ b/js/js.translator/testFiles/simple/cases/while2.kt @@ -1,8 +1,8 @@ package foo -fun box() : Boolean { +fun box(): Boolean { - while(2 < 1) { + while (2 < 1) { return false; } return true; diff --git a/js/js.translator/testFiles/sourcemap/cases/methodCallInMethod.kt b/js/js.translator/testFiles/sourcemap/cases/methodCallInMethod.kt index 189a4cfe698..ee7fe7027df 100644 --- a/js/js.translator/testFiles/sourcemap/cases/methodCallInMethod.kt +++ b/js/js.translator/testFiles/sourcemap/cases/methodCallInMethod.kt @@ -3,7 +3,8 @@ package foo //KT-4054 class A() { - fun f0() {} + fun f0() { + } fun f1() { f0() diff --git a/js/js.translator/testFiles/standardClasses/cases/array.kt b/js/js.translator/testFiles/standardClasses/cases/array.kt index 061fde44366..43abfb04cbe 100644 --- a/js/js.translator/testFiles/standardClasses/cases/array.kt +++ b/js/js.translator/testFiles/standardClasses/cases/array.kt @@ -1,6 +1,6 @@ package foo -fun box() : Boolean { +fun box(): Boolean { val a = arrayOfNulls(2) a.set(1, 2) diff --git a/js/js.translator/testFiles/standardClasses/cases/arrayAccess.kt b/js/js.translator/testFiles/standardClasses/cases/arrayAccess.kt index b4d4885f1e4..4b95451a8b8 100644 --- a/js/js.translator/testFiles/standardClasses/cases/arrayAccess.kt +++ b/js/js.translator/testFiles/standardClasses/cases/arrayAccess.kt @@ -1,6 +1,6 @@ package foo -fun box() : Boolean { +fun box(): Boolean { val a = arrayOfNulls(4) a[1] = 2 a[2] = 3 diff --git a/js/js.translator/testFiles/standardClasses/cases/arrayFactoryMethods.kt b/js/js.translator/testFiles/standardClasses/cases/arrayFactoryMethods.kt index fd21bd7ff3c..15b8b080ad8 100644 --- a/js/js.translator/testFiles/standardClasses/cases/arrayFactoryMethods.kt +++ b/js/js.translator/testFiles/standardClasses/cases/arrayFactoryMethods.kt @@ -4,25 +4,25 @@ class Fail(val message: String) : Exception(message) native fun eval(arg: String): Any? = noImpl fun test(testName: String, actual: Any, expectedAsString: String) { - val expected = eval("[$expectedAsString]") - if (actual != expected) throw Fail("Wrong result for '$testName' function. Expected: $expected | Actual: $actual") + val expected = eval("[$expectedAsString]") + if (actual != expected) throw Fail("Wrong result for '$testName' function. Expected: $expected | Actual: $actual") } fun box(): String { - try { - test("array", array(0, 1, 2, 3, 4), "0, 1, 2, 3, 4") - test("booleanArray", booleanArray(true, false, false, true, true), "true, false, false, true, true") - test("charArray'", charArray('0', '1', '2', '3', '4'), "'0', '1', '2', '3', '4'") - test("byteArray", byteArray(0, 1, 2, 3, 4), "0, 1, 2, 3, 4") - test("shortArray", shortArray(0, 1, 2, 3, 4), "0, 1, 2, 3, 4") - test("intArray,", intArray(0, 1, 2, 3, 4), "0, 1, 2, 3, 4") - test("longArray", longArray(0, 1, 2, 3, 4), "0, 1, 2, 3, 4") - test("floatArray", floatArray(0.0.toFloat(), 1.0.toFloat(), 2.0.toFloat(), 3.0.toFloat(), 4.0.toFloat()), "0.0, 1.0, 2.0, 3.0, 4.0") - test("doubleArray", doubleArray(0.0, 1.1, 2.2, 3.3, 4.4), "0.0, 1.1, 2.2, 3.3, 4.4") - } - catch (e : Fail) { - return e.message - } + try { + test("array", array(0, 1, 2, 3, 4), "0, 1, 2, 3, 4") + test("booleanArray", booleanArray(true, false, false, true, true), "true, false, false, true, true") + test("charArray'", charArray('0', '1', '2', '3', '4'), "'0', '1', '2', '3', '4'") + test("byteArray", byteArray(0, 1, 2, 3, 4), "0, 1, 2, 3, 4") + test("shortArray", shortArray(0, 1, 2, 3, 4), "0, 1, 2, 3, 4") + test("intArray,", intArray(0, 1, 2, 3, 4), "0, 1, 2, 3, 4") + test("longArray", longArray(0, 1, 2, 3, 4), "0, 1, 2, 3, 4") + test("floatArray", floatArray(0.0.toFloat(), 1.0.toFloat(), 2.0.toFloat(), 3.0.toFloat(), 4.0.toFloat()), "0.0, 1.0, 2.0, 3.0, 4.0") + test("doubleArray", doubleArray(0.0, 1.1, 2.2, 3.3, 4.4), "0.0, 1.1, 2.2, 3.3, 4.4") + } + catch (e: Fail) { + return e.message + } - return "OK" + return "OK" } diff --git a/js/js.translator/testFiles/standardClasses/cases/arrayFunctionConstructor.kt b/js/js.translator/testFiles/standardClasses/cases/arrayFunctionConstructor.kt index 57783313a1e..47e5b533dbe 100644 --- a/js/js.translator/testFiles/standardClasses/cases/arrayFunctionConstructor.kt +++ b/js/js.translator/testFiles/standardClasses/cases/arrayFunctionConstructor.kt @@ -1,6 +1,6 @@ package foo -val f = {(i: Int) -> i + 1} +val f = {(i: Int) -> i + 1 } val a = Array(3, f) diff --git a/js/js.translator/testFiles/standardClasses/cases/arraySize.kt b/js/js.translator/testFiles/standardClasses/cases/arraySize.kt index fd236c8ff85..919fc4c3100 100644 --- a/js/js.translator/testFiles/standardClasses/cases/arraySize.kt +++ b/js/js.translator/testFiles/standardClasses/cases/arraySize.kt @@ -1,6 +1,7 @@ package foo -class A() {} +class A() { +} val a1 = arrayOfNulls(3) val a2 = arrayOfNulls(2) diff --git a/js/js.translator/testFiles/standardClasses/cases/arrayThrowsExceptionOnOOBaccess.kt b/js/js.translator/testFiles/standardClasses/cases/arrayThrowsExceptionOnOOBaccess.kt index 010c2fc4212..6c131e54709 100644 --- a/js/js.translator/testFiles/standardClasses/cases/arrayThrowsExceptionOnOOBaccess.kt +++ b/js/js.translator/testFiles/standardClasses/cases/arrayThrowsExceptionOnOOBaccess.kt @@ -1,6 +1,7 @@ package foo -class A() {} +class A() { +} val a1 = Array(3) val a2 = Array(2) diff --git a/js/js.translator/testFiles/standardClasses/cases/arraysIterator.kt b/js/js.translator/testFiles/standardClasses/cases/arraysIterator.kt index 4a5d11b9fbb..6a8c0a37c6c 100644 --- a/js/js.translator/testFiles/standardClasses/cases/arraysIterator.kt +++ b/js/js.translator/testFiles/standardClasses/cases/arraysIterator.kt @@ -1,11 +1,11 @@ package foo -val a1 = Array(3, {(i : Int) -> i}) +val a1 = Array(3, {(i: Int) -> i }) -fun box() : Boolean{ +fun box(): Boolean { val i = a1.iterator() return ((i.hasNext() == true) && (i.next() == 0) && - (i.hasNext() == true) && (i.next() == 1) && - (i.hasNext() == true) && (i.next() == 2) && - (i.hasNext() == false)); + (i.hasNext() == true) && (i.next() == 1) && + (i.hasNext() == true) && (i.next() == 2) && + (i.hasNext() == false)); } \ No newline at end of file diff --git a/js/js.translator/testFiles/stdlib/cases/Filter.kt b/js/js.translator/testFiles/stdlib/cases/Filter.kt index 5d7244b2a2d..7f1c5fdb167 100644 --- a/js/js.translator/testFiles/stdlib/cases/Filter.kt +++ b/js/js.translator/testFiles/stdlib/cases/Filter.kt @@ -6,17 +6,17 @@ import java.lang.Iterable /* Filters given iterator */ -inline fun java.util.Iterator.filter(f: (T)-> Boolean) : java.util.Iterator = FilterIterator(this, f) +inline fun java.util.Iterator.filter(f: (T) -> Boolean): java.util.Iterator = FilterIterator(this, f) /* Adds filtered elements in to given container */ -inline fun > java.lang.Iterable.filterTo(var container: U, filter: (T)->Boolean) : U { - for(element in this) { - if(filter(element)) - container.add(element) - } - return container +inline fun > java.lang.Iterable.filterTo(var container: U, filter: (T) -> Boolean): U { + for (element in this) { + if (filter(element)) + container.add(element) + } + return container } /* @@ -26,18 +26,18 @@ Create iterator filtering given java.lang.Iterable inline fun java.lang.Iterable.filter(f: (T)->Boolean) : java.util.Iterator = (iterator() as java.util.Iterator).filter(f) */ -private class FilterIterator(val original: java.util.Iterator, val filter: (T)-> Boolean) : java.util.Iterator { +private class FilterIterator(val original: java.util.Iterator, val filter: (T) -> Boolean) : java.util.Iterator { var state = 0 var nextElement: T? = null override fun hasNext(): Boolean = - when(state) { + when(state) { 1 -> true // checked and next present 2 -> false // checked and next not present else -> { - while(original.hasNext()) { + while (original.hasNext()) { val candidate = original.next() - if((filter)(candidate)) { + if ((filter)(candidate)) { nextElement = candidate state = 1 true @@ -46,15 +46,15 @@ private class FilterIterator(val original: java.util.Iterator, val filter: state = 2 false } - } + } override fun next(): T = - if(state != 1) - throw java.util.NoSuchElementException() - else { - val res = nextElement as T - nextElement = null - state = 0 - res - } + if (state != 1) + throw java.util.NoSuchElementException() + else { + val res = nextElement as T + nextElement = null + state = 0 + res + } } diff --git a/js/js.translator/testFiles/superCall/cases/classSuperCall.kt b/js/js.translator/testFiles/superCall/cases/classSuperCall.kt index f743b0b44f9..1ef2747971f 100644 --- a/js/js.translator/testFiles/superCall/cases/classSuperCall.kt +++ b/js/js.translator/testFiles/superCall/cases/classSuperCall.kt @@ -7,7 +7,7 @@ open class A(val barVal: Int) { open fun bar4(t: Int = 1) = t + 3 + barVal } -class B: A(1) { +class B : A(1) { override fun bar(): Int { return super.bar() + 10; } diff --git a/js/js.translator/testFiles/superCall/cases/nativeSuperClass.kt b/js/js.translator/testFiles/superCall/cases/nativeSuperClass.kt index eb0d45a86f7..61d87fda539 100644 --- a/js/js.translator/testFiles/superCall/cases/nativeSuperClass.kt +++ b/js/js.translator/testFiles/superCall/cases/nativeSuperClass.kt @@ -3,7 +3,7 @@ package foo import java.util.ArrayList class N() : ArrayList() { - override fun add(el: Any) : Boolean { + override fun add(el: Any): Boolean { if (!super.add(el)) { throw Exception() } diff --git a/js/js.translator/testFiles/test.html b/js/js.translator/testFiles/test.html index 9d15b4a968f..c812f8405d6 100644 --- a/js/js.translator/testFiles/test.html +++ b/js/js.translator/testFiles/test.html @@ -6,7 +6,7 @@ - diff --git a/js/js.translator/testFiles/trait/cases/checkImplementationCharacteristics.kt b/js/js.translator/testFiles/trait/cases/checkImplementationCharacteristics.kt index 213039896eb..f51d558807e 100644 --- a/js/js.translator/testFiles/trait/cases/checkImplementationCharacteristics.kt +++ b/js/js.translator/testFiles/trait/cases/checkImplementationCharacteristics.kt @@ -1,32 +1,36 @@ package foo public trait A { - fun foo() {} + fun foo() { + } } public trait B : A { - fun boo() {} + fun boo() { + } } native fun eval(code: String): Any = noImpl native val undefined: Any = noImpl native class Function(vararg args: String) -val hasProp = Function("obj, prop", "return obj[prop] !== undefined") as ((Any, String)->Boolean) +val hasProp = Function("obj, prop", "return obj[prop] !== undefined") as ((Any, String) -> Boolean) fun box(): String { - val a = object: A {} - val b = object: B {} + val a = object: A { + } + val b = object: B { + } - if (!hasProp(a, "foo")) return "A hasn't foo" - if (hasProp(a, "boo")) return "A has boo" + if (!hasProp(a, "foo")) return "A hasn't foo" + if (hasProp(a, "boo")) return "A has boo" - if (!hasProp(b, "foo")) return "B hasn't foo" - if (!hasProp(b, "boo")) return "B hasn't boo" + if (!hasProp(b, "foo")) return "B hasn't foo" + if (!hasProp(b, "boo")) return "B hasn't boo" - val PREFIX = "Kotlin.modules.JS_TESTS.foo" - if (eval("$PREFIX.A") == null) return "$PREFIX.A not found" - if (eval("$PREFIX.B") == null) return "$PREFIX.B not found" - if (eval("$PREFIX.A === $PREFIX.B") as Boolean) return "A and B refer to the same object" + val PREFIX = "Kotlin.modules.JS_TESTS.foo" + if (eval("$PREFIX.A") == null) return "$PREFIX.A not found" + if (eval("$PREFIX.B") == null) return "$PREFIX.B not found" + if (eval("$PREFIX.A === $PREFIX.B") as Boolean) return "A and B refer to the same object" - return "OK" + return "OK" } \ No newline at end of file diff --git a/js/js.translator/testFiles/trait/cases/classDerivesFromClassAndTrait.kt b/js/js.translator/testFiles/trait/cases/classDerivesFromClassAndTrait.kt index 4b8e07fbff9..4e9d3afee99 100644 --- a/js/js.translator/testFiles/trait/cases/classDerivesFromClassAndTrait.kt +++ b/js/js.translator/testFiles/trait/cases/classDerivesFromClassAndTrait.kt @@ -6,14 +6,14 @@ open class A() { } trait Test { - fun addFoo(s:String) : String { - return s + "FOO" + fun addFoo(s: String): String { + return s + "FOO" } } class B() : A(), Test { - fun eval() : String { + fun eval(): String { return addFoo(value); } } diff --git a/js/js.translator/testFiles/trait/cases/classDerivesFromTraitAndClass.kt b/js/js.translator/testFiles/trait/cases/classDerivesFromTraitAndClass.kt index 056bec65f1e..6c322a3b5f0 100644 --- a/js/js.translator/testFiles/trait/cases/classDerivesFromTraitAndClass.kt +++ b/js/js.translator/testFiles/trait/cases/classDerivesFromTraitAndClass.kt @@ -6,14 +6,14 @@ open class A() { } trait Test { - fun addFoo(s:String) : String { - return s + "FOO" + fun addFoo(s: String): String { + return s + "FOO" } } class B() : Test, A() { - fun eval() : String { + fun eval(): String { return addFoo(value); } } diff --git a/js/js.translator/testFiles/trait/cases/definitionOrder.kt b/js/js.translator/testFiles/trait/cases/definitionOrder.kt index f7dd2bbed6f..9dd085bc4d1 100644 --- a/js/js.translator/testFiles/trait/cases/definitionOrder.kt +++ b/js/js.translator/testFiles/trait/cases/definitionOrder.kt @@ -43,6 +43,6 @@ trait L trait H : L trait Dummy -fun box() : Boolean { +fun box(): Boolean { return (C().order == "ABC") && (D().order == "ABD") && (E().order == "AE") && (C().bar() == "F") && (A().bar() == "F") } \ No newline at end of file diff --git a/js/js.translator/testFiles/trait/cases/example.kt b/js/js.translator/testFiles/trait/cases/example.kt index 0f44fb35031..87eee23fbd0 100644 --- a/js/js.translator/testFiles/trait/cases/example.kt +++ b/js/js.translator/testFiles/trait/cases/example.kt @@ -1,13 +1,13 @@ package foo trait AL { - fun get(index: Int) : Any? = null + fun get(index: Int): Any? = null } class SmartArrayList() : AL { } -fun box() : Boolean { - val c = SmartArrayList() - return (null == c.get(0)) +fun box(): Boolean { + val c = SmartArrayList() + return (null == c.get(0)) } \ No newline at end of file diff --git a/js/js.translator/testFiles/trait/cases/funDelegation.kt b/js/js.translator/testFiles/trait/cases/funDelegation.kt index cfde21aba4c..4905ea58279 100644 --- a/js/js.translator/testFiles/trait/cases/funDelegation.kt +++ b/js/js.translator/testFiles/trait/cases/funDelegation.kt @@ -1,17 +1,20 @@ package foo open class Base() { - fun n(n : Int) : Int = n + 1 + fun n(n: Int): Int = n + 1 } -trait Abstract {} +trait Abstract { +} -class Derived1() : Base(), Abstract {} -class Derived2() : Abstract, Base() {} +class Derived1() : Base(), Abstract { +} +class Derived2() : Abstract, Base() { +} -fun test(s : Base) : Boolean = s.n(238) == 239 +fun test(s: Base): Boolean = s.n(238) == 239 -fun box() : String { +fun box(): String { if (!test(Base())) return "Fail #1" if (!test(Derived1())) return "Fail #2" if (!test(Derived2())) return "Fail #3" diff --git a/js/js.translator/testFiles/trait/cases/traitAddsFunctionsToClass.kt b/js/js.translator/testFiles/trait/cases/traitAddsFunctionsToClass.kt index 2a34310e2d6..5ecfee18d13 100644 --- a/js/js.translator/testFiles/trait/cases/traitAddsFunctionsToClass.kt +++ b/js/js.translator/testFiles/trait/cases/traitAddsFunctionsToClass.kt @@ -1,11 +1,11 @@ package foo trait Test { - fun addFoo(s:String) : String { - return s + "FOO" + fun addFoo(s: String): String { + return s + "FOO" } - fun addBar(s:String) : String { + fun addBar(s: String): String { return s + "BAR" } } @@ -13,7 +13,7 @@ trait Test { class A() : Test { val string = "TEST" - fun value() : String { + fun value(): String { return addBar(addFoo(string)) } } diff --git a/js/js.translator/testFiles/trait/cases/traitExtendsTrait.kt b/js/js.translator/testFiles/trait/cases/traitExtendsTrait.kt index a22e01d970e..145c2bc2004 100644 --- a/js/js.translator/testFiles/trait/cases/traitExtendsTrait.kt +++ b/js/js.translator/testFiles/trait/cases/traitExtendsTrait.kt @@ -1,19 +1,19 @@ package foo trait Test { - fun addFoo(s:String) : String { - return s + "FOO" + fun addFoo(s: String): String { + return s + "FOO" } } trait ExtendedTest : Test { - fun hooray() : String { + fun hooray(): String { return "hooray" } } class A() : ExtendedTest { - fun eval() : String { + fun eval(): String { return addFoo(hooray()); } } diff --git a/js/js.translator/testFiles/trait/cases/traitExtendsTwoTraits.kt b/js/js.translator/testFiles/trait/cases/traitExtendsTwoTraits.kt index 5e5c03ae2e9..41321a4cd26 100644 --- a/js/js.translator/testFiles/trait/cases/traitExtendsTwoTraits.kt +++ b/js/js.translator/testFiles/trait/cases/traitExtendsTwoTraits.kt @@ -12,11 +12,11 @@ trait B { } } -trait AD: A, B { +trait AD : A, B { } -class Test(): AD { +class Test() : AD { fun eval(): String { return addFoo(hooray()); } diff --git a/js/js.translator/testFiles/webDemoCanvasExamples/cases/Creatures.kt b/js/js.translator/testFiles/webDemoCanvasExamples/cases/Creatures.kt index d61088a405d..a5d04a03a4a 100644 --- a/js/js.translator/testFiles/webDemoCanvasExamples/cases/Creatures.kt +++ b/js/js.translator/testFiles/webDemoCanvasExamples/cases/Creatures.kt @@ -60,10 +60,9 @@ abstract class Shape() { val Kotlin = Logo(v(250.0, 75.0)) -class Logo(override var pos: Vector): Shape() -{ +class Logo(override var pos: Vector) : Shape() { val relSize: Double = 0.25 - val shadowOffset = v(- 3.0, 3.0) + val shadowOffset = v(-3.0, 3.0) val imageSize = v(377.0, 393.0) var size: Vector = imageSize * relSize // get-only properties like this saves you lots of typing and are very expressive @@ -75,9 +74,9 @@ class Logo(override var pos: Vector): Shape() size = imageSize * (state.size.x / imageSize.x) * relSize // getKotlinLogo() is a 'magic' function here defined only for purposes of demonstration but in fact it just find an element containing the logo state.context.drawImage(getImage("http://kotlin-demo.jetbrains.com/static/images/kotlinlogowobackground.png"), 0, 0, - imageSize.x.toInt(), imageSize.y.toInt(), - position.x.toInt(), position.y.toInt(), - size.x.toInt(), size.y.toInt()) + imageSize.x.toInt(), imageSize.y.toInt(), + position.x.toInt(), position.y.toInt(), + size.x.toInt(), size.y.toInt()) } override fun draw(state: CanvasState) { @@ -87,7 +86,8 @@ class Logo(override var pos: Vector): Shape() context.shadowed(shadowOffset, 0.2) { drawLogo(state) } - } else { + } + else { drawLogo(state) } } @@ -106,9 +106,9 @@ val gradientGenerator: RadialGradientGenerator? = null return $gradientGenerator } -class Creature(override var pos: Vector, val state: CanvasState): Shape() { +class Creature(override var pos: Vector, val state: CanvasState) : Shape() { - val shadowOffset = v(- 5.0, 5.0) + val shadowOffset = v(-5.0, 5.0) val colorStops = gradientGenerator!!.getNext() val relSize = 0.05 // these properties have no backing fields and in java/javascript they could be represented as little helper functions @@ -138,7 +138,8 @@ class Creature(override var pos: Vector, val state: CanvasState): Shape() { val context = state.context if (!selected) { drawCreature(context) - } else { + } + else { drawCreatureWithShadow(context) } } @@ -162,12 +163,12 @@ class Creature(override var pos: Vector, val state: CanvasState): Shape() { } fun tailPath(context: CanvasContext) { - val tailDirection = - directionToLogo + val tailDirection = -directionToLogo val tailPos = position + tailDirection * radius * 1.0 val tailSize = radius * 1.6 val angle = Math.PI / 6.0 val p1 = tailPos + tailDirection.rotatedBy(angle) * tailSize - val p2 = tailPos + tailDirection.rotatedBy(- angle) * tailSize + val p2 = tailPos + tailDirection.rotatedBy(-angle) * tailSize val middlePoint = position + tailDirection * radius * 1.0 context.moveTo(tailPos.x.toInt(), tailPos.y.toInt()) context.lineTo(p1.x.toInt(), p1.y.toInt()) @@ -246,8 +247,8 @@ class CanvasState(val canvas: HTMLCanvasElement) { } window.setInterval({ - draw() - }, interval) + draw() + }, interval) } fun mousePos(e: MouseEvent): Vector { @@ -314,7 +315,7 @@ fun v(x: Double, y: Double) = Vector(x, y) class Vector(val x: Double = 0.0, val y: Double = 0.0) { fun plus(v: Vector) = v(x + v.x, y + v.y) - fun minus() = v(- x, - y) + fun minus() = v(-x, -y) fun minus(v: Vector) = v(x - v.x, y - v.y) fun times(koef: Double) = v(x * koef, y * koef) fun distanceTo(v: Vector) = Math.sqrt((this - v).sqr) @@ -340,8 +341,8 @@ fun main(args: Array) { state.addShape(Creature(state.size * 0.25, state)) state.addShape(Creature(state.size * 0.75, state)) window.setTimeout({ - state.valid = false - }, 1000) + state.valid = false + }, 1000) } } diff --git a/js/js.translator/testFiles/webDemoCanvasExamples/cases/Fancy lines.kt b/js/js.translator/testFiles/webDemoCanvasExamples/cases/Fancy lines.kt index 2bf75ef0a5b..8fd05c47b1b 100644 --- a/js/js.translator/testFiles/webDemoCanvasExamples/cases/Fancy lines.kt +++ b/js/js.translator/testFiles/webDemoCanvasExamples/cases/Fancy lines.kt @@ -41,7 +41,7 @@ class FancyLines() { y = height * Math.random(); context.bezierCurveTo(width * Math.random(), height * Math.random(), - width * Math.random(), height * Math.random(), x, y); + width * Math.random(), height * Math.random(), x, y); hue += Math.random() * 10; @@ -61,7 +61,7 @@ class FancyLines() { } fun run() { - window.setInterval({line()}, 40); - window.setInterval({blank()}, 100); + window.setInterval({ line() }, 40); + window.setInterval({ blank() }, 100); } } diff --git a/js/js.translator/testFiles/webDemoCanvasExamples/cases/Hello, Kotlin.kt b/js/js.translator/testFiles/webDemoCanvasExamples/cases/Hello, Kotlin.kt index 56bf05e9eaf..54148539fb3 100644 --- a/js/js.translator/testFiles/webDemoCanvasExamples/cases/Hello, Kotlin.kt +++ b/js/js.translator/testFiles/webDemoCanvasExamples/cases/Hello, Kotlin.kt @@ -56,7 +56,7 @@ class HelloKotlin() { // if you using chrome chances are good you wont see the shadow context.shadowColor = "#000000" context.shadowBlur = 5.0 - context.shadowOffsetX = - 4.0 + context.shadowOffsetX = -4.0 context.shadowOffsetY = 4.0 context.fillStyle = "rgb(242,160,110)" context.fillText(message, absX.toInt(), absY.toInt()) @@ -66,21 +66,21 @@ class HelloKotlin() { fun move() { val relTextWidth = textWidthInPixels / width if (relX > (1.0 - relTextWidth - relXVelocity.abs) || relX < relXVelocity.abs) { - relXVelocity *= - 1 + relXVelocity *= -1 } val relTextHeight = textHeightInPixels / height if (relY > (1.0 - relYVelocity.abs) || relY < relYVelocity.abs + relTextHeight) { - relYVelocity *= - 1 + relYVelocity *= -1 } relX += relXVelocity relY += relYVelocity } - fun randomVelocity() = 0.03 * Math.random() * (if (Math.random() < 0.5) 1 else - 1) + fun randomVelocity() = 0.03 * Math.random() * (if (Math.random() < 0.5) 1 else -1) val Double.abs: Double - get() = if (this > 0) this else - this + get() = if (this > 0) this else -this } fun renderBackground() { @@ -99,11 +99,11 @@ fun main(args: Array) { } window.setInterval({ - renderBackground() - for (logo in logos) { - logo.draw() - } - }, interval) + renderBackground() + for (logo in logos) { + logo.draw() + } + }, interval) } } diff --git a/js/js.translator/testFiles/webDemoCanvasExamples/cases/Traffic light.kt b/js/js.translator/testFiles/webDemoCanvasExamples/cases/Traffic light.kt index 044c17e1dc7..e6de21ca6cb 100644 --- a/js/js.translator/testFiles/webDemoCanvasExamples/cases/Traffic light.kt +++ b/js/js.translator/testFiles/webDemoCanvasExamples/cases/Traffic light.kt @@ -29,7 +29,6 @@ val context: CanvasContext val PATH_TO_IMAGES = "http://kotlin-demo.jetbrains.com/static/images/canvas/" - var _state: CanvasState? = null val state: CanvasState get() { @@ -69,63 +68,65 @@ fun main(args: Array) { fun v(x: Double, y: Double) = Vector(x, y) -class Image(val src: String, override var pos: Vector, var imageSize: Vector): Shape() { +class Image(val src: String, override var pos: Vector, var imageSize: Vector) : Shape() { override fun draw() { state.context.drawImage(getImage(src), 0, 0, - imageSize.x.toInt(), imageSize.y.toInt(), - pos.x.toInt(), pos.y.toInt(), - imageSize.x.toInt(), imageSize.y.toInt()) + imageSize.x.toInt(), imageSize.y.toInt(), + pos.x.toInt(), pos.y.toInt(), + imageSize.x.toInt(), imageSize.y.toInt()) } fun contains(mousePos: Vector): Boolean = mousePos.isInRect(pos, imageSize) } -class Button(val src: String, override var pos: Vector, var imageSize: Vector): Shape() { +class Button(val src: String, override var pos: Vector, var imageSize: Vector) : Shape() { var isMouseOver = false var isMouseDown = false override fun draw() { if (isMouseOver) { - state.context.shadowed(v(- 3.0, 3.0), 1.2) { + state.context.shadowed(v(-3.0, 3.0), 1.2) { state.context.drawImage(getImage(src), 0, 0, - imageSize.x.toInt(), imageSize.y.toInt(), - pos.x.toInt(), pos.y.toInt(), - imageSize.x.toInt(), imageSize.y.toInt()) + imageSize.x.toInt(), imageSize.y.toInt(), + pos.x.toInt(), pos.y.toInt(), + imageSize.x.toInt(), imageSize.y.toInt()) } - } else if (isMouseDown) { - state.context.shadowed(v(- 3.0, 3.0), 0.8) { + } + else if (isMouseDown) { + state.context.shadowed(v(-3.0, 3.0), 0.8) { state.context.drawImage(getImage(src), 0, 0, - imageSize.x.toInt(), imageSize.y.toInt(), - pos.x.toInt(), pos.y.toInt(), - imageSize.x.toInt(), imageSize.y.toInt()) + imageSize.x.toInt(), imageSize.y.toInt(), + pos.x.toInt(), pos.y.toInt(), + imageSize.x.toInt(), imageSize.y.toInt()) } - } else { + } + else { state.context.drawImage(getImage(src), 0, 0, - imageSize.x.toInt(), imageSize.y.toInt(), - pos.x.toInt(), pos.y.toInt(), - imageSize.x.toInt(), imageSize.y.toInt()) + imageSize.x.toInt(), imageSize.y.toInt(), + pos.x.toInt(), pos.y.toInt(), + imageSize.x.toInt(), imageSize.y.toInt()) } } fun mouseClick() { isMouseDown = true window.setTimeout({ - isMouseDown = false - }, 1000) + isMouseDown = false + }, 1000) } fun mouseOver() { isMouseOver = true window.setTimeout({ - isMouseOver = false - }, 1000) + isMouseOver = false + }, 1000) } fun contains(mousePos: Vector): Boolean = mousePos.isInRect(pos, imageSize) } -class Border(): Shape() { +class Border() : Shape() { override var pos = Vector(4.0, 4.0); override fun draw() { @@ -141,7 +142,7 @@ class Border(): Shape() { } -class Timer(override var pos: Vector): Shape() { +class Timer(override var pos: Vector) : Shape() { var timeLeftForChangeColor: Char = 'c' var timeStartLastChangeColor = Date().getTime(); var timerLength = 13 @@ -169,7 +170,7 @@ class Colors() { val green = "#0E9648" } -class TrafficLight(override var pos: Vector, val direction: String, val startColor: String): Shape() { +class TrafficLight(override var pos: Vector, val direction: String, val startColor: String) : Shape() { val list = ArrayList() var size = Vector(27.0, 34.0); var timer = Timer(Vector(pos.x + 6, pos.y + 12)) @@ -218,9 +219,9 @@ class TrafficLight(override var pos: Vector, val direction: String, val startCol changeColorForward = false currentColor = "yellow" window.setTimeout({ - if (!isForceColorChange) timer.resetTimer() else isForceColorChange = false - currentColor = "green" - }, 3000) + if (!isForceColorChange) timer.resetTimer() else isForceColorChange = false + currentColor = "green" + }, 3000) } @@ -228,12 +229,12 @@ class TrafficLight(override var pos: Vector, val direction: String, val startCol changeColorForward = true currentColor = "green_flash" window.setTimeout({ - currentColor = "yellow" - window.setTimeout({ - if (!isForceColorChange) timer.resetTimer() else isForceColorChange = false - currentColor = "red" - }, 1000) - }, 2000) + currentColor = "yellow" + window.setTimeout({ + if (!isForceColorChange) timer.resetTimer() else isForceColorChange = false + currentColor = "red" + }, 1000) + }, 2000) } fun canMove(): Boolean { @@ -243,7 +244,7 @@ class TrafficLight(override var pos: Vector, val direction: String, val startCol //One element from Traffic light -class TrafficLightItem(override var pos: Vector, val imageSrc: String): Shape() { +class TrafficLightItem(override var pos: Vector, val imageSrc: String) : Shape() { val relSize: Double = 0.5 val imageSize = v(33.0, 33.0) var size: Vector = imageSize * relSize @@ -259,54 +260,61 @@ class TrafficLightItem(override var pos: Vector, val imageSrc: String): Shape() if (countOfFlash > 6) { isFlashNow = false countOfFlash = 0 - } else { - countOfFlash++ } - } else { - state.context.drawImage(getImage(PATH_TO_IMAGES + "green_color.png"), 0, 0, - imageSize.x.toInt(), imageSize.y.toInt(), - pos.x.toInt(), pos.y.toInt(), - size.x.toInt(), size.y.toInt()) - if (countOfFlash > 6) { - isFlashNow = true - countOfFlash = 0 - } else { + else { countOfFlash++ } } - } else { + else { + state.context.drawImage(getImage(PATH_TO_IMAGES + "green_color.png"), 0, 0, + imageSize.x.toInt(), imageSize.y.toInt(), + pos.x.toInt(), pos.y.toInt(), + size.x.toInt(), size.y.toInt()) + if (countOfFlash > 6) { + isFlashNow = true + countOfFlash = 0 + } + else { + countOfFlash++ + } + } + } + else { state.context.drawImage(getImage(imageSrc), 0, 0, - imageSize.x.toInt(), imageSize.y.toInt(), - pos.x.toInt(), pos.y.toInt(), - size.x.toInt(), size.y.toInt()) + imageSize.x.toInt(), imageSize.y.toInt(), + pos.x.toInt(), pos.y.toInt(), + size.x.toInt(), size.y.toInt()) } } } -class Car(override var pos: Vector, val direction: String, val color: String): Shape() { +class Car(override var pos: Vector, val direction: String, val color: String) : Shape() { val imageSize = v(25.0, 59.0) var speed = getRandomArbitary(2, 10); override fun draw() { if (direction == "up" || direction == "down") { state.context.drawImage(getImage(PATH_TO_IMAGES + color + "_car.png"), 0, 0, - imageSize.x.toInt(), imageSize.y.toInt(), - pos.x.toInt(), pos.y.toInt(), - imageSize.x.toInt(), imageSize.y.toInt()) + imageSize.x.toInt(), imageSize.y.toInt(), + pos.x.toInt(), pos.y.toInt(), + imageSize.x.toInt(), imageSize.y.toInt()) if ((!isNearStopLine()) || (trafficLightUp.canMove() && isNearStopLine()) ) { move() - } else { + } + else { speed = getRandomArbitary(2, 10) } - } else { + } + else { state.context.drawImage(getImage(PATH_TO_IMAGES + color + "_car.png"), 0, 0, - imageSize.y.toInt(), imageSize.x.toInt(), - pos.x.toInt(), pos.y.toInt(), - imageSize.y.toInt(), imageSize.x.toInt()) + imageSize.y.toInt(), imageSize.x.toInt(), + pos.x.toInt(), pos.y.toInt(), + imageSize.y.toInt(), imageSize.x.toInt()) if ((!isNearStopLine()) || (trafficLightLeft.canMove() && isNearStopLine()) ) { move() - } else { + } + else { speed = getRandomArbitary(2, 10) } @@ -316,9 +324,9 @@ class Car(override var pos: Vector, val direction: String, val color: String): S fun isNearStopLine(): Boolean { when (direction) { - "up" -> return (pos.y > 198 && pos.y < 208) + "up" -> return (pos.y > 198 && pos.y < 208) "down" -> return (pos.y > 10 && pos.y < 20) - "right" -> return (pos.x > - 8 && pos.x < 2) + "right" -> return (pos.x > -8 && pos.x < 2) "left" -> return (pos.x > 243 && pos.x < 253) else -> return false } @@ -330,10 +338,10 @@ class Car(override var pos: Vector, val direction: String, val color: String): S var y = pos.y when (direction) { - "up" -> if (pos.y < - 50) y = 250.0 else y = pos.y - speed + "up" -> if (pos.y < -50) y = 250.0 else y = pos.y - speed "down" -> if (pos.y > 300) y = 0.0 else y = pos.y + speed - "right" -> if (pos.x > 300) x = - 10.0 else x = pos.x + speed - "left" -> if (pos.x < - 50) x = 340.0 else x = pos.x - speed + "right" -> if (pos.x > 300) x = -10.0 else x = pos.x + speed + "left" -> if (pos.x < -50) x = 340.0 else x = pos.x - speed else -> { } } @@ -342,7 +350,7 @@ class Car(override var pos: Vector, val direction: String, val color: String): S } } -class Map(override var pos: Vector): Shape() { +class Map(override var pos: Vector) : Shape() { val relSize: Double = 0.8 val imageSize = v(420.0, 323.0) var size: Vector = imageSize * relSize @@ -350,9 +358,9 @@ class Map(override var pos: Vector): Shape() { override fun draw() { size = imageSize * relSize state.context.drawImage(getImage(PATH_TO_IMAGES + "crossroads.jpg"), 0, 0, - imageSize.x.toInt(), imageSize.y.toInt(), - pos.x.toInt(), pos.y.toInt(), - size.x.toInt(), size.y.toInt()) + imageSize.x.toInt(), imageSize.y.toInt(), + pos.x.toInt(), pos.y.toInt(), + size.x.toInt(), size.y.toInt()) } } @@ -412,15 +420,15 @@ class CanvasState(val canvas: HTMLCanvasElement) { } window.setInterval({ - draw() - }, 1000 / 30) + draw() + }, 1000 / 30) window.setInterval({ - trafficLightUp.changeColor() - trafficLightLeft.changeColor() - trafficLightRight.changeColor() - trafficLightDown.changeColor() - }, 10000) + trafficLightUp.changeColor() + trafficLightLeft.changeColor() + trafficLightRight.changeColor() + trafficLightDown.changeColor() + }, 10000) } @@ -476,7 +484,7 @@ abstract class Shape() { class Vector(val x: Double = 0.0, val y: Double = 0.0) { fun plus(v: Vector) = v(x + v.x, y + v.y) - fun minus() = v(- x, - y) + fun minus() = v(-x, -y) fun minus(v: Vector) = v(x - v.x, y - v.y) fun times(koef: Double) = v(x * koef, y * koef) fun distanceTo(v: Vector) = Math.sqrt((this - v).sqr) diff --git a/js/js.translator/testFiles/webDemoExamples1/cases/forLoop.kt b/js/js.translator/testFiles/webDemoExamples1/cases/forLoop.kt index cda1f388f83..5707136f8aa 100644 --- a/js/js.translator/testFiles/webDemoExamples1/cases/forLoop.kt +++ b/js/js.translator/testFiles/webDemoExamples1/cases/forLoop.kt @@ -1,9 +1,9 @@ -fun main(args : Array) { - for (arg in args) - println(arg) +fun main(args: Array) { + for (arg in args) + println(arg) - // or - println() - for (i in args.indices) - println(args[i]) + // or + println() + for (i in args.indices) + println(args[i]) } diff --git a/js/js.translator/testFiles/webDemoExamples1/cases/ifAsExpression.kt b/js/js.translator/testFiles/webDemoExamples1/cases/ifAsExpression.kt index 52982f586ee..bfe971a9f75 100644 --- a/js/js.translator/testFiles/webDemoExamples1/cases/ifAsExpression.kt +++ b/js/js.translator/testFiles/webDemoExamples1/cases/ifAsExpression.kt @@ -1,5 +1,5 @@ -fun main(args : Array) { - println(max(parseInt(args[0]), parseInt(args[1]))) +fun main(args: Array) { + println(max(parseInt(args[0]), parseInt(args[1]))) } -fun max(a : Int, b : Int) = if (a > b) a else b \ No newline at end of file +fun max(a: Int, b: Int) = if (a > b) a else b \ No newline at end of file diff --git a/js/js.translator/testFiles/webDemoExamples1/cases/isCheck.kt b/js/js.translator/testFiles/webDemoExamples1/cases/isCheck.kt index f12f411b660..77f5b7e3e1e 100644 --- a/js/js.translator/testFiles/webDemoExamples1/cases/isCheck.kt +++ b/js/js.translator/testFiles/webDemoExamples1/cases/isCheck.kt @@ -1,9 +1,9 @@ -fun main(args : Array) { +fun main(args: Array) { println(getStringLength("aaa")) println(getStringLength(1)) } -fun getStringLength(obj : Any) : Int? { +fun getStringLength(obj: Any): Int? { if (obj is String) return obj.length // no cast to String is needed return null diff --git a/js/js.translator/testFiles/webDemoExamples1/cases/multiLanguageHello.kt b/js/js.translator/testFiles/webDemoExamples1/cases/multiLanguageHello.kt index d358e13556a..2ffd12f0f17 100644 --- a/js/js.translator/testFiles/webDemoExamples1/cases/multiLanguageHello.kt +++ b/js/js.translator/testFiles/webDemoExamples1/cases/multiLanguageHello.kt @@ -1,9 +1,9 @@ -fun main(args : Array) { - val language = if (args.size == 0) "EN" else args[0] - println(when (language) { - "EN" -> "Hello!" - "FR" -> "Salut!" - "IT" -> "Ciao!" - else -> "Sorry, I can't greet you in $language yet" - }) +fun main(args: Array) { + val language = if (args.size == 0) "EN" else args[0] + println(when (language) { + "EN" -> "Hello!" + "FR" -> "Salut!" + "IT" -> "Ciao!" + else -> "Sorry, I can't greet you in $language yet" + }) } diff --git a/js/js.translator/testFiles/webDemoExamples1/cases/nullChecks.kt b/js/js.translator/testFiles/webDemoExamples1/cases/nullChecks.kt index 649445ff33a..af61d76fc08 100644 --- a/js/js.translator/testFiles/webDemoExamples1/cases/nullChecks.kt +++ b/js/js.translator/testFiles/webDemoExamples1/cases/nullChecks.kt @@ -1,17 +1,19 @@ // Return null if str does not hold a number -fun myParseInt(str : String) : Int? { - try{ +fun myParseInt(str: String): Int? { + try { return parseInt(str) - } catch (e: NumberFormatException) { + } + catch (e: NumberFormatException) { println("One of argument isn't Int") } return null } -fun main(args : Array) { +fun main(args: Array) { if (args.size < 2) { print("No number supplied"); - } else { + } + else { val x = myParseInt(args[0]) val y = myParseInt(args[1]) diff --git a/js/js.translator/testFiles/webDemoExamples1/cases/objectOrientedHello.kt b/js/js.translator/testFiles/webDemoExamples1/cases/objectOrientedHello.kt index 04f7e19b7be..dcce9224b02 100644 --- a/js/js.translator/testFiles/webDemoExamples1/cases/objectOrientedHello.kt +++ b/js/js.translator/testFiles/webDemoExamples1/cases/objectOrientedHello.kt @@ -1,10 +1,10 @@ -class Greeter(name : String) { - val name = name - fun greet() { - println("Hello, ${name}!"); - } +class Greeter(name: String) { + val name = name + fun greet() { + println("Hello, ${name}!"); + } } -fun main(args : Array) { - Greeter(args[0]).greet() +fun main(args: Array) { + Greeter(args[0]).greet() } \ No newline at end of file diff --git a/js/js.translator/testFiles/webDemoExamples1/cases/patternMatching.kt b/js/js.translator/testFiles/webDemoExamples1/cases/patternMatching.kt index 7882247f3ef..0df24447ed0 100644 --- a/js/js.translator/testFiles/webDemoExamples1/cases/patternMatching.kt +++ b/js/js.translator/testFiles/webDemoExamples1/cases/patternMatching.kt @@ -1,17 +1,17 @@ -fun main(args : Array) { +fun main(args: Array) { cases("Hello") cases(1) cases(MyClass()) cases("hello") } -fun cases(obj : Any) { - when(obj) { - 1 -> println("One") - "Hello" -> println("Greeting") - !is String -> println("Not a string") - else -> println("Unknown") - } +fun cases(obj: Any) { + when(obj) { + 1 -> println("One") + "Hello" -> println("Greeting") + !is String -> println("Not a string") + else -> println("Unknown") + } } class MyClass() { diff --git a/js/js.translator/testFiles/webDemoExamples1/cases/printArg.kt b/js/js.translator/testFiles/webDemoExamples1/cases/printArg.kt index b4a6c70535b..ad95f21687a 100644 --- a/js/js.translator/testFiles/webDemoExamples1/cases/printArg.kt +++ b/js/js.translator/testFiles/webDemoExamples1/cases/printArg.kt @@ -1,3 +1,3 @@ -fun main(args : Array) { +fun main(args: Array) { print(args[0]); } diff --git a/js/js.translator/testFiles/webDemoExamples1/cases/ranges.kt b/js/js.translator/testFiles/webDemoExamples1/cases/ranges.kt index c397c8fa28d..192e76e98f3 100644 --- a/js/js.translator/testFiles/webDemoExamples1/cases/ranges.kt +++ b/js/js.translator/testFiles/webDemoExamples1/cases/ranges.kt @@ -1,15 +1,15 @@ import java.util.ArrayList; -fun main(args : Array) { +fun main(args: Array) { val x = parseInt(args[0]) //Check if a number lies within a range: val y = 10 - if (x in 1..y-1) + if (x in 1..y - 1) println("OK") //Iterate over a range: for (a in 1..5) - print(" ${a}") + print(" ${a}") //Check if a number is out of range: println() diff --git a/js/js.translator/testFiles/webDemoExamples1/cases/whileLoop.kt b/js/js.translator/testFiles/webDemoExamples1/cases/whileLoop.kt index 727b0a81c57..3ce84a02a0a 100644 --- a/js/js.translator/testFiles/webDemoExamples1/cases/whileLoop.kt +++ b/js/js.translator/testFiles/webDemoExamples1/cases/whileLoop.kt @@ -1,5 +1,5 @@ -fun main(args : Array) { - var i = 0 - while (i < args.size) - println(args[i++]) +fun main(args: Array) { + var i = 0 + while (i < args.size) + println(args[i++]) } diff --git a/js/js.translator/testFiles/webDemoExamples2/cases/bottles.kt b/js/js.translator/testFiles/webDemoExamples2/cases/bottles.kt index 0b2a874c5c1..8042783399f 100644 --- a/js/js.translator/testFiles/webDemoExamples2/cases/bottles.kt +++ b/js/js.translator/testFiles/webDemoExamples2/cases/bottles.kt @@ -26,48 +26,49 @@ * Additionally, you can pass the desired initial number of bottles to use (rather than 99) * as a command-line argument */ - import js.* +import js.* -fun main(args : Array) { - if (args.isEmpty()) { - printBottles(99) - } - else { - val bottles = parseInt(args[0]); - if (bottles != null) { - printBottles(bottles); - } else { - println("You have passed '${args[0]}' as a number of bottles, " + - "but it is not a valid integral number") +fun main(args: Array) { + if (args.isEmpty()) { + printBottles(99) + } + else { + val bottles = parseInt(args[0]); + if (bottles != null) { + printBottles(bottles); + } + else { + println("You have passed '${args[0]}' as a number of bottles, " + + "but it is not a valid integral number") + } } - } } -fun printBottles(bottleCount : Int) { - if (bottleCount <= 0) { - println("No bottles - no song") - return - } +fun printBottles(bottleCount: Int) { + if (bottleCount <= 0) { + println("No bottles - no song") + return + } - println("The \"${bottlesOfBeer(bottleCount)}\" song\n") + println("The \"${bottlesOfBeer(bottleCount)}\" song\n") - var bottles = bottleCount - while (bottles > 0) { - val bottlesOfBeer = bottlesOfBeer(bottles) - print("$bottlesOfBeer on the wall, $bottlesOfBeer.\nTake one down, pass it around, ") - bottles-- - println("${bottlesOfBeer(bottles)} on the wall.\n") - } - println("No more bottles of beer on the wall, no more bottles of beer.\n" + - "Go to the store and buy some more, ${bottlesOfBeer(bottleCount)} on the wall.") + var bottles = bottleCount + while (bottles > 0) { + val bottlesOfBeer = bottlesOfBeer(bottles) + print("$bottlesOfBeer on the wall, $bottlesOfBeer.\nTake one down, pass it around, ") + bottles-- + println("${bottlesOfBeer(bottles)} on the wall.\n") + } + println("No more bottles of beer on the wall, no more bottles of beer.\n" + + "Go to the store and buy some more, ${bottlesOfBeer(bottleCount)} on the wall.") } -fun bottlesOfBeer(count : Int) : String = - when (count) { - 0 -> "no more bottles" - 1 -> "1 bottle" - else -> "$count bottles" - } + " of beer" +fun bottlesOfBeer(count: Int): String = + when (count) { + 0 -> "no more bottles" + 1 -> "1 bottle" + else -> "$count bottles" + } + " of beer" // From the std package // This is an extension property, i.e. a property that is defined for the diff --git a/js/js.translator/testFiles/webDemoExamples2/cases/life.kt b/js/js.translator/testFiles/webDemoExamples2/cases/life.kt index c683370b23b..6bf30b98323 100644 --- a/js/js.translator/testFiles/webDemoExamples2/cases/life.kt +++ b/js/js.translator/testFiles/webDemoExamples2/cases/life.kt @@ -11,81 +11,82 @@ import js.*; * A field where cells live. Effectively immutable */ class Field( - val width : Int, - val height : Int, - // This function tells the constructor which cells are alive - // if init(i, j) is true, the cell (i, j) is alive - init : (Int, Int) -> Boolean + val width: Int, + val height: Int, + // This function tells the constructor which cells are alive + // if init(i, j) is true, the cell (i, j) is alive + init: (Int, Int) -> Boolean ) { - private val live : Array> = Array(height) {i -> Array(width) {j -> init(i, j)}} + private val live: Array> = Array(height) { i -> Array(width) { j -> init(i, j) } } - private fun liveCount(i : Int, j : Int) - = if (i in 0..height-1 && - j in 0..width-1 && - live[i][j]) 1 else 0 + private fun liveCount(i: Int, j: Int) + = if (i in 0..height - 1 && + j in 0..width - 1 && + live[i][j]) 1 + else 0 - // How many neighbors of (i, j) are alive? - fun liveNeighbors(i : Int, j : Int) = - liveCount(i - 1, j - 1) + - liveCount(i - 1, j) + - liveCount(i - 1, j + 1) + - liveCount(i, j - 1) + - liveCount(i, j + 1) + - liveCount(i + 1, j - 1) + - liveCount(i + 1, j) + - liveCount(i + 1, j + 1) + // How many neighbors of (i, j) are alive? + fun liveNeighbors(i: Int, j: Int) = + liveCount(i - 1, j - 1) + + liveCount(i - 1, j) + + liveCount(i - 1, j + 1) + + liveCount(i, j - 1) + + liveCount(i, j + 1) + + liveCount(i + 1, j - 1) + + liveCount(i + 1, j) + + liveCount(i + 1, j + 1) - // You can say field[i, j], and this function gets called - fun get(i : Int, j : Int) = live[i][j] + // You can say field[i, j], and this function gets called + fun get(i: Int, j: Int) = live[i][j] } /** * This function takes the present state of the field * and return a new field representing the next moment of time */ -fun next(field : Field) : Field { - return Field(field.width, field.height) {i, j -> - val n = field.liveNeighbors(i, j) - if (field[i, j]) - // (i, j) is alive - n in 2..3 // It remains alive iff it has 2 or 3 neighbors - else - // (i, j) is dead - n == 3 // A new cell is born if there are 3 neighbors alive - } +fun next(field: Field): Field { + return Field(field.width, field.height) { i, j -> + val n = field.liveNeighbors(i, j) + if (field[i, j]) + // (i, j) is alive + n in 2..3 // It remains alive iff it has 2 or 3 neighbors + else + // (i, j) is dead + n == 3 // A new cell is born if there are 3 neighbors alive + } } /** A few colony examples here */ -fun main(args : Array) { - // Simplistic demo - printField("***", 3) - // "Star burst" - printField(""" +fun main(args: Array) { + // Simplistic demo + printField("***", 3) + // "Star burst" + printField(""" __*__ _***_ __*__ """, 10) - // Stable colony - printField(""" + // Stable colony + printField(""" __*__ _*_*_ __*__ """, 3) - // Stable from the step 2 - printField(""" + // Stable from the step 2 + printField(""" __**__ __**__ __**__ """, 3) - // Oscillating colony - printField(""" + // Oscillating colony + printField(""" __**__ __**__ __**__ __**__ """, 6) - // A fancier oscillating colony - printField(""" + // A fancier oscillating colony + printField(""" --------------- ---***---***--- --------------- @@ -106,59 +107,61 @@ fun main(args : Array) { // UTILITIES -fun printField(s : String, steps : Int) { - var field = makeField(s) - for (step in 1..steps) { - println("Step: $step") - for (i in 0..field.height-1) { - for (j in 0..field.width-1) { - print(if (field[i, j]) "*" else " ") - } - println("") +fun printField(s: String, steps: Int) { + var field = makeField(s) + for (step in 1..steps) { + println("Step: $step") + for (i in 0..field.height - 1) { + for (j in 0..field.width - 1) { + print(if (field[i, j]) "*" else " ") + } + println("") + } + field = next(field) } - field = next(field) - } } -fun Array.toList() : List = this.to(ArrayList()) +fun Array.toList(): List = this.to(ArrayList()) -fun > Array.to(result: C) : C { +fun > Array.to(result: C): C { for (elem in this) result.add(elem) return result } -fun makeField(s : String) : Field { - val lines : Array = s.split("\n") +fun makeField(s: String): Field { + val lines: Array = s.split("\n") - val w = max(lines.toList(), comparator {o1, o2 -> - val l1 : Int = o1.size - val l2 = o2.size - l1 - l2 - })!! - val data = Array(lines.size) {Array(w.size) {false}} + val w = max(lines.toList(), comparator { o1, o2 -> + val l1: Int = o1.size + val l2 = o2.size + l1 - l2 + })!! + val data = Array(lines.size) { Array(w.size) { false } } - // workaround - for (i in data.indices) { - data[i] = Array(w.size) {false} - for (j in data[i].indices) - data[i][j] = false - } - - for (line in lines.indices) { - for (x in lines[line].indices) { - val c = lines[line][x] - data[line][x] = c == '*' + // workaround + for (i in data.indices) { + data[i] = Array(w.size) { false } + for (j in data[i].indices) + data[i][j] = false } - } - return Field(w.size, lines.size) {i, j -> data[i][j]} + for (line in lines.indices) { + for (x in lines[line].indices) { + val c = lines[line][x] + data[line][x] = c == '*' + } + } + + return Field(w.size, lines.size) { i, j -> data[i][j] } } // An excerpt from the Standard Library -val String?.indices : IntRange get() = IntRange(0, this!!.size) +val String?.indices: IntRange get() = IntRange(0, this!!.size) -fun MutableMap.set(k : K, v : V) { put(k, v) } +fun MutableMap.set(k: K, v: V) { + put(k, v) +} -val Array.isEmpty : Boolean get() = size == 0 +val Array.isEmpty: Boolean get() = size == 0 diff --git a/js/js.translator/testFiles/webDemoExamples2/cases/maze.kt b/js/js.translator/testFiles/webDemoExamples2/cases/maze.kt index c3775f253cc..812b8067289 100644 --- a/js/js.translator/testFiles/webDemoExamples2/cases/maze.kt +++ b/js/js.translator/testFiles/webDemoExamples2/cases/maze.kt @@ -25,7 +25,7 @@ import java.util.* * free space (a path does not go through walls). One can move only * straightly up, down, left or right, no diagonal moves allowed. */ -fun findPath(maze : Maze) : List>? { +fun findPath(maze: Maze): List>? { val previous = HashMap, Pair> val queue = LinkedList> @@ -34,15 +34,15 @@ fun findPath(maze : Maze) : List>? { queue.offer(maze.start) visited.add(maze.start) while (!queue.isEmpty()) { - val cell = queue.poll() - if (cell == maze.end) break + val cell = queue.poll() + if (cell == maze.end) break - for (newCell in maze.neighbors(cell._1, cell._2)) { - if (newCell in visited) continue - previous[newCell] = cell - queue.offer(newCell) - visited.add(cell) - } + for (newCell in maze.neighbors(cell._1, cell._2)) { + if (newCell in visited) continue + previous[newCell] = cell + queue.offer(newCell) + visited.add(cell) + } } if (previous[maze.end] == null) return null @@ -59,52 +59,52 @@ fun findPath(maze : Maze) : List>? { /** * Find neighbors of the (i, j) cell that are not walls */ -fun Maze.neighbors(i : Int, j : Int) : List> { - val result = ArrayList> - addIfFree(i - 1, j, result) - addIfFree(i, j - 1, result) - addIfFree(i + 1, j, result) - addIfFree(i, j + 1, result) - return result +fun Maze.neighbors(i: Int, j: Int): List> { + val result = ArrayList> + addIfFree(i - 1, j, result) + addIfFree(i, j - 1, result) + addIfFree(i + 1, j, result) + addIfFree(i, j + 1, result) + return result } -fun Maze.addIfFree(i : Int, j : Int, result : List>) { - if (i !in 0..height-1) return - if (j !in 0..width-1) return - if (walls[i][j]) return +fun Maze.addIfFree(i: Int, j: Int, result: List>) { + if (i !in 0..height - 1) return + if (j !in 0..width - 1) return + if (walls[i][j]) return - result.add(Pair(i, j)) + result.add(Pair(i, j)) } /** * A data class that represents a maze */ class Maze( - // Number or columns - val width : Int, - // Number of rows - val height : Int, - // true for a wall, false for free space - val walls : Array>, - // The starting point (must not be a wall) - val start : Pair, - // The target point (must not be a wall) - val end : Pair + // Number or columns + val width: Int, + // Number of rows + val height: Int, + // true for a wall, false for free space + val walls: Array>, + // The starting point (must not be a wall) + val start: Pair, + // The target point (must not be a wall) + val end: Pair ) { } /** A few maze examples here */ -fun main(args : Array) { - printMaze("I $") - printMaze("I O $") - printMaze(""" +fun main(args: Array) { + printMaze("I $") + printMaze("I O $") + printMaze(""" O $ O O O O I """) - printMaze(""" + printMaze(""" OOOOOOOOOOO O $ O OOOOOOO OOO @@ -115,7 +115,7 @@ fun main(args : Array) { O OO OOOOOO IO """) - printMaze(""" + printMaze(""" OOOOOOOOOOOOOOOOO O O O$ O O @@ -130,26 +130,26 @@ fun main(args : Array) { // UTILITIES -fun printMaze(str : String) { - val maze = makeMaze(str) +fun printMaze(str: String) { + val maze = makeMaze(str) - println("Maze:") - val path = findPath(maze) - for (i in 0..maze.height - 1) { - for (j in 0..maze.width - 1) { - val cell = Pair(i, j) - print( - if (maze.walls[i][j]) "O" - else if (cell == maze.start) "I" - else if (cell == maze.end) "$" - else if (path != null && path.contains(cell)) "~" - else " " - ) - } - println("") - } - println("Result: " + if (path == null) "No path" else "Path found") - println("") + println("Maze:") + val path = findPath(maze) + for (i in 0..maze.height - 1) { + for (j in 0..maze.width - 1) { + val cell = Pair(i, j) + print( + if (maze.walls[i][j]) "O" + else if (cell == maze.start) "I" + else if (cell == maze.end) "$" + else if (path != null && path.contains(cell)) "~" + else " " + ) + } + println("") + } + println("Result: " + if (path == null) "No path" else "Path found") + println("") } @@ -170,54 +170,57 @@ fun printMaze(str : String) { * O O * OOOOOOOOOOOOOOOOO */ -fun makeMaze(s : String) : Maze { - val lines = s.split("\n")!! - val w = max(lines.toList(), comparator {o1, o2 -> - val l1 : Int = o1?.size ?: 0 - val l2 = o2?.size ?: 0 - l1 - l2 - })!! - val data = Array>(lines.size) {Array(w.size) {false}} +fun makeMaze(s: String): Maze { + val lines = s.split("\n")!! + val w = max(lines.toList(), comparator { o1, o2 -> + val l1: Int = o1?.size ?: 0 + val l2 = o2?.size ?: 0 + l1 - l2 + })!! + val data = Array>(lines.size) { Array(w.size) { false } } - var start : Pair? = null - var end : Pair? = null + var start: Pair? = null + var end: Pair? = null - for (line in lines.indices) { - for (x in lines[line].indices) { - val c = lines[line]!![x] - data[line][x] = c == 'O' - when (c) { - 'I' -> start = Pair(line, x) - '$' -> end = Pair(line, x) - else -> {} - } + for (line in lines.indices) { + for (x in lines[line].indices) { + val c = lines[line]!![x] + data[line][x] = c == 'O' + when (c) { + 'I' -> start = Pair(line, x) + '$' -> end = Pair(line, x) + else -> { + } + } + } } - } - if (start == null) { - throw IllegalArgumentException("No starting point in the maze (should be indicated with 'I')") - } + if (start == null) { + throw IllegalArgumentException("No starting point in the maze (should be indicated with 'I')") + } - if (end == null) { - throw IllegalArgumentException("No goal point in the maze (should be indicated with a '$' sign)") - } + if (end == null) { + throw IllegalArgumentException("No goal point in the maze (should be indicated with a '$' sign)") + } - return Maze(w.size, lines.size, data, start!!, end!!) + return Maze(w.size, lines.size, data, start!!, end!!) } // An excerpt from the Standard Library -val String?.indices : IntRange get() = IntRange(0, this!!.size) +val String?.indices: IntRange get() = IntRange(0, this!!.size) -fun Map.set(k : K, v : V) { put(k, v) } - -fun comparator (f : (T, T) -> Int) : Comparator = object : Comparator { - override fun compare(o1 : T, o2 : T) : Int = f(o1, o2) - override fun equals(p : Any?) : Boolean = false +fun Map.set(k: K, v: V) { + put(k, v) } -fun > Array.to(result: C) : C { - for (elem in this) - result.add(elem) - return result +fun comparator (f: (T, T) -> Int): Comparator = object : Comparator { + override fun compare(o1: T, o2: T): Int = f(o1, o2) + override fun equals(p: Any?): Boolean = false +} + +fun > Array.to(result: C): C { + for (elem in this) + result.add(elem) + return result }