diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4094354e752..82ea280bc0f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -15,106 +15,37 @@
   <component name="ChangeListManager">
     <list default="true" id="f02ef53d-47a4-4f5e-a1aa-3df68aae9b20" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/DeclarationVisitor.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/DeclarationVisitor.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/DeclarationBodyVisitor.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/DeclarationBodyVisitor.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/NamespaceTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/NamespaceTranslator.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/Translation.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/Translation.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/AbstractInitializerTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/AbstractInitializerTranslator.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/ClassInitializerTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/ClassInitializerTranslator.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/InitializerVisitor.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/InitializerVisitor.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/NamespaceInitializerTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/NamespaceInitializerTranslator.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/utils/JetTestUtils.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/utils/JetTestUtils.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/class/cases/classInstantiation.kt" afterPath="$PROJECT_DIR$/translator/testFiles/class/cases/classInstantiation.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/class/cases/complexExpressionAsConstructorParameter.kt" afterPath="$PROJECT_DIR$/translator/testFiles/class/cases/complexExpressionAsConstructorParameter.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/class/cases/constructorWithParameter.kt" afterPath="$PROJECT_DIR$/translator/testFiles/class/cases/constructorWithParameter.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/class/cases/constructorWithPropertiesAsParameters.kt" afterPath="$PROJECT_DIR$/translator/testFiles/class/cases/constructorWithPropertiesAsParameters.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/class/cases/incrementProperty.kt" afterPath="$PROJECT_DIR$/translator/testFiles/class/cases/incrementProperty.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/class/cases/methodDeclarationAndCall.kt" afterPath="$PROJECT_DIR$/translator/testFiles/class/cases/methodDeclarationAndCall.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/class/cases/propertiesAsParametersInitialized.kt" afterPath="$PROJECT_DIR$/translator/testFiles/class/cases/propertiesAsParametersInitialized.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/class/cases/propertyAccess.kt" afterPath="$PROJECT_DIR$/translator/testFiles/class/cases/propertyAccess.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/class/cases/simpleInitializer.kt" afterPath="$PROJECT_DIR$/translator/testFiles/class/cases/simpleInitializer.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/conditional/cases/elseif.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/conditional/cases/elseif.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/conditional/cases/if.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/conditional/cases/if.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/conditional/cases/ifElseAsExpression.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/conditional/cases/ifElseAsExpression.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/for/cases/forIteratesOverArray.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/for/cases/forIteratesOverArray.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/for/cases/forOnEmptyArray.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/for/cases/forOnEmptyArray.kt" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/examples/cases/closureWithParameter.jet" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/closureWithParameter.jet" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/examples/cases/closureWithParameterAndBoxing.jet" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/closureWithParameterAndBoxing.jet" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/examples/cases/diamondInheritance.jet" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/diamondInheritance.jet" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/examples/cases/doubleEnclosedLocalVariable.jet" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/doubleEnclosedLocalVariable.jet" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/examples/cases/enclosingLocalVariable.jet" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/enclosingLocalVariable.jet" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/examples/cases/enclosingThis.jet" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/enclosingThis.jet" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/examples/cases/funDelegation.jet" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/funDelegation.jet" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/examples/cases/generic.jet" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/generic.jet" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/examples/cases/inheritedMethod.jet" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/inheritedMethod.jet" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/examples/cases/initializerBlock.jet" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/initializerBlock.jet" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/examples/cases/kt242.jet" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/kt242.jet" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/examples/cases/newInstanceDefaultConstructor.jet" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/newInstanceDefaultConstructor.jet" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/examples/cases/overloadBinaryOperator.jet" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/overloadBinaryOperator.jet" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/examples/cases/overloadPlusAssignReturn.jet" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/overloadPlusAssignReturn.jet" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/examples/cases/overloadPlusToPlusAssign.jet" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/overloadPlusToPlusAssign.jet" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/examples/cases/overloadUnaryOperator.jet" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/overloadUnaryOperator.jet" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/examples/cases/propertyDelegation.jet" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/propertyDelegation.jet" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/examples/cases/rightHandOverride.jet" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/rightHandOverride.jet" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/examples/cases/simplestClosure.jet" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/simplestClosure.jet" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/examples/cases/simplestClosureAndBoxing.jet" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/simplestClosureAndBoxing.jet" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/examples/sortedTests/unsupported/extensionClosure.jet" afterPath="$PROJECT_DIR$/translator/testFiles/examples/sortedTests/unsupported/extensionClosure.jet" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/function/cases/adderClosure.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/function/cases/adderClosure.kt" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/function/cases/closureWithParameter.jet" afterPath="$PROJECT_DIR$/translator/testFiles/expression/function/cases/closureWithParameter.jet" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/function/cases/closureWithParameterAndBoxing.jet" afterPath="$PROJECT_DIR$/translator/testFiles/expression/function/cases/closureWithParameterAndBoxing.jet" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/function/cases/enclosingThis.jet" afterPath="$PROJECT_DIR$/translator/testFiles/expression/function/cases/enclosingThis.jet" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/function/cases/functionLiteral.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/function/cases/functionLiteral.kt" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/function/cases/functionLiteralAsParameter.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/function/cases/functionLiteralAsParameter.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/function/cases/functionUsedBeforeDeclaration.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/function/cases/functionUsedBeforeDeclaration.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/function/cases/functionWithTwoParametersCall.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/function/cases/functionWithTwoParametersCall.kt" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/function/cases/loopClosure.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/function/cases/loopClosure.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/intrinsic/cases/minusAssignOnProperty.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/intrinsic/cases/minusAssignOnProperty.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/intrinsic/cases/plusAssign.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/intrinsic/cases/plusAssign.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/misc/cases/intRange.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/misc/cases/intRange.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/misc/cases/localProperty.jet" afterPath="$PROJECT_DIR$/translator/testFiles/expression/misc/cases/localProperty.jet" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/operation/cases/assign.jet" afterPath="$PROJECT_DIR$/translator/testFiles/expression/operation/cases/assign.jet" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/operation/cases/comparison.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/operation/cases/comparison.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/operation/cases/notBoolean.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/operation/cases/notBoolean.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/operation/cases/positiveAndNegativeNumbers.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/operation/cases/positiveAndNegativeNumbers.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/operation/cases/postfixIntOperations.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/operation/cases/postfixIntOperations.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/operation/cases/prefixIntOperations.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/operation/cases/prefixIntOperations.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/string/cases/intInTemplate.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/string/cases/intInTemplate.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/string/cases/multipleExpressionsInTemplate.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/string/cases/multipleExpressionsInTemplate.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/string/cases/stringAssignment.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/string/cases/stringAssignment.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/string/cases/stringConstant.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/string/cases/stringConstant.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/string/cases/stringInTemplate.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/string/cases/stringInTemplate.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/while/cases/breakDoWhile.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/while/cases/breakDoWhile.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/while/cases/breakWhile.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/while/cases/breakWhile.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/while/cases/continueDoWhile.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/while/cases/continueDoWhile.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/while/cases/continueWhile.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/while/cases/continueWhile.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/while/cases/doWhile.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/while/cases/doWhile.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/while/cases/doWhile2.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/while/cases/doWhile2.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/while/cases/while.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/while/cases/while.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/while/cases/while2.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/while/cases/while2.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/extensionFunction/cases/extensionFunctionOnExpression.kt" afterPath="$PROJECT_DIR$/translator/testFiles/extensionFunction/cases/extensionFunctionOnExpression.kt" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/extensionFunction/cases/extensionInsideFunctionLiteral.kt" afterPath="$PROJECT_DIR$/translator/testFiles/extensionFunction/cases/extensionInsideFunctionLiteral.kt" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/extensionFunction/cases/extensionLiteralPassedToFunction.kt" afterPath="$PROJECT_DIR$/translator/testFiles/extensionFunction/cases/extensionLiteralPassedToFunction.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/extensionFunction/cases/extensionUsedInsideClass.kt" afterPath="$PROJECT_DIR$/translator/testFiles/extensionFunction/cases/extensionUsedInsideClass.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/extensionFunction/cases/extensionWithImplicitReceiver.kt" afterPath="$PROJECT_DIR$/translator/testFiles/extensionFunction/cases/extensionWithImplicitReceiver.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/extensionFunction/cases/intExtension.kt" afterPath="$PROJECT_DIR$/translator/testFiles/extensionFunction/cases/intExtension.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/extensionFunction/cases/virtualExtension.kt" afterPath="$PROJECT_DIR$/translator/testFiles/extensionFunction/cases/virtualExtension.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/extensionFunction/cases/virtualExtensionOverride.kt" afterPath="$PROJECT_DIR$/translator/testFiles/extensionFunction/cases/virtualExtensionOverride.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/inheritance/cases/baseClassDefinedAfterDerived.kt" afterPath="$PROJECT_DIR$/translator/testFiles/inheritance/cases/baseClassDefinedAfterDerived.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/inheritance/cases/complexInitializationOrder.kt" afterPath="$PROJECT_DIR$/translator/testFiles/inheritance/cases/complexInitializationOrder.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/inheritance/cases/definitionOrder.kt" afterPath="$PROJECT_DIR$/translator/testFiles/inheritance/cases/definitionOrder.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/inheritance/cases/initializationOrder.kt" afterPath="$PROJECT_DIR$/translator/testFiles/inheritance/cases/initializationOrder.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/inheritance/cases/initializersOfBasicClassExecute.kt" afterPath="$PROJECT_DIR$/translator/testFiles/inheritance/cases/initializersOfBasicClassExecute.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/inheritance/cases/methodOverride.kt" afterPath="$PROJECT_DIR$/translator/testFiles/inheritance/cases/methodOverride.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/inheritance/cases/valuePassedToAncestorConstructor.kt" afterPath="$PROJECT_DIR$/translator/testFiles/inheritance/cases/valuePassedToAncestorConstructor.kt" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/java/arrayList/cases/access.kt" afterPath="$PROJECT_DIR$/translator/testFiles/java/arrayList/cases/access.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/java/arrayList/cases/arrayAccess.kt" afterPath="$PROJECT_DIR$/translator/testFiles/java/arrayList/cases/arrayAccess.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/java/arrayList/cases/emptyList.kt" afterPath="$PROJECT_DIR$/translator/testFiles/java/arrayList/cases/emptyList.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/java/arrayList/cases/indexOOB.kt" afterPath="$PROJECT_DIR$/translator/testFiles/java/arrayList/cases/indexOOB.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/java/arrayList/cases/isEmpty.kt" afterPath="$PROJECT_DIR$/translator/testFiles/java/arrayList/cases/isEmpty.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/java/arrayList/cases/iterate.kt" afterPath="$PROJECT_DIR$/translator/testFiles/java/arrayList/cases/iterate.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/java/arrayList/cases/remove.kt" afterPath="$PROJECT_DIR$/translator/testFiles/java/arrayList/cases/remove.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/nameClashes/cases/methodOverload.kt" afterPath="$PROJECT_DIR$/translator/testFiles/nameClashes/cases/methodOverload.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/binaryDivOverload.kt" afterPath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/binaryDivOverload.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/compareTo.kt" afterPath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/compareTo.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/notOverload.kt" afterPath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/notOverload.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/operatorOverloadOnPropertyCallGetterAndSetterOnlyOnce.kt" afterPath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/operatorOverloadOnPropertyCallGetterAndSetterOnlyOnce.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/overloadPlusAssignArrayList.kt" afterPath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/overloadPlusAssignArrayList.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/overloadedCallOnProperty.kt" afterPath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/overloadedCallOnProperty.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/plusAndMinusAsAnExpression.kt" afterPath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/plusAndMinusAsAnExpression.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/plusAssignNoReassign.kt" afterPath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/plusAssignNoReassign.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/plusAssignReassign.kt" afterPath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/plusAssignReassign.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/plusOverload.kt" afterPath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/plusOverload.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/postfixIncOverload.kt" afterPath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/postfixIncOverload.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/postfixOnProperty.kt" afterPath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/postfixOnProperty.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/prefixDecOverload.kt" afterPath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/prefixDecOverload.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/prefixIncReturnsCorrectValue.kt" afterPath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/prefixIncReturnsCorrectValue.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/unaryOnIntProperty.kt" afterPath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/unaryOnIntProperty.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/unaryOnIntProperty2.kt" afterPath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/unaryOnIntProperty2.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/usingModInCaseModAssignNotAvailable.kt" afterPath="$PROJECT_DIR$/translator/testFiles/operatorOverloading/cases/usingModInCaseModAssignNotAvailable.kt" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/patternMatching/cases/matchNullableType.kt" afterPath="$PROJECT_DIR$/translator/testFiles/patternMatching/cases/matchNullableType.kt" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/patternMatching/cases/multipleCases.kt" afterPath="$PROJECT_DIR$/translator/testFiles/patternMatching/cases/multipleCases.kt" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/patternMatching/cases/whenAsExpression.kt" afterPath="$PROJECT_DIR$/translator/testFiles/patternMatching/cases/whenAsExpression.kt" />
@@ -124,38 +55,10 @@
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/patternMatching/cases/whenType.kt" afterPath="$PROJECT_DIR$/translator/testFiles/patternMatching/cases/whenType.kt" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/patternMatching/cases/whenValue.kt" afterPath="$PROJECT_DIR$/translator/testFiles/patternMatching/cases/whenValue.kt" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/patternMatching/cases/whenValueOrType.kt" afterPath="$PROJECT_DIR$/translator/testFiles/patternMatching/cases/whenValueOrType.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/accessToInstanceProperty.kt" afterPath="$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/accessToInstanceProperty.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/classUsesNamespaceProperties.kt" afterPath="$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/classUsesNamespaceProperties.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/customGetter.kt" afterPath="$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/customGetter.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/customSetter.kt" afterPath="$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/customSetter.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/namespaceCustomAccessors.kt" afterPath="$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/namespaceCustomAccessors.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/namespacePropertyInitializer.kt" afterPath="$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/namespacePropertyInitializer.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/namespacePropertySet.kt" afterPath="$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/namespacePropertySet.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/safeCall.kt" afterPath="$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/safeCall.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/safeCallReturnsNullIfFails.kt" afterPath="$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/safeCallReturnsNullIfFails.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/setter.kt" afterPath="$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/setter.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/twoClassesWithProperties.kt" afterPath="$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/twoClassesWithProperties.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/range/cases/explicitRange.kt" afterPath="$PROJECT_DIR$/translator/testFiles/range/cases/explicitRange.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/range/cases/intInRange.kt" afterPath="$PROJECT_DIR$/translator/testFiles/range/cases/intInRange.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/range/cases/rangeSugarSyntax.kt" afterPath="$PROJECT_DIR$/translator/testFiles/range/cases/rangeSugarSyntax.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/rtti/cases/isSameClass.kt" afterPath="$PROJECT_DIR$/translator/testFiles/rtti/cases/isSameClass.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/rtti/cases/notIsOtherClass.kt" afterPath="$PROJECT_DIR$/translator/testFiles/rtti/cases/notIsOtherClass.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/standardClasses/cases/array.kt" afterPath="$PROJECT_DIR$/translator/testFiles/standardClasses/cases/array.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/standardClasses/cases/arrayAccess.kt" afterPath="$PROJECT_DIR$/translator/testFiles/standardClasses/cases/arrayAccess.kt" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/standardClasses/cases/arrayFunctionConstructor.kt" afterPath="$PROJECT_DIR$/translator/testFiles/standardClasses/cases/arrayFunctionConstructor.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/standardClasses/cases/arrayIsFilledWithNulls.kt" afterPath="$PROJECT_DIR$/translator/testFiles/standardClasses/cases/arrayIsFilledWithNulls.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/standardClasses/cases/arraySize.kt" afterPath="$PROJECT_DIR$/translator/testFiles/standardClasses/cases/arraySize.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/standardClasses/cases/arrayThrowsExceptionOnOOBaccess.kt" afterPath="$PROJECT_DIR$/translator/testFiles/standardClasses/cases/arrayThrowsExceptionOnOOBaccess.kt" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/standardClasses/cases/arraysIterator.kt" afterPath="$PROJECT_DIR$/translator/testFiles/standardClasses/cases/arraysIterator.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/trait/cases/classDerivesFromClassAndTrait.kt" afterPath="$PROJECT_DIR$/translator/testFiles/trait/cases/classDerivesFromClassAndTrait.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/trait/cases/classDerivesFromTraitAndClass.kt" afterPath="$PROJECT_DIR$/translator/testFiles/trait/cases/classDerivesFromTraitAndClass.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/trait/cases/definitionOrder.kt" afterPath="$PROJECT_DIR$/translator/testFiles/trait/cases/definitionOrder.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/trait/cases/example.kt" afterPath="$PROJECT_DIR$/translator/testFiles/trait/cases/example.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/trait/cases/funDelegation.jet" afterPath="$PROJECT_DIR$/translator/testFiles/trait/cases/funDelegation.jet" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/trait/cases/traitAddsFunctionsToClass.kt" afterPath="$PROJECT_DIR$/translator/testFiles/trait/cases/traitAddsFunctionsToClass.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/trait/cases/traitExtendsTrait.kt" afterPath="$PROJECT_DIR$/translator/testFiles/trait/cases/traitExtendsTrait.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/trait/cases/traitExtendsTwoTraits.kt" afterPath="$PROJECT_DIR$/translator/testFiles/trait/cases/traitExtendsTwoTraits.kt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/tuple/cases/twoElements.kt" afterPath="$PROJECT_DIR$/translator/testFiles/tuple/cases/twoElements.kt" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/webDemoExamples/cases/multiLanguageHello.kt" afterPath="$PROJECT_DIR$/translator/testFiles/webDemoExamples/cases/multiLanguageHello.kt" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/webDemoExamples/cases/patternMatching.kt" afterPath="$PROJECT_DIR$/translator/testFiles/webDemoExamples/cases/patternMatching.kt" />
     </list>
     <ignored path="k2js.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -320,8 +223,8 @@
       <property name="field_breakpoints_groupByClasses" value="true" />
       <property name="method_breakpoints_groupByClasses" value="true" />
       <property name="exception_breakpoints_viewId" value="TABLE" />
-      <property name="exception_breakpoints_groupByClasses" value="true" />
       <property name="field_breakpoints_viewId" value="TABLE" />
+      <property name="exception_breakpoints_groupByClasses" value="true" />
       <property name="method_breakpoints_groupByMethods" value="false" />
     </ui_properties>
   </component>
@@ -332,43 +235,10 @@
     <splitter split-orientation="horizontal" split-proportion="0.4739369">
       <split-first>
         <leaf>
-          <file leaf-file-name="NamespaceInitializerTranslator.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/NamespaceInitializerTranslator.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="30" column="55" selection-start="1234" selection-end="1234" vertical-scroll-proportion="0.0">
-                  <folding>
-                    <element signature="imports" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="NamespaceTranslator.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/NamespaceTranslator.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="87" column="56" selection-start="3667" selection-end="3667" vertical-scroll-proportion="-10.326923">
-                  <folding>
-                    <element signature="imports" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="ClassDeclarationTranslator.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="43" column="58" selection-start="1754" selection-end="1754" vertical-scroll-proportion="0.0">
-                  <folding>
-                    <element signature="imports" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
           <file leaf-file-name="TranslationContext.java" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="49" column="81" selection-start="1950" selection-end="1950" vertical-scroll-proportion="0.0">
+                <state line="52" column="81" selection-start="2110" selection-end="2110" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
@@ -378,9 +248,7 @@
             <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/DeclarationBodyVisitor.java">
               <provider selected="true" editor-type-id="text-editor">
                 <state line="39" column="63" selection-start="1714" selection-end="1714" vertical-scroll-proportion="0.0">
-                  <folding>
-                    <element signature="e#1624#1647#0" expanded="true" />
-                  </folding>
+                  <folding />
                 </state>
               </provider>
             </entry>
@@ -389,9 +257,7 @@
             <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java">
               <provider selected="true" editor-type-id="text-editor">
                 <state line="422" column="0" selection-start="15409" selection-end="15409" vertical-scroll-proportion="0.0">
-                  <folding>
-                    <element signature="e#15569#15597#0" expanded="true" />
-                  </folding>
+                  <folding />
                 </state>
               </provider>
             </entry>
@@ -417,16 +283,43 @@
           <file leaf-file-name="ArrayListTest.java" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ArrayListTest.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="33" column="16" selection-start="671" selection-end="671" vertical-scroll-proportion="0.0">
+                <state line="23" column="16" selection-start="469" selection-end="469" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="ExtensionFunctionTest.java" pinned="false" current="true" current-in-tab="true">
+          <file leaf-file-name="access.kt" pinned="false" current="true" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/java/arrayList/cases/access.kt">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="9" column="35" selection-start="192" selection-end="192" vertical-scroll-proportion="0.27370304">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="ExtensionFunctionTest.java" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ExtensionFunctionTest.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="45" column="53" selection-start="1106" selection-end="1106" vertical-scroll-proportion="0.5134168">
+                <state line="46" column="16" selection-start="1123" selection-end="1123" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="extensionLiteralPassedToFunction.kt" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/extensionFunction/cases/extensionLiteralPassedToFunction.kt">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="5" column="25" selection-start="112" selection-end="112" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="closureWithParameter.jet" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/examples/cases/closureWithParameter.jet">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="7" column="0" selection-start="0" selection-end="156" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
@@ -436,68 +329,64 @@
       </split-first>
       <split-second>
         <leaf>
-          <file leaf-file-name="methodOverload.js" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/testFiles/nameClashes/out/methodOverload.js">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="DescriptorUtils.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="130" column="29" selection-start="5259" selection-end="5259" vertical-scroll-proportion="0.0">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="AnalyzingUtils.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="63" column="23" selection-start="2341" selection-end="2341" vertical-scroll-proportion="0.0">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="K2JSTranslator.java" pinned="false" current="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="89" column="61" selection-start="3333" selection-end="3333" vertical-scroll-proportion="0.93406594">
-                  <folding>
-                    <element signature="imports" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="methodOverload.kt" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/testFiles/nameClashes/cases/methodOverload.kt">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="BindingUtils.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="81" column="77" selection-start="3720" selection-end="3720" vertical-scroll-proportion="-12.769231">
-                  <folding>
-                    <element signature="e#3810#3826#0" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
           <file leaf-file-name="FunctionTest.java" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/FunctionTest.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="22" column="16" selection-start="457" selection-end="457" vertical-scroll-proportion="0.0">
+                <state line="42" column="16" selection-start="943" selection-end="943" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="functionLiteralAsParameter.kt" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/cases/functionLiteralAsParameter.kt">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="2" column="23" selection-start="36" selection-end="36" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="inheritedMethod.jet" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/examples/cases/inheritedMethod.jet">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="generic.jet" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/examples/cases/generic.jet">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="2" column="46" selection-start="66" selection-end="66" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="closureWithParameterAndBoxing.jet" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/cases/closureWithParameterAndBoxing.jet">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="closureWithParameter.jet" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/cases/closureWithParameter.jet">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="6" column="28" selection-start="115" selection-end="115" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="loopClosure.kt" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/cases/loopClosure.kt">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="6" column="33" selection-start="107" selection-end="107" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
@@ -506,25 +395,25 @@
           <file leaf-file-name="WebDemoExamplesTest.java" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/WebDemoExamplesTest.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="48" column="16" selection-start="1229" selection-end="1229" vertical-scroll-proportion="0.0">
+                <state line="37" column="16" selection-start="914" selection-end="914" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="PropertyAccessTest.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/PropertyAccessTest.java">
+          <file leaf-file-name="StandardClassesTest.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/StandardClassesTest.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="47" column="16" selection-start="1042" selection-end="1042" vertical-scroll-proportion="0.0">
+                <state line="37" column="16" selection-start="844" selection-end="844" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="JarHandlerBase.class" pinned="false" current="false" current-in-tab="false">
-            <entry file="jar://C:/Program Files (x86)/JetBrains/IntelliJ IDEA Community Edition 112.121/lib/idea.jar!/com/intellij/openapi/vfs/impl/jar/JarHandlerBase.class">
+          <file leaf-file-name="arraySize.kt" pinned="false" current="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/standardClasses/cases/arraySize.kt">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="5" column="13" selection-start="171" selection-end="171" vertical-scroll-proportion="0.0">
+                <state line="7" column="11" selection-start="83" selection-end="83" vertical-scroll-proportion="0.21288015">
                   <folding />
                 </state>
               </provider>
@@ -554,13 +443,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/utils/JetTestUtils.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java" />
-        <option value="$PROJECT_DIR$/translator/testFiles/nameClashes/out/methodOverload.js" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/NamespaceInitializerTranslator.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/AbstractInitializerTranslator.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/NamespaceTranslator.java" />
         <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java" />
         <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/InitializerVisitor.java" />
         <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/Translation.java" />
@@ -570,6 +452,13 @@
         <option value="$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java" />
         <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java" />
         <option value="$PROJECT_DIR$/translator/testFiles/class/cases/classInstantiation.kt" />
+        <option value="$PROJECT_DIR$/translator/testFiles/extensionFunction/cases/extensionLiteralPassedToFunction.kt" />
+        <option value="$PROJECT_DIR$/translator/testFiles/examples/cases/closureWithParameter.jet" />
+        <option value="$PROJECT_DIR$/translator/testFiles/expression/function/cases/loopClosure.kt" />
+        <option value="$PROJECT_DIR$/translator/testFiles/expression/function/cases/closureWithParameter.jet" />
+        <option value="$PROJECT_DIR$/translator/testFiles/expression/function/cases/functionLiteralAsParameter.kt" />
+        <option value="$PROJECT_DIR$/translator/testFiles/examples/cases/generic.jet" />
+        <option value="$PROJECT_DIR$/translator/testFiles/java/arrayList/cases/access.kt" />
       </list>
     </option>
   </component>
@@ -659,6 +548,16 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="Scope">
+        <subPane subId="Project Files">
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -677,6 +576,140 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="standardClasses" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="standardClasses" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="cases" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="arrayList" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="arrayList" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="cases" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="test" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="k2js" />
@@ -741,7 +774,6 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
       <pane id="PackagesPane">
         <subPane>
           <PATH>
@@ -774,9 +806,9 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="MemberChooser.showClasses" value="true" />
     <property name="GoToClass.includeLibraries" value="false" />
-    <property name="options.searchVisible" value="true" />
-    <property name="options.splitter.details.proportions" value="0.2" />
     <property name="dynamic.classpath" value="false" />
+    <property name="options.splitter.details.proportions" value="0.2" />
+    <property name="options.searchVisible" value="true" />
   </component>
   <component name="RecentsManager">
     <key name="CopyClassDialog.RECENTS_KEY">
@@ -795,414 +827,7 @@
       <recent name="org.jetbrains.k2js.test.examples" />
     </key>
   </component>
-  <component name="RestoreUpdateTree">
-    <UpdateInfo date="Moments ago" ActionInfo="_Update">
-      <UpdatedFiles>
-        <FILE-GROUP>
-          <option name="myUpdateName" value="Updated from server" />
-          <option name="myStatusName" value="Changed on server" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" value="CHANGED_ON_SERVER" />
-          <FILE-GROUP>
-            <option name="myUpdateName" value="Updated" />
-            <option name="myStatusName" value="Changed" />
-            <option name="mySupportsDeletion" value="false" />
-            <option name="myCanBeAbsent" value="false" />
-            <option name="myId" value="UPDATED" />
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/.idea/artifacts/WebViewApplet_jar.xml</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/.idea/artifacts/WebViewServer_jar.xml</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/.idea/modules.xml</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/.idea/workspace.xml</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/TestModule/TestModule.iml</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebView.iml</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewApplet/src/web/view/ukhorskaya/ErrorWriterInApplet.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewApplet/src/web/view/ukhorskaya/InitializerApplet.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/WebViewServer.iml</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/codemirror/lib/codemirror.css</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/codemirror/lib/codemirror.js</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/codemirror/lib/complete.js</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/codemirror/mode/clike/kotlin.js</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/components/common.js</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/components/components.css</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/components/components.js</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/header.html</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/icons/error.png</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/icons/warning.png</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/images/switch.gif</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/logs.html</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/src/log4j.xml</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/src/web/view/ukhorskaya/Initializer.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/src/web/view/ukhorskaya/Main.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/src/web/view/ukhorskaya/Statistics.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/src/web/view/ukhorskaya/examplesLoader/ExamplesList.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/src/web/view/ukhorskaya/examplesLoader/ExamplesLoader.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/src/web/view/ukhorskaya/handlers/ServerHandler.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/src/web/view/ukhorskaya/responseHelpers/JavaRunner.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/src/web/view/ukhorskaya/server/KotlinHttpServer.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/src/web/view/ukhorskaya/sessions/HttpSession.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/examples/Basic syntax walk-through/Null-checks.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/examples/Basic syntax walk-through/Use pattern-matching.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/examples/Basic syntax walk-through/Use ranges and in.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/examples/Hello, world!/A multi-language Hello.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/examples/helpExamples.xml</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/src/web/view/ukhorskaya/MyDeclarationDescriptorVisitor.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/src/web/view/ukhorskaya/ResponseUtils.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/src/web/view/ukhorskaya/errorsDescriptors/ErrorAnalyzer.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/src/web/view/ukhorskaya/responseHelpers/JsonResponseForCompletion.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/src/web/view/ukhorskaya/server/ServerSettings.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/src/web/view/ukhorskaya/session/SessionInfo.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/j2k.ipr</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/Converter.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/ArrayInitializerExpression.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/ArrayWithoutInitializationExpression.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/BinaryExpression.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/CaseContainer.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/Class.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/ClassType.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/File.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/IMember.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/INode.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/Identifier.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/MethodCallExpression.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/NewClassExpression.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/Node.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/PolyadicExpression.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/SwitchContainer.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/SwitchLabelStatement.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/util/AstUtil.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/visitors/ClassVisitor.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitorForDirectObjectInheritors.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/test/org/jetbrains/jet/j2k/TestCaseBuilder.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/annotations/file/jetbrainsNotNull.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/boxedType/file/kt-671.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/class/file/kt-639.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/constructors/file/customerBuilder.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/constructors/file/genericIdentifier.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/enum/class/colorEnum.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/enum/class/primaryPrivateConstructor.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/file/comp/intNullability.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/file/file/packageWithClass.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/file/file/packageWithImports.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/file/file/packageWithMixedImports.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/file/file/packageWithOpenClass.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/file/file/packageWithStaticImports.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/function/file/extendsBaseWhichExtendsObject.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/function/file/functionInFinalClass.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/function/file/overrideObject.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/function/file/varVararg.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/function/file/writableParameter.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/importStatement/file/importWithKeywords.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/importStatement/file/importWithStar.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/importStatement/file/simpleImport.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-543-boxed.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-543-mixed.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-543.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-696.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-792-mixed.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-792.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-794-mixed.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-809-string.jav</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-809-string.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-809.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-820-field.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-820.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-824-isDir.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-824.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-836.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-837.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/kotlinExclusion/file/kt-656.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/literalExpression/file/dollarInsideString.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/methodCallExpression/file/genericMethod.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/newClassExpression/file/fullQualifiedName.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/newClassExpression/file/fullQualifiedName2.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/newClassExpression/file/newClassByFullName.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/newClassExpression/file/newInnerClass.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/newClassExpression/file/newListAndNewMember.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/newClassExpression/file/newStaticInnerClass.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/objectLiteral/file/MyFrame.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/rawGenerics/file/kt-540-map.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/rawGenerics/file/kt-540.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/rawGenerics/file/rawGenericMethod.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/switch/file/comlicatedFallDown.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/switch/file/fallDown.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/switch/file/kt-539.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../java-compatibility/src/candidates.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../java-compatibility/src/nullability.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslatorApplet.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../upstream-patches/j2k</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../upstream-patches/xsd</PATH>
-          </FILE-GROUP>
-          <FILE-GROUP>
-            <option name="myUpdateName" value="Created" />
-            <option name="myStatusName" value="Created" />
-            <option name="mySupportsDeletion" value="false" />
-            <option name="myCanBeAbsent" value="false" />
-            <option name="myId" value="CREATED" />
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/icons/executeJava.png</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/icons/executeJavaScript.png</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/icons/javatokotlin.PNG</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/kotlin_lib.js</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/login.html</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/src/web/view/ukhorskaya/authorization/UserAuthenticator.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/src/web/view/ukhorskaya/responseHelpers/JavaConverterRunner.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/src/web/view/ukhorskaya/responseHelpers/JsConverter.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/statistics/managers.xml</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/statistics/users.xml</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/META-INF/MANIFEST.MF</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ConverterUtil.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/SetupJavaCoreEnvironmentException.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/test/org/jetbrains/jet/j2k/StandaloneJavaToKotlinConverterTest.java</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-638.jav</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-638.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-852.jav</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-852.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-871.jav</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-871.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-879.jav</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-879.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-893.jav</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-893.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/.idea/.name</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/.idea/ant.xml</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/.idea/compiler.xml</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/.idea/copyright/profiles_settings.xml</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/.idea/encodings.xml</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/.idea/libraries/junit.xml</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/.idea/misc.xml</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/.idea/modules.xml</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/.idea/scopes/scope_settings.xml</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/.idea/uiDesigner.xml</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/.idea/vcs.xml</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/kotlin-junit-3.iml</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/lib/junit.jar</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/run.sh</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/src/EstatisticasSimples.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/src/EstatisticasSimplesTest.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/src/std/compatibility/candidates.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/src/std/compatibility/nullability.kt</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../vim/kotlin.vim</PATH>
-          </FILE-GROUP>
-          <FILE-GROUP>
-            <option name="myUpdateName" value="Deleted" />
-            <option name="myStatusName" value="Deleted" />
-            <option name="mySupportsDeletion" value="false" />
-            <option name="myCanBeAbsent" value="true" />
-            <option name="myId" value="REMOVED_FROM_REPOSITORY" />
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/backfix.min.js</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/images/icon-arrow.gif</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/images/icon-ok.gif</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/images/msDropDown.gif</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/jre/lib/annotations.jar</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/jre/lib/rt.jar</PATH>
-            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java</PATH>
-          </FILE-GROUP>
-          <FILE-GROUP>
-            <option name="myUpdateName" value="Restored" />
-            <option name="myStatusName" value="Will be restored" />
-            <option name="mySupportsDeletion" value="false" />
-            <option name="myCanBeAbsent" value="false" />
-            <option name="myId" value="RESTORED" />
-          </FILE-GROUP>
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" value="Modified" />
-          <option name="myStatusName" value="Modified" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" value="MODIFIED" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" value="Skipped" />
-          <option name="myStatusName" value="Skipped" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" value="SKIPPED" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" value="Merged with conflicts" />
-          <option name="myStatusName" value="Will be merged with conflicts" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" value="MERGED_WITH_CONFLICTS" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" value="Merged with tree conflicts" />
-          <option name="myStatusName" value="Merged with tree conflicts" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" value="Merged" />
-          <option name="myStatusName" value="Will be merged" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" value="MERGED" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" value="Not in repository" />
-          <option name="myStatusName" value="Not in repository" />
-          <option name="mySupportsDeletion" value="true" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" value="UNKNOWN" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" value="Locally added" />
-          <option name="myStatusName" value="Locally added" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" value="LOCALLY_ADDED" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" value="Locally removed" />
-          <option name="myStatusName" value="Locally removed" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" value="LOCALLY_REMOVED" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" value="Switched" />
-          <option name="myStatusName" value="Switched" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" value="SWITCHED" />
-        </FILE-GROUP>
-      </UpdatedFiles>
-    </UpdateInfo>
-  </component>
-  <component name="RunManager" selected="JUnit.tests">
-    <configuration default="false" name="AppletTest" type="JUnit" factoryName="JUnit" temporary="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="org.jetbrains.k2js.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <module name="translator" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" value="" />
-      <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
-      <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.AppletTest" />
-      <option name="METHOD_NAME" value="" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <dir value="$PROJECT_DIR$/translator" />
-      <patterns />
-      <RunnerSettings RunnerId="Run" />
-      <ConfigurationWrapper RunnerId="Run" />
-      <method />
-    </configuration>
-    <configuration default="false" name="AppletTest.simpleTest" type="JUnit" factoryName="JUnit" temporary="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="org.jetbrains.k2js.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <module name="translator" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" value="" />
-      <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
-      <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.AppletTest" />
-      <option name="METHOD_NAME" value="simpleTest" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <dir value="$PROJECT_DIR$/translator" />
-      <patterns />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
-      </RunnerSettings>
-      <RunnerSettings RunnerId="Run" />
-      <ConfigurationWrapper RunnerId="Debug" />
-      <ConfigurationWrapper RunnerId="Run" />
-      <method />
-    </configuration>
-    <configuration default="false" name="All in jetTests" type="JUnit" factoryName="JUnit" temporary="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="jetTests" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="package" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="moduleWithDependencies" />
-      </option>
-      <envs />
-      <patterns />
-      <RunnerSettings RunnerId="Run" />
-      <ConfigurationWrapper RunnerId="Run" />
-      <method />
-    </configuration>
-    <configuration default="false" name="StandardClassesTest.arrayFunctionConstructor" type="JUnit" factoryName="JUnit" temporary="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="org.jetbrains.k2js.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <module name="translator" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" value="" />
-      <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
-      <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.StandardClassesTest" />
-      <option name="METHOD_NAME" value="arrayFunctionConstructor" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <dir value="$PROJECT_DIR$/translator" />
-      <patterns />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
-      </RunnerSettings>
-      <ConfigurationWrapper RunnerId="Debug" />
-      <method />
-    </configuration>
+  <component name="RunManager" selected="JUnit.All in jetTests">
     <configuration default="false" name="ArrayListTest.isEmpty" type="JUnit" factoryName="JUnit" temporary="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
         <pattern>
@@ -1238,6 +863,109 @@
       <ConfigurationWrapper RunnerId="Run" />
       <method />
     </configuration>
+    <configuration default="false" name="ExtensionFunctionTest.extensionLiteralPassedToFunction" type="JUnit" factoryName="JUnit" temporary="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
+        <pattern>
+          <option name="PATTERN" value="org.jetbrains.k2js.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <module name="translator" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" value="" />
+      <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
+      <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.ExtensionFunctionTest" />
+      <option name="METHOD_NAME" value="extensionLiteralPassedToFunction" />
+      <option name="TEST_OBJECT" value="method" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <dir value="$PROJECT_DIR$/translator" />
+      <patterns />
+      <RunnerSettings RunnerId="Run" />
+      <ConfigurationWrapper RunnerId="Run" />
+      <method />
+    </configuration>
+    <configuration default="false" name="All in translator" type="JUnit" factoryName="JUnit" temporary="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="translator" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="package" />
+      <option name="VM_PARAMETERS" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="moduleWithDependencies" />
+      </option>
+      <envs />
+      <patterns />
+      <RunnerSettings RunnerId="Run" />
+      <ConfigurationWrapper RunnerId="Run" />
+      <method />
+    </configuration>
+    <configuration default="false" name="FunctionTest.loopClosure" type="JUnit" factoryName="JUnit" temporary="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
+        <pattern>
+          <option name="PATTERN" value="org.jetbrains.k2js.test.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <module name="translator" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
+      <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.FunctionTest" />
+      <option name="METHOD_NAME" value="loopClosure" />
+      <option name="TEST_OBJECT" value="method" />
+      <option name="VM_PARAMETERS" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="moduleWithDependencies" />
+      </option>
+      <envs />
+      <patterns />
+      <RunnerSettings RunnerId="Run" />
+      <ConfigurationWrapper RunnerId="Run" />
+      <method />
+    </configuration>
+    <configuration default="false" name="All in jetTests" type="JUnit" factoryName="JUnit" temporary="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="jetTests" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="package" />
+      <option name="VM_PARAMETERS" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="moduleWithDependencies" />
+      </option>
+      <envs />
+      <patterns />
+      <RunnerSettings RunnerId="Run" />
+      <ConfigurationWrapper RunnerId="Run" />
+      <method />
+    </configuration>
     <configuration default="true" type="Remote" factoryName="Remote">
       <option name="USE_SOCKET_TRANSPORT" value="true" />
       <option name="SERVER_MODE" value="false" />
@@ -1296,17 +1024,6 @@
         <option name="Maven.BeforeRunTask" enabled="false" />
       </method>
     </configuration>
-    <configuration default="true" type="JavascriptDebugSession" factoryName="Local">
-      <JSDebuggerConfigurationSettings>
-        <option name="engineId" value="embedded" />
-        <option name="fileUrl" />
-      </JSDebuggerConfigurationSettings>
-      <method>
-        <option name="AntTarget" enabled="false" />
-        <option name="BuildArtifacts" enabled="false" />
-        <option name="Maven.BeforeRunTask" enabled="false" />
-      </method>
-    </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <module name="" />
@@ -1333,6 +1050,17 @@
         <option name="Maven.BeforeRunTask" enabled="false" />
       </method>
     </configuration>
+    <configuration default="true" type="JavascriptDebugSession" factoryName="Local">
+      <JSDebuggerConfigurationSettings>
+        <option name="engineId" value="embedded" />
+        <option name="fileUrl" />
+      </JSDebuggerConfigurationSettings>
+      <method>
+        <option name="AntTarget" enabled="false" />
+        <option name="BuildArtifacts" enabled="false" />
+        <option name="Maven.BeforeRunTask" enabled="false" />
+      </method>
+    </configuration>
     <configuration default="false" name="Applet" type="Applet" factoryName="Applet">
       <module name="translator" />
       <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.K2JSTranslatorApplet" />
@@ -1394,11 +1122,11 @@
     <list size="7">
       <item index="0" class="java.lang.String" itemvalue="Applet.Applet" />
       <item index="1" class="java.lang.String" itemvalue="JUnit.tests" />
-      <item index="2" class="java.lang.String" itemvalue="JUnit.AppletTest" />
-      <item index="3" class="java.lang.String" itemvalue="JUnit.AppletTest.simpleTest" />
-      <item index="4" class="java.lang.String" itemvalue="JUnit.All in jetTests" />
-      <item index="5" class="java.lang.String" itemvalue="JUnit.StandardClassesTest.arrayFunctionConstructor" />
-      <item index="6" class="java.lang.String" itemvalue="JUnit.ArrayListTest.isEmpty" />
+      <item index="2" class="java.lang.String" itemvalue="JUnit.ArrayListTest.isEmpty" />
+      <item index="3" class="java.lang.String" itemvalue="JUnit.ExtensionFunctionTest.extensionLiteralPassedToFunction" />
+      <item index="4" class="java.lang.String" itemvalue="JUnit.All in translator" />
+      <item index="5" class="java.lang.String" itemvalue="JUnit.FunctionTest.loopClosure" />
+      <item index="6" class="java.lang.String" itemvalue="JUnit.All in jetTests" />
     </list>
     <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
       <Host>localhost</Host>
@@ -1518,7 +1246,7 @@
     <option name="CREATE_PATCH_EXPAND_DETAILS_DEFAULT" value="true" />
     <option name="SHOW_FILE_HISTORY_DETAILS" value="true" />
     <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
-    <option name="LAST_COMMIT_MESSAGE" value="fix some code after update" />
+    <option name="LAST_COMMIT_MESSAGE" value="migrated from JetNamespace to NamespaceDescriptor and JetFile /* Lots of tests fail due to: missing array methods and unconverted tests*/" />
     <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
     <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
     <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
@@ -1531,7 +1259,6 @@
     <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
     <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
     <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
-    <MESSAGE value="extension functions support and tests." />
     <MESSAGE value="virtual extension functions support and tests." />
     <MESSAGE value="extension literal support and tests." />
     <MESSAGE value="temporary commit." />
@@ -1556,6 +1283,7 @@
     <MESSAGE value="added support for some of feature needed for applet, work on method overloading" />
     <MESSAGE value="quick fix that solves method overloading problem." />
     <MESSAGE value="fix some code after update" />
+    <MESSAGE value="migrated from JetNamespace to NamespaceDescriptor and JetFile /* Lots of tests fail due to: missing array methods and unconverted tests*/" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -1565,118 +1293,114 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/translator/testFiles/nameClashes/out/methodOverload.js">
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/examples/cases/closureWithParameter.jet">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="7" column="0" selection-start="0" selection-end="156" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/jet/Library.jet">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="113" column="21" selection-start="2448" selection-end="2452" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/cases/functionLiteral.kt">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java">
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/cases/loopClosure.kt">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="108" column="0" selection-start="4257" selection-end="4257" vertical-scroll-proportion="0.0">
+        <state line="6" column="33" selection-start="107" selection-end="107" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="130" column="29" selection-start="5259" selection-end="5259" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/BasicClassTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="62" column="16" selection-start="1563" selection-end="1563" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="63" column="23" selection-start="2341" selection-end="2341" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ClassInheritanceTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="37" column="16" selection-start="872" selection-end="872" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="89" column="61" selection-start="3333" selection-end="3333" vertical-scroll-proportion="0.93406594">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="422" column="0" selection-start="15409" selection-end="15409" vertical-scroll-proportion="0.0">
-          <folding>
-            <element signature="e#15569#15597#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/AbstractInitializerTranslator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="7" column="43" selection-start="388" selection-end="388" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/translator.iml">
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/cases/closureWithParameterAndBoxing.jet">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/Translation.java">
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/cases/closureWithParameter.jet">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="86" column="103" selection-start="4097" selection-end="4097" vertical-scroll-proportion="0.0">
+        <state line="6" column="28" selection-start="115" selection-end="115" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/testFiles/class/cases/classInstantiation.kt">
+    <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/FunctionTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="42" column="16" selection-start="943" selection-end="943" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/cases/functionLiteralAsParameter.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="2" column="23" selection-start="36" selection-end="36" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/examples/cases/inheritedMethod.jet">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/InitializerVisitor.java">
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/examples/cases/generic.jet">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="79" column="51" selection-start="3278" selection-end="3278" vertical-scroll-proportion="0.0">
+        <state line="2" column="46" selection-start="66" selection-end="66" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ArrayListTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="33" column="16" selection-start="671" selection-end="671" vertical-scroll-proportion="0.0">
+        <state line="23" column="16" selection-start="469" selection-end="469" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptor.java">
+    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="10" column="17" selection-start="294" selection-end="294" vertical-scroll-proportion="0.0">
+        <state line="43" column="58" selection-start="1754" selection-end="1754" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ExtensionFunctionTest.java">
+    <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/WebDemoExamplesTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="45" column="53" selection-start="1106" selection-end="1106" vertical-scroll-proportion="0.5134168">
+        <state line="37" column="16" selection-start="914" selection-end="914" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/StandardClassesTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="37" column="16" selection-start="844" selection-end="844" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/standardClasses/cases/arraySize.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="7" column="11" selection-start="83" selection-end="83" vertical-scroll-proportion="0.21288015">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/java/arrayList/cases/access.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="9" column="35" selection-start="192" selection-end="192" vertical-scroll-proportion="0.27370304">
           <folding />
         </state>
       </provider>
diff --git a/translator/testFiles/examples/cases/closureWithParameter.jet b/translator/testFiles/examples/cases/closureWithParameter.jet
index 0c556d628c1..e0b5d616951 100644
--- a/translator/testFiles/examples/cases/closureWithParameter.jet
+++ b/translator/testFiles/examples/cases/closureWithParameter.jet
@@ -1,7 +1,7 @@
 fun box() : String {
-    return apply( "OK", {(arg: String) => arg } )
+    return apply( "OK", {(arg: String) -> arg } )
 }
 
-fun apply(arg : String, f : fun (p:String) : String) : String {
+fun apply(arg : String, f :  (p:String) -> String) : String {
     return f(arg)
 }
diff --git a/translator/testFiles/examples/cases/closureWithParameterAndBoxing.jet b/translator/testFiles/examples/cases/closureWithParameterAndBoxing.jet
index 6d0a4ffa658..2b64a547d29 100644
--- a/translator/testFiles/examples/cases/closureWithParameterAndBoxing.jet
+++ b/translator/testFiles/examples/cases/closureWithParameterAndBoxing.jet
@@ -1,7 +1,7 @@
 fun box() : String {
-    return if (apply( 5, {(arg: Int) => arg + 13 } ) == 18) "OK" else "fail"
+    return if (apply( 5, {(arg: Int) -> arg + 13 } ) == 18) "OK" else "fail"
 }
 
-fun apply(arg : Int, f : fun (p:Int) : Int) : Int {
+fun apply(arg : Int, f :  (p:Int) -> Int) : Int {
     return f(arg)
 }
diff --git a/translator/testFiles/examples/cases/doubleEnclosedLocalVariable.jet b/translator/testFiles/examples/cases/doubleEnclosedLocalVariable.jet
index d8e5ea789f2..96ac7f2ef19 100644
--- a/translator/testFiles/examples/cases/doubleEnclosedLocalVariable.jet
+++ b/translator/testFiles/examples/cases/doubleEnclosedLocalVariable.jet
@@ -3,6 +3,6 @@ fun box() : String {
     return if (sum(200, { val ff = {cl}; ff() }) == 239) "OK" else "FAIL"
 }
 
-fun sum(arg:Int, f : fun () : Int) : Int {
+fun sum(arg:Int, f :  () -> Int) : Int {
     return arg + f()
 }
diff --git a/translator/testFiles/examples/cases/enclosingLocalVariable.jet b/translator/testFiles/examples/cases/enclosingLocalVariable.jet
index d2dbe243469..01e1a103ff2 100644
--- a/translator/testFiles/examples/cases/enclosingLocalVariable.jet
+++ b/translator/testFiles/examples/cases/enclosingLocalVariable.jet
@@ -3,6 +3,6 @@ fun box() : String {
     return if (sum(200, { val m = { val r = { cl };  r() }; m() }) == 239) "OK" else "FAIL"
 }
 
-fun sum(arg:Int, f : fun () : Int) : Int {
+fun sum(arg:Int, f :  () -> Int) : Int {
     return arg + f()
 }
diff --git a/translator/testFiles/examples/cases/enclosingThis.jet b/translator/testFiles/examples/cases/enclosingThis.jet
index 93ae48c580f..d227b3a2cc9 100644
--- a/translator/testFiles/examples/cases/enclosingThis.jet
+++ b/translator/testFiles/examples/cases/enclosingThis.jet
@@ -1,10 +1,10 @@
 class Point(val x:Int, val y:Int) {
-    fun mul() : fun (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) }
     }
 }
 
-val m = Point(2, 3).mul() : fun (scalar:Int):Point
+val m = Point(2, 3).mul() :  (scalar:Int)->Point
 
 fun box() : String {
     val answer = m(5)
diff --git a/translator/testFiles/examples/cases/generic.jet b/translator/testFiles/examples/cases/generic.jet
index 7b886440dfd..a0101648ffa 100644
--- a/translator/testFiles/examples/cases/generic.jet
+++ b/translator/testFiles/examples/cases/generic.jet
@@ -1,6 +1,6 @@
 import java.util.*
 
-fun <T> ArrayList<T>.findAll(predicate: fun (T) : Boolean): ArrayList<T> {
+fun <T> ArrayList<T>.findAll(predicate: (T) -> Boolean): ArrayList<T> {
   val result = ArrayList<T>()
   for(val t in this) {
     if (predicate(t)) result.add(t)
@@ -17,6 +17,6 @@ fun box(): String {
   list.add(5)
 
 
-  val m: ArrayList<Int> = list.findAll<Int>({(name: Int) => name < 4})
+  val m: ArrayList<Int> = list.findAll<Int>({(name: Int) -> name < 4})
   return if (m.size() == 2) "OK" else "fail"
 }
diff --git a/translator/testFiles/examples/cases/simplestClosure.jet b/translator/testFiles/examples/cases/simplestClosure.jet
index c851416e4f1..7a9f3b439cf 100644
--- a/translator/testFiles/examples/cases/simplestClosure.jet
+++ b/translator/testFiles/examples/cases/simplestClosure.jet
@@ -2,6 +2,6 @@ fun box() : String {
     return invoker( {"OK"} )
 }
 
-fun invoker(gen : fun () : String) : String {
+fun invoker(gen :  () -> String) : String {
     return gen()
 }
diff --git a/translator/testFiles/examples/cases/simplestClosureAndBoxing.jet b/translator/testFiles/examples/cases/simplestClosureAndBoxing.jet
index 8e3bedb2f37..50f22fbeb8d 100644
--- a/translator/testFiles/examples/cases/simplestClosureAndBoxing.jet
+++ b/translator/testFiles/examples/cases/simplestClosureAndBoxing.jet
@@ -2,6 +2,6 @@ fun box() : String {
     return if (int_invoker( { 7 } ) == 7) "OK" else "fail"
 }
 
-fun int_invoker(gen : fun () : Int) : Int {
+fun int_invoker(gen :  () -> Int) : Int {
     return gen()
 }
diff --git a/translator/testFiles/examples/sortedTests/unsupported/extensionClosure.jet b/translator/testFiles/examples/sortedTests/unsupported/extensionClosure.jet
index 11fd11b3816..21307ea42ab 100644
--- a/translator/testFiles/examples/sortedTests/unsupported/extensionClosure.jet
+++ b/translator/testFiles/examples/sortedTests/unsupported/extensionClosure.jet
@@ -1,13 +1,13 @@
 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)
     })
 
     return if (answer.x == 6 && answer.y == 10) "OK" else "FAIL"
 }
 
-fun apply(arg:Point, f : fun Point.(scalar : Int) : Point) : Point {
+fun apply(arg:Point, f :  Point.(scalar : Int) -> Point) : Point {
     return arg.f(2)
 }
diff --git a/translator/testFiles/expression/function/cases/adderClosure.kt b/translator/testFiles/expression/function/cases/adderClosure.kt
index 95b497dd058..d7c053cbb87 100644
--- a/translator/testFiles/expression/function/cases/adderClosure.kt
+++ b/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/translator/testFiles/expression/function/cases/closureWithParameter.jet b/translator/testFiles/expression/function/cases/closureWithParameter.jet
index 82177443573..31c8e3f07c0 100644
--- a/translator/testFiles/expression/function/cases/closureWithParameter.jet
+++ b/translator/testFiles/expression/function/cases/closureWithParameter.jet
@@ -1,9 +1,9 @@
 package foo
 
 fun box() : String {
-    return apply( "OK", {(arg: String) => arg } )
+    return apply( "OK", {(arg: String) -> arg } )
 }
 
-fun apply(arg : String, f : fun (p:String) : String) : String {
+fun apply(arg : String, f : (p:String) -> String) : String {
     return f(arg)
 }
diff --git a/translator/testFiles/expression/function/cases/closureWithParameterAndBoxing.jet b/translator/testFiles/expression/function/cases/closureWithParameterAndBoxing.jet
index 81a63e82ee9..e5602935931 100644
--- a/translator/testFiles/expression/function/cases/closureWithParameterAndBoxing.jet
+++ b/translator/testFiles/expression/function/cases/closureWithParameterAndBoxing.jet
@@ -1,9 +1,9 @@
 package foo
 
 fun box() : String {
-    return if (apply( 5, {(arg: Int) => arg + 13 } ) == 18) "OK" else "fail"
+    return if (apply( 5, {(arg: Int) -> arg + 13 } ) == 18) "OK" else "fail"
 }
 
-fun apply(arg : Int, f : fun (p:Int) : Int) : Int {
+fun apply(arg : Int, f :  (p:Int) -> Int) : Int {
     return f(arg)
 }
diff --git a/translator/testFiles/expression/function/cases/enclosingThis.jet b/translator/testFiles/expression/function/cases/enclosingThis.jet
index 93ae48c580f..d227b3a2cc9 100644
--- a/translator/testFiles/expression/function/cases/enclosingThis.jet
+++ b/translator/testFiles/expression/function/cases/enclosingThis.jet
@@ -1,10 +1,10 @@
 class Point(val x:Int, val y:Int) {
-    fun mul() : fun (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) }
     }
 }
 
-val m = Point(2, 3).mul() : fun (scalar:Int):Point
+val m = Point(2, 3).mul() :  (scalar:Int)->Point
 
 fun box() : String {
     val answer = m(5)
diff --git a/translator/testFiles/expression/function/cases/functionLiteral.kt b/translator/testFiles/expression/function/cases/functionLiteral.kt
index 888a0ecf050..e27b2e273f9 100644
--- a/translator/testFiles/expression/function/cases/functionLiteral.kt
+++ b/translator/testFiles/expression/function/cases/functionLiteral.kt
@@ -2,7 +2,7 @@ package foo
 
 fun box() : Boolean {
   var sum = 0
-  val addFive = {(a: Int) => a + 5 }
+  val addFive = {(a: Int) -> a + 5 }
   sum = addFive(sum)
   return sum == 5
 }
\ No newline at end of file
diff --git a/translator/testFiles/expression/function/cases/functionLiteralAsParameter.kt b/translator/testFiles/expression/function/cases/functionLiteralAsParameter.kt
index 1886b8679b4..3fb7b7ae0e4 100644
--- a/translator/testFiles/expression/function/cases/functionLiteralAsParameter.kt
+++ b/translator/testFiles/expression/function/cases/functionLiteralAsParameter.kt
@@ -1,10 +1,10 @@
 package foo
 
-fun apply(f : fun(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
+  return apply({(a: Int) -> a + 5 }, 3) == 8
 }
\ No newline at end of file
diff --git a/translator/testFiles/expression/function/cases/loopClosure.kt b/translator/testFiles/expression/function/cases/loopClosure.kt
index 09d3ef399f1..1cf3f038528 100644
--- a/translator/testFiles/expression/function/cases/loopClosure.kt
+++ b/translator/testFiles/expression/function/cases/loopClosure.kt
@@ -4,7 +4,7 @@ var b = 0
 
 fun loop(var times : Int) {
    while(times > 0) {
-        val u : fun(value : Int) : Unit = {
+        val u = {(value : Int) ->
             b = b + 1
         }
         u(times--)
diff --git a/translator/testFiles/extensionFunction/cases/extensionInsideFunctionLiteral.kt b/translator/testFiles/extensionFunction/cases/extensionInsideFunctionLiteral.kt
index aab2016b71d..9d69e2fd859 100644
--- a/translator/testFiles/extensionFunction/cases/extensionInsideFunctionLiteral.kt
+++ b/translator/testFiles/extensionFunction/cases/extensionInsideFunctionLiteral.kt
@@ -5,7 +5,7 @@ class M() {
 
     fun eval() {
         var d = {
-            var c = {Int.() => this + 3}
+            var c = {Int.() -> this + 3}
             m += 3.c()
         }
         d();
diff --git a/translator/testFiles/extensionFunction/cases/extensionLiteralPassedToFunction.kt b/translator/testFiles/extensionFunction/cases/extensionLiteralPassedToFunction.kt
index 05914755b15..62bd16300a2 100644
--- a/translator/testFiles/extensionFunction/cases/extensionLiteralPassedToFunction.kt
+++ b/translator/testFiles/extensionFunction/cases/extensionLiteralPassedToFunction.kt
@@ -1,7 +1,7 @@
 package foo
 
-fun apply(i : Int, f : fun Int.(Int) : Int) = i.f(1);
+fun apply(i : Int, f : Int.(Int) -> Int) = i.f(1);
 
 fun box() : Boolean {
-    return (apply(1, {i => i + this})) == 2
+    return (apply(1, {i -> i + this})) == 2
 }
\ No newline at end of file
diff --git a/translator/testFiles/java/arrayList/cases/access.kt b/translator/testFiles/java/arrayList/cases/access.kt
index 28448257651..d1faf27a2d5 100644
--- a/translator/testFiles/java/arrayList/cases/access.kt
+++ b/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<Int>();
-    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<Int>();
+     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/translator/testFiles/patternMatching/cases/matchNullableType.kt b/translator/testFiles/patternMatching/cases/matchNullableType.kt
index 05ba2919700..0c5dd0b1e73 100644
--- a/translator/testFiles/patternMatching/cases/matchNullableType.kt
+++ b/translator/testFiles/patternMatching/cases/matchNullableType.kt
@@ -7,7 +7,7 @@ class A() {
 fun box() : Boolean {
   var a = null : A?
   when(a) {
-    is A? => return true
-    else =>  return false
+    is A? -> return true
+    else ->  return false
   }
 }
\ No newline at end of file
diff --git a/translator/testFiles/patternMatching/cases/multipleCases.kt b/translator/testFiles/patternMatching/cases/multipleCases.kt
index 4dc60b606e4..7fb88010fb9 100644
--- a/translator/testFiles/patternMatching/cases/multipleCases.kt
+++ b/translator/testFiles/patternMatching/cases/multipleCases.kt
@@ -5,13 +5,13 @@ fun box() : Int {
   val d = 5
   var z = 0
   when(c) {
-    is 5, is 3 => z++;
-    else => {z = -1000;}
+    is 5, is 3 -> z++;
+    else -> {z = -1000;}
   }
 
   when(d) {
-    is 5, is 3 => z++;
-    else => {z = -1000;}
+    is 5, is 3 -> z++;
+    else -> {z = -1000;}
   }
   return z
 }
\ No newline at end of file
diff --git a/translator/testFiles/patternMatching/cases/whenAsExpression.kt b/translator/testFiles/patternMatching/cases/whenAsExpression.kt
index 82da4d8ba54..0287799ac78 100644
--- a/translator/testFiles/patternMatching/cases/whenAsExpression.kt
+++ b/translator/testFiles/patternMatching/cases/whenAsExpression.kt
@@ -4,9 +4,9 @@ package foo
 fun box() : Boolean {
 
     return (when(1) {
-        is 2 => 3
-        is 1 => 1
-        else => 5
+        is 2 -> 3
+        is 1 -> 1
+        else -> 5
     } == 1)
 
 }
\ No newline at end of file
diff --git a/translator/testFiles/patternMatching/cases/whenExecutesOnlyOnce.kt b/translator/testFiles/patternMatching/cases/whenExecutesOnlyOnce.kt
index ad15823b42d..df7f96eced2 100644
--- a/translator/testFiles/patternMatching/cases/whenExecutesOnlyOnce.kt
+++ b/translator/testFiles/patternMatching/cases/whenExecutesOnlyOnce.kt
@@ -7,9 +7,9 @@ class A() {
 fun box() : Boolean {
   var a = 0
   when(A()) {
-    is A => a++;
-    is A => a++;
-    else => a++;
+    is A -> a++;
+    is A -> a++;
+    else -> a++;
   }
   return (a == 1)
 }
\ No newline at end of file
diff --git a/translator/testFiles/patternMatching/cases/whenNotType.kt b/translator/testFiles/patternMatching/cases/whenNotType.kt
index 0d72368abff..554dc5c8b1e 100644
--- a/translator/testFiles/patternMatching/cases/whenNotType.kt
+++ b/translator/testFiles/patternMatching/cases/whenNotType.kt
@@ -6,7 +6,7 @@ class A() {
 
 fun box() : Boolean {
   when(A()) {
-    !is A => return false;
-    else => return true;
+    !is A -> return false;
+    else -> return true;
   }
 }
\ No newline at end of file
diff --git a/translator/testFiles/patternMatching/cases/whenNotValue.kt b/translator/testFiles/patternMatching/cases/whenNotValue.kt
index f1767fb4df8..5232916169d 100644
--- a/translator/testFiles/patternMatching/cases/whenNotValue.kt
+++ b/translator/testFiles/patternMatching/cases/whenNotValue.kt
@@ -3,8 +3,8 @@ package foo
 fun box() : Boolean {
   var a = 4
   when(a) {
-    !is 3 => {a = 10;}
-    !is 4 => {a = 20;}
+    !is 3 -> {a = 10;}
+    !is 4 -> {a = 20;}
   }
   return (a == 10)
 }
\ No newline at end of file
diff --git a/translator/testFiles/patternMatching/cases/whenType.kt b/translator/testFiles/patternMatching/cases/whenType.kt
index 59756ca8ae0..adad4fa5cd2 100644
--- a/translator/testFiles/patternMatching/cases/whenType.kt
+++ b/translator/testFiles/patternMatching/cases/whenType.kt
@@ -6,7 +6,7 @@ class A() {
 
 fun box() : Boolean {
   when(A()) {
-    is A => return true; 
-    else => return false;
+    is A -> return true;
+    else -> return false;
   }
 }
\ No newline at end of file
diff --git a/translator/testFiles/patternMatching/cases/whenValue.kt b/translator/testFiles/patternMatching/cases/whenValue.kt
index 71dd6a026ed..d26784f0497 100644
--- a/translator/testFiles/patternMatching/cases/whenValue.kt
+++ b/translator/testFiles/patternMatching/cases/whenValue.kt
@@ -3,8 +3,8 @@ package foo
 fun box() : Boolean {
   var a = 4
   when(a) {
-    is 3 => {a = 10;}
-    is 4 => {a = 20;}
+    is 3 -> {a = 10;}
+    is 4 -> {a = 20;}
   }
   return (a == 20)
 }
\ No newline at end of file
diff --git a/translator/testFiles/patternMatching/cases/whenValueOrType.kt b/translator/testFiles/patternMatching/cases/whenValueOrType.kt
index eb78a1418aa..5489fae2bd4 100644
--- a/translator/testFiles/patternMatching/cases/whenValueOrType.kt
+++ b/translator/testFiles/patternMatching/cases/whenValueOrType.kt
@@ -13,13 +13,13 @@ fun box() : Boolean {
   var a = A() : Any?
   var b = null : Any?
   when(a) {
-    is null => c = 10;
-    is B => c = 10000
-    is A  => c = 20;
+    is null -> c = 10;
+    is B -> c = 10000
+    is A  -> c = 20;
   }
   when(b) {
-    is null => c += 5
-    is B => c += 100
+    is null -> c += 5
+    is B -> c += 100
   }
   return (c == 25)
 }
\ No newline at end of file
diff --git a/translator/testFiles/standardClasses/cases/arrayFunctionConstructor.kt b/translator/testFiles/standardClasses/cases/arrayFunctionConstructor.kt
index 5af7e49213d..af27daeaafe 100644
--- a/translator/testFiles/standardClasses/cases/arrayFunctionConstructor.kt
+++ b/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/translator/testFiles/standardClasses/cases/arraysIterator.kt b/translator/testFiles/standardClasses/cases/arraysIterator.kt
index 406b20d1526..02b0f939d68 100644
--- a/translator/testFiles/standardClasses/cases/arraysIterator.kt
+++ b/translator/testFiles/standardClasses/cases/arraysIterator.kt
@@ -1,6 +1,6 @@
 package foo
 
-val a1 = Array<Int>(3, {(i : Int) => i})
+val a1 = Array<Int>(3, {(i : Int) -> i})
 
 fun box() : Boolean{
     val i = a1.iterator()
diff --git a/translator/testFiles/webDemoExamples/cases/multiLanguageHello.kt b/translator/testFiles/webDemoExamples/cases/multiLanguageHello.kt
index 5fa8993f7cd..0038a5e12c0 100644
--- a/translator/testFiles/webDemoExamples/cases/multiLanguageHello.kt
+++ b/translator/testFiles/webDemoExamples/cases/multiLanguageHello.kt
@@ -1,9 +1,9 @@
 fun main(args : Array<String>) {
   val language = if (args.size == 0) "EN" else args[0]
   System.out?.println(when (language) {
-    "EN" => "Hello!"
-    "FR" => "Salut!"
-    "IT" => "Ciao!"
-    else => "Sorry, I can't greet you in $language yet"
+    "EN" -> "Hello!"
+    "FR" -> "Salut!"
+    "IT" -> "Ciao!"
+    else -> "Sorry, I can't greet you in $language yet"
   })
 }
diff --git a/translator/testFiles/webDemoExamples/cases/patternMatching.kt b/translator/testFiles/webDemoExamples/cases/patternMatching.kt
index 3290c9f3755..5dd0be84862 100644
--- a/translator/testFiles/webDemoExamples/cases/patternMatching.kt
+++ b/translator/testFiles/webDemoExamples/cases/patternMatching.kt
@@ -7,10 +7,10 @@ fun main(args : Array<String>) {
 
 fun cases(obj : Any) {
   when(obj) {
-    1          => System.out?.println("One")
-    "Hello"    => System.out?.println("Greeting")
-    !is String => System.out?.println("Not a string")
-    else       => System.out?.println("Unknown")
+    1          -> System.out?.println("One")
+    "Hello"    -> System.out?.println("Greeting")
+    !is String -> System.out?.println("Not a string")
+    else       -> System.out?.println("Unknown")
   }
 }