azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a bug where you could not reference an object from a function literal defined inside a method.

Browse Source 
Also removed when conditional call code.
This commit is contained in:
Pavel Talanov
2011-11-28 16:23:33 +04:00
parent 97fbcb4775
commit cd638cb954
16 changed files with 430 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+280 -448
View File
@@ -8,57 +8,23 @@
</component>
<component name="ChangeListManager">
<list default="true" id="f02ef53d-47a4-4f5e-a1aa-3df68aae9b20" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/lib/asm-util-3.3.1.jar" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/jetTests.iml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/test/ExampleTestSuite.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/test/JetTestCaseBuilder.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/jetTests/test/ExampleTestSuite.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/closureWithParameter.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/closureWithParameterAndBoxing.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/diamondInheritance.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/doubleEnclosedLocalVariable.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/enclosingLocalVariable.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/funDelegation.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/initializerBlock.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/kt242.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/newInstanceDefaultConstructor.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/propertyDelegation.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/rightHandOverride.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/simplestClosure.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/simplestClosureAndBoxing.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/failed/enclosingThis.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/failed/simpleBox.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/obscure/inheritedMethod.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/unexpectedError/exceptionConstructor.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/basicproperty.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/classObject.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/classObjectInterface.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/classObjectMethod.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/enclosed.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/extensionClosure.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/inheritance.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/inheritedInnerClass.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/propertyInInitializer.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/traitproperty.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/usesJava/basicmethod.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/usesJava/inheritingFromArrayList.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/usesJava/initializerBlockDImpl.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/usesJava/innerClass.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/usesJava/overloadBinaryOperator.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/usesJava/overloadPlusAssign.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/usesJava/overloadPlusAssignReturn.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/usesJava/overloadPlusToPlusAssign.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/usesJava/overloadUnaryOperator.jet" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ExampleTest.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/javascript/cases/enclosingThis.js" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/JavascriptTest.java" />
<change type="DELETED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\patternMatching\cases\whenConditionMethodCall.kt" afterPath="" />
<change type="DELETED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\patternMatching\cases\whenConditionPropertyAccess.kt" afterPath="" />
<change type="MOVED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\sortedTests\failed\enclosingThis.jet" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/enclosingThis.jet" />
<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/translate/declaration/PropertyTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.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/test/org/jetbrains/k2js/test/ConditionalTest.java" afterPath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ConditionalTest.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/WhenTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/WhenTranslator.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/TranslationContext.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/TranslationContext.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceProvider.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceProvider.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.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/test/org/jetbrains/k2js/test/ExampleTest.java" afterPath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ExampleTest.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/KotlinLibTest.java" afterPath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/KotlinLibTest.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/TranslationTest.java" afterPath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/TranslationTest.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/translator.iml" afterPath="$PROJECT_DIR$/translator/translator.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/PatternMatchingTest.java" afterPath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/PatternMatchingTest.java" />
</list>
<ignored path="k2js.iws" />
<ignored path=".idea/workspace.xml" />
@@ -100,8 +66,8 @@
<option name="CONDITION_ENABLED" value="false" />
<option name="CLASS_FILTERS_ENABLED" value="false" />
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
<option name="CONDITION" value="&#13;&#13;JAVA" />
<option name="LOG_MESSAGE" value="&#13;&#13;JAVA" />
</breakpoint>
<breakpoint url="file://$PROJECT_DIR$/examples/test/JetTestCaseBuilder.java" line="41" class="JetTestCaseBuilder" package="">
<option name="ENABLED" value="true" />
@@ -116,7 +82,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
<breakpoint url="file://$PROJECT_DIR$/examples/test/JetTestCaseBuilder.java" line="61" class="JetTestCaseBuilder" package="">
<breakpoint url="file://$PROJECT_DIR$/examples/test/JetTestCaseBuilder.java" line="60" class="JetTestCaseBuilder" package="">
<option name="ENABLED" value="true" />
<option name="LOG_ENABLED" value="false" />
<option name="LOG_EXPRESSION_ENABLED" value="false" />
@@ -130,6 +96,19 @@
<option name="LOG_MESSAGE" value="" />
</breakpoint>
<breakpoint url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java" line="35" class="org.jetbrains.k2js.translate.reference.ReferenceTranslator" package="org.jetbrains.k2js.translate.reference">
<option name="ENABLED" value="true" />
<option name="LOG_ENABLED" value="false" />
<option name="LOG_EXPRESSION_ENABLED" value="false" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="COUNT_FILTER_ENABLED" value="false" />
<option name="COUNT_FILTER" value="0" />
<option name="CONDITION_ENABLED" value="true" />
<option name="CLASS_FILTERS_ENABLED" value="false" />
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
<option name="CONDITION" value="expression.getReferencedName().equals(&quot;x&quot;)&#13;&#13;JAVA" />
<option name="LOG_MESSAGE" value="&#13;&#13;JAVA" />
</breakpoint>
<breakpoint url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java" line="48" class="org.jetbrains.k2js.translate.expression.FunctionTranslator" package="org.jetbrains.k2js.translate.expression">
<option name="ENABLED" value="true" />
<option name="LOG_ENABLED" value="false" />
<option name="LOG_EXPRESSION_ENABLED" value="false" />
@@ -156,8 +135,8 @@
<option name="CONDITION_ENABLED" value="false" />
<option name="CLASS_FILTERS_ENABLED" value="false" />
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
<option name="CONDITION" value="&#13;&#13;JAVA" />
<option name="LOG_MESSAGE" value="&#13;&#13;JAVA" />
</breakpoint>
<breakpoint>
<option name="NOTIFY_CAUGHT" value="true" />
@@ -171,78 +150,77 @@
<option name="CONDITION_ENABLED" value="false" />
<option name="CLASS_FILTERS_ENABLED" value="false" />
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
<option name="CONDITION" value="&#13;&#13;JAVA" />
<option name="LOG_MESSAGE" value="&#13;&#13;JAVA" />
</breakpoint>
</breakpoint_any>
<breakpoint_rules />
<ui_properties />
<ui_properties>
<property name="line_breakpoints_groupByMethods" value="false" />
<property name="line_breakpoints_viewId" value="TABLE" />
<property name="exception_breakpoints_flattenPackages" value="true" />
<property name="method_breakpoints_flattenPackages" value="true" />
<property name="field_breakpoints_flattenPackages" value="true" />
<property name="exception_breakpoints_groupByMethods" value="false" />
<property name="line_breakpoints_groupByClasses" value="true" />
<property name="method_breakpoints_viewId" value="TABLE" />
<property name="field_breakpoints_groupByMethods" value="false" />
<property name="line_breakpoints_flattenPackages" value="true" />
<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="method_breakpoints_groupByMethods" value="false" />
</ui_properties>
</component>
<component name="FavoritesManager">
<favorites_list name="k2js" />
</component>
<component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.3720087">
<splitter split-orientation="horizontal" split-proportion="0.33043477">
<split-first>
<leaf>
<file leaf-file-name="propertyDelegation.jet" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/testFiles/examples/cases/propertyDelegation.jet">
<provider selected="true" editor-type-id="text-editor">
<state line="16" column="18" selection-start="301" selection-end="301" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="initializerBlock.jet" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/testFiles/examples/cases/initializerBlock.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="closureWithParameterAndBoxing.jet" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/testFiles/examples/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="newInstanceDefaultConstructor.jet" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/testFiles/examples/cases/newInstanceDefaultConstructor.jet">
<provider selected="true" editor-type-id="text-editor">
<state line="9" column="15" selection-start="149" selection-end="149" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="newInstanceDefaultConstructor.js" pinned="false" current="true" current-in-tab="true">
<file leaf-file-name="newInstanceDefaultConstructor.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/testFiles/examples/out/newInstanceDefaultConstructor.js">
<provider selected="true" editor-type-id="text-editor">
<state line="16" column="36" selection-start="356" selection-end="356" vertical-scroll-proportion="0.40902257">
<state line="19" column="51" selection-start="385" selection-end="385" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="kt242.jet" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/testFiles/examples/cases/kt242.jet">
<file leaf-file-name="WhenTranslator.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/WhenTranslator.java">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<state line="135" column="0" selection-start="5032" selection-end="5032" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="basicmethod.jet" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/testFiles/sortedTests/usesJava/basicmethod.jet">
<file leaf-file-name="PatternMatchingTest.java" pinned="false" current="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/PatternMatchingTest.java">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<state line="44" column="55" selection-start="1013" selection-end="1013" vertical-scroll-proportion="0.5206738">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="whenValueOrType.kt" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/testFiles/patternMatching/cases/whenValueOrType.kt">
<provider selected="true" editor-type-id="text-editor">
<state line="24" column="78" selection-start="291" selection-end="291" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="JetStandardClasses.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/types/JetStandardClasses.java">
<provider selected="true" editor-type-id="text-editor">
<state line="41" column="0" selection-start="1429" selection-end="1429" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -279,57 +257,19 @@
</split-first>
<split-second>
<leaf>
<file leaf-file-name="PropertyTranslator.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java">
<file leaf-file-name="ExampleTest.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ExampleTest.java">
<provider selected="true" editor-type-id="text-editor">
<state line="142" column="5" selection-start="5809" selection-end="5809" vertical-scroll-proportion="0.0">
<state line="18" column="5" selection-start="415" selection-end="415" vertical-scroll-proportion="0.42857143">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="JetTestCaseBuilder.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/examples/test/JetTestCaseBuilder.java">
<file leaf-file-name="enclosingThis.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/testFiles/examples/out/enclosingThis.js">
<provider selected="true" editor-type-id="text-editor">
<state line="41" column="0" selection-start="1564" selection-end="1564" vertical-scroll-proportion="0.0">
<folding>
<element signature="imports" expanded="true" />
</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/sortedTests/obscure/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="exceptionConstructor.jet" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/testFiles/sortedTests/unexpectedError/exceptionConstructor.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="enclosingThis.jet" pinned="false" current="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/translator/testFiles/sortedTests/failed/enclosingThis.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="FunctionTranslator.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java">
<provider selected="true" editor-type-id="text-editor">
<state line="25" column="49" selection-start="851" selection-end="851" vertical-scroll-proportion="0.0">
<state line="11" column="32" selection-start="230" selection-end="230" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -338,16 +278,25 @@
<file leaf-file-name="PropertyAccessTranslator.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java">
<provider selected="true" editor-type-id="text-editor">
<state line="27" column="19" selection-start="1307" selection-end="1307" vertical-scroll-proportion="0.0">
<state line="95" column="0" selection-start="4046" selection-end="4046" vertical-scroll-proportion="-8.576923">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Translation.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/Translation.java">
<file leaf-file-name="AbstractTranslator.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/AbstractTranslator.java">
<provider selected="true" editor-type-id="text-editor">
<state line="30" column="35" selection-start="1506" selection-end="1506" vertical-scroll-proportion="0.0">
<state line="24" column="0" selection-start="544" selection-end="544" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ReferenceTranslator.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java">
<provider selected="true" editor-type-id="text-editor">
<state line="35" column="0" selection-start="1383" selection-end="1383" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -356,16 +305,43 @@
<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/general/TranslationContext.java">
<provider selected="true" editor-type-id="text-editor">
<state line="194" column="18" selection-start="7031" selection-end="7031" vertical-scroll-proportion="0.0">
<state line="46" column="78" selection-start="1833" selection-end="1833" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="JetDeclarationWithBody.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclarationWithBody.java">
<file leaf-file-name="FunctionTranslator.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java">
<provider selected="true" editor-type-id="text-editor">
<state line="11" column="17" selection-start="228" selection-end="228" vertical-scroll-proportion="0.0">
<state line="49" column="0" selection-start="1828" selection-end="1828" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ExpressionVisitor.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java">
<provider selected="true" editor-type-id="text-editor">
<state line="383" column="45" selection-start="16793" selection-end="16793" vertical-scroll-proportion="-19.923077">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ReferenceProvider.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceProvider.java">
<provider selected="true" editor-type-id="text-editor">
<state line="32" column="0" selection-start="1342" selection-end="1342" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="kotlin_lib.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/testFiles/kotlin_lib.js">
<provider selected="true" editor-type-id="text-editor">
<state line="56" column="43" selection-start="1368" selection-end="1368" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -392,22 +368,22 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
<option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ConditionalTest.java" />
<option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ExampleTestSuite.java" />
<option value="$PROJECT_DIR$/../../Kotlin/jet/compiler/tests/org/jetbrains/jet/JetLiteFixture.java" />
<option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/examples/ExampleTestSuite.java" />
<option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/jetTests/JetTestCaseBuilder.java" />
<option value="$PROJECT_DIR$/examples/test/JetTestCaseBuilder.java" />
<option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/TranslationTest.java" />
<option value="$PROJECT_DIR$/examples/test/ExampleTestSuite.java" />
<option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/KotlinLibTest.java" />
<option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ExampleTest.java" />
<option value="$PROJECT_DIR$/translator/testFiles/examples/cases/newInstanceDefaultConstructor.jet" />
<option value="$PROJECT_DIR$/translator/testFiles/examples/cases/simpleClass.jet" />
<option value="$PROJECT_DIR$/translator/testFiles/examples/cases/kt245.jet" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/Translation.java" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/WhenTranslator.java" />
<option value="$PROJECT_DIR$/translator/testFiles/patternMatching/cases/whenConditionPropertyAccess.kt" />
<option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/PatternMatchingTest.java" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java" />
<option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/KotlinLibTest.java" />
<option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/JavascriptTest.java" />
<option value="$PROJECT_DIR$/translator/testFiles/javascript/cases/enclosingThis.js" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceProvider.java" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/TranslationContext.java" />
<option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ExampleTest.java" />
</list>
</option>
</component>
@@ -529,112 +505,6 @@
<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="sortedTests" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="usesJava" />
<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="sortedTests" />
<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="sortedTests" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="unexpectedError" />
<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="sortedTests" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="obscure" />
<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="sortedTests" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="failed" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="k2js" />
@@ -674,10 +544,6 @@
<option name="myItemId" value="examples" />
<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>
@@ -692,38 +558,6 @@
<option name="myItemId" value="test" />
<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" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="js" />
<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="js" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="compiler" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -751,6 +585,7 @@
</PATH>
</subPane>
</pane>
<pane id="Scope" />
<pane id="PackagesPane">
<subPane>
<PATH>
@@ -765,7 +600,6 @@
</PATH>
</subPane>
</pane>
<pane id="Scope" />
<pane id="Favorites" />
</panes>
</component>
@@ -784,9 +618,9 @@
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="MemberChooser.showClasses" value="true" />
<property name="GoToClass.includeLibraries" value="false" />
<property name="dynamic.classpath" value="false" />
<property name="options.splitter.details.proportions" value="0.2" />
<property name="options.searchVisible" value="true" />
<property name="options.splitter.details.proportions" value="0.2" />
<property name="dynamic.classpath" value="false" />
</component>
<component name="RecentsManager">
<key name="CopyClassDialog.RECENTS_KEY">
@@ -794,83 +628,17 @@
<recent name="org.jetbrains.k2js.backend" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\javascript\cases" />
<recent name="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\js\cases" />
<recent name="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\examples\cases" />
<recent name="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\examples" />
<recent name="C:\Dev\Projects\jet-contrib\k2js\translator\lib" />
<recent name="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles" />
<recent name="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\trait\cases" />
</key>
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
<recent name="org.jetbrains.k2js.test.examples" />
</key>
</component>
<component name="RunManager" selected="JUnit.ExampleTestSuite">
<configuration default="false" name="ClassInheritanceTest.initializersOfBasicClassExecute" 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" value="" />
<option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
<option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.ClassInheritanceTest" />
<option name="METHOD_NAME" value="initializersOfBasicClassExecute" />
<option name="TEST_OBJECT" value="method" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/translator" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="moduleWithDependencies" />
</option>
<envs />
<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>
<configuration default="false" name="BasicClassTest.classWithoutNamespace" 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" value="" />
<option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
<option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.BasicClassTest" />
<option name="METHOD_NAME" value="classWithoutNamespace" />
<option name="TEST_OBJECT" value="method" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/translator" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="moduleWithDependencies" />
</option>
<envs />
<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>
<component name="RunManager" selected="JUnit.All in jetTests">
<configuration default="false" name="ExampleTestSuite" type="JUnit" factoryName="JUnit" temporary="true">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="jetTests" />
@@ -957,6 +725,68 @@
<ConfigurationWrapper RunnerId="Run" />
<method />
</configuration>
<configuration default="false" name="ExampleTest.enclosingThis" type="JUnit" factoryName="JUnit" temporary="true">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true">
<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.ExampleTest" />
<option name="METHOD_NAME" value="enclosingThis" />
<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="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="JavascriptTest.enclosingThis" type="JUnit" factoryName="JUnit" temporary="true">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true">
<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.JavascriptTest" />
<option name="METHOD_NAME" value="enclosingThis" />
<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="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
@@ -1015,17 +845,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" />
<module name="" />
@@ -1052,12 +871,23 @@
<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>
<list size="5">
<item index="0" class="java.lang.String" itemvalue="JUnit.ClassInheritanceTest.initializersOfBasicClassExecute" />
<item index="1" class="java.lang.String" itemvalue="JUnit.BasicClassTest.classWithoutNamespace" />
<item index="2" class="java.lang.String" itemvalue="JUnit.ExampleTestSuite" />
<item index="3" class="java.lang.String" itemvalue="JUnit.QuickJetPsiCheckerTest" />
<item index="4" class="java.lang.String" itemvalue="JUnit.All in jetTests" />
<item index="0" class="java.lang.String" itemvalue="JUnit.ExampleTestSuite" />
<item index="1" class="java.lang.String" itemvalue="JUnit.QuickJetPsiCheckerTest" />
<item index="2" class="java.lang.String" itemvalue="JUnit.All in jetTests" />
<item index="3" class="java.lang.String" itemvalue="JUnit.ExampleTest.enclosingThis" />
<item index="4" class="java.lang.String" itemvalue="JUnit.JavascriptTest.enclosingThis" />
</list>
<configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
<Host>localhost</Host>
@@ -1130,8 +960,8 @@
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32977018" sideWeight="0.728146" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3997862" sideWeight="0.6705998" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26296097" sideWeight="0.7319885" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26801154" sideWeight="0.64190274" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2624265" sideWeight="0.7329491" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26705092" sideWeight="0.64190274" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Metrics" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3275862" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
@@ -1175,7 +1005,7 @@
<option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
<option name="CREATE_PATCH_EXPAND_DETAILS_DEFAULT" value="true" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
<option name="LAST_COMMIT_MESSAGE" value="Added array basic class." />
<option name="LAST_COMMIT_MESSAGE" value="Added and sorted tests from jet repository. Fixed a bug with custom setter." />
<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" />
@@ -1188,7 +1018,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="Finished work on namespaces." />
<MESSAGE value="Fixed design flaw which prevented base class from being inherited if it was defined after the derived class." />
<MESSAGE value="Added test. Refactored test code: got rid of obsolete IncludeLibraryTest class." />
<MESSAGE value="Operator overloading: simple cases with ++ and --." />
@@ -1213,6 +1042,7 @@
<MESSAGE value="Corrected class declaration logic." />
<MESSAGE value="Supported single file without namespace." />
<MESSAGE value="Added array basic class." />
<MESSAGE value="Added and sorted tests from jet repository. Fixed a bug with custom setter." />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
@@ -1222,116 +1052,118 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/examples/test/JetTestCaseBuilder.java">
<entry file="file://$PROJECT_DIR$/translator/testFiles/examples/cases/enclosingThis.jet">
<provider selected="true" editor-type-id="text-editor">
<state line="41" column="0" selection-start="1564" selection-end="1564" vertical-scroll-proportion="0.0">
<state line="9" column="18" selection-start="248" selection-end="249" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/WhenTranslator.java">
<provider selected="true" editor-type-id="text-editor">
<state line="135" column="0" selection-start="5032" selection-end="5032" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/KotlinLibTest.java">
<provider selected="true" editor-type-id="text-editor">
<state line="82" column="0" selection-start="2899" selection-end="3123" vertical-scroll-proportion="0.0">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertyAccessorDescriptor.java">
<entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/JavascriptTest.java">
<provider selected="true" editor-type-id="text-editor">
<state line="15" column="105" selection-start="540" selection-end="540" vertical-scroll-proportion="0.0">
<state line="21" column="21" selection-start="480" selection-end="480" vertical-scroll-proportion="0.0">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/testFiles/javascript/cases/enclosingThis.js">
<provider selected="true" editor-type-id="text-editor">
<state line="14" column="52" selection-start="350" selection-end="350" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/testFiles/sortedTests/obscure/inheritedMethod.jet">
<entry file="file://$PROJECT_DIR$/translator/testFiles/kotlin_lib.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">
<state line="56" column="43" selection-start="1368" selection-end="1368" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPropertyAccessor.java">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java">
<provider selected="true" editor-type-id="text-editor">
<state line="15" column="70" selection-start="421" selection-end="421" vertical-scroll-proportion="0.0">
<state line="383" column="45" selection-start="16793" selection-end="16793" vertical-scroll-proportion="-19.923077">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/testFiles/sortedTests/unexpectedError/exceptionConstructor.jet">
<entry file="file://$PROJECT_DIR$/translator/testFiles/examples/out/enclosingThis.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">
<state line="11" column="32" selection-start="230" selection-end="230" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptor.java">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/AbstractTranslator.java">
<provider selected="true" editor-type-id="text-editor">
<state line="10" column="17" selection-start="209" selection-end="209" vertical-scroll-proportion="0.0">
<state line="24" column="0" selection-start="544" selection-end="544" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/testFiles/sortedTests/failed/enclosingThis.jet">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceProvider.java">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<state line="32" column="0" selection-start="1342" selection-end="1342" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/traitproperty.jet">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<state line="95" column="0" selection-start="4046" selection-end="4046" vertical-scroll-proportion="-8.576923">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/testFiles/examples/cases/propertyDelegation.jet">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java">
<provider selected="true" editor-type-id="text-editor">
<state line="16" column="18" selection-start="301" selection-end="301" vertical-scroll-proportion="0.0">
<state line="49" column="0" selection-start="1828" selection-end="1828" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/testFiles/sortedTests/usesJava/inheritingFromArrayList.jet">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<state line="35" column="0" selection-start="1383" selection-end="1383" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/testFiles/examples/cases/initializerBlock.jet">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/TranslationContext.java">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<state line="46" column="78" selection-start="1833" selection-end="1833" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/testFiles/examples/cases/closureWithParameterAndBoxing.jet">
<entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/PatternMatchingTest.java">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<state line="44" column="55" selection-start="1013" selection-end="1013" vertical-scroll-proportion="0.5206738">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/propertyInInitializer.jet">
<entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ExampleTest.java">
<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/testFiles/examples/cases/newInstanceDefaultConstructor.jet">
<provider selected="true" editor-type-id="text-editor">
<state line="9" column="15" selection-start="149" selection-end="149" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/testFiles/examples/cases/simplestClosure.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/testFiles/examples/out/newInstanceDefaultConstructor.js">
<provider selected="true" editor-type-id="text-editor">
<state line="16" column="36" selection-start="356" selection-end="356" vertical-scroll-proportion="0.40902257">
<state line="18" column="5" selection-start="415" selection-end="415" vertical-scroll-proportion="0.42857143">
<folding />
</state>
</provider>
translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java
+3
View File
@@ -380,6 +380,9 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
@NotNull
public JsNode visitThisExpression(@NotNull JetThisExpression expression,
@NotNull TranslationContext context) {
if (context.hasAliasForThis()) {
return context.getAliasForThis();
}
return new JsThisRef();
}
translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java
+8 -2
View File
@@ -42,9 +42,15 @@ public final class FunctionTranslator extends AbstractTranslator {
return new JsPropertyInitializer(functionName.makeRef(), function);
}
//TODO: consider refactoring
@NotNull
public JsFunction translateAsLiteral() {
return generateFunctionObject();
public JsExpression translateAsLiteral() {
JsName aliasForThis = context().enclosingScope().declareName("that");
context().setAliasForThis(aliasForThis);
JsFunction function = generateFunctionObject();
context().removeAliasForThis();
JsExpression assignThatToThis = AstUtil.newAssignment(aliasForThis.makeRef(), new JsThisRef());
return AstUtil.newSequence(assignThatToThis, function);
}
@NotNull
translator/src/org/jetbrains/k2js/translate/expression/WhenTranslator.java
-19
View File
@@ -140,33 +140,14 @@ public class WhenTranslator extends AbstractTranslator {
if (condition instanceof JetWhenConditionIsPattern) {
return translatePatternCondition((JetWhenConditionIsPattern) condition);
}
if (condition instanceof JetWhenConditionCall) {
return translateCallCondition((JetWhenConditionCall) condition);
}
throw new AssertionError("Unsupported when condition " + condition.getClass());
}
@NotNull
private JsExpression translateCallCondition(@NotNull JetWhenConditionCall condition) {
JsExpression suffixExpression =
Translation.translateAsExpression(getSuffixExpression(condition), context());
AstUtil.setQualifier(suffixExpression, expressionToMatch);
return AstUtil.equalsTrue(suffixExpression, context().program());
}
@NotNull
private JetExpression getSuffixExpression(@NotNull JetWhenConditionCall condition) {
JetExpression suffixExpression = condition.getCallSuffixExpression();
assert suffixExpression != null : "When call condition should have suffix expression";
return suffixExpression;
}
@NotNull
private JsBlock addDummyBreak(@NotNull JsStatement statement) {
return AstUtil.newBlock(statement, new JsBreak());
}
@NotNull
private JsExpression translatePatternCondition(@NotNull JetWhenConditionIsPattern condition) {
JsExpression patternMatchExpression = Translation.patternTranslator(context()).
translator/src/org/jetbrains/k2js/translate/general/TranslationContext.java
+33 -6
View File
@@ -22,6 +22,7 @@ import java.util.Map;
public final class TranslationContext {
// TODO: extract different parts of this classes into separate classes
private static class Scopes {
public Scopes(@NotNull JsScope enclosingScope, @NotNull JsScope functionScope, @NotNull JsScope namespaceScope) {
this.enclosingScope = enclosingScope;
@@ -43,7 +44,7 @@ public final class TranslationContext {
JsScope rootScope = program.getRootScope();
Scopes scopes = new Scopes(rootScope, rootScope, rootScope);
return new TranslationContext(null, program, bindingContext,
scopes, extractor, new HashMap<JetDeclaration, JsName>());
scopes, extractor, new HashMap<JetDeclaration, JsName>(), null);
}
@NotNull
@@ -58,17 +59,21 @@ public final class TranslationContext {
private final Declarations declarations;
@NotNull
private final Map<JetDeclaration, JsName> aliases;
@Nullable
private JsName aliasForThis;
private TranslationContext(@Nullable JsName namespaceName, @NotNull JsProgram program,
@NotNull BindingContext bindingContext, @NotNull Scopes scopes,
@NotNull Declarations declarations, @NotNull Map<JetDeclaration, JsName> aliases) {
@NotNull Declarations declarations, @NotNull Map<JetDeclaration, JsName> aliases,
@Nullable JsName aliasForThis) {
this.program = program;
this.bindingContext = bindingContext;
this.namespaceName = namespaceName;
this.scopes = scopes;
this.declarations = declarations;
this.aliases = aliases;
this.aliasForThis = aliasForThis;
}
@NotNull
@@ -81,7 +86,8 @@ public final class TranslationContext {
JsScope namespaceScope = declarations.getScope(descriptor);
JsName namespaceName = getNameForDescriptor(descriptor);
Scopes newScopes = new Scopes(namespaceScope, namespaceScope, namespaceScope);
return new TranslationContext(namespaceName, program, bindingContext, newScopes, declarations, aliases);
return new TranslationContext(namespaceName, program, bindingContext, newScopes,
declarations, aliases, aliasForThis);
}
@NotNull
@@ -93,7 +99,8 @@ public final class TranslationContext {
public TranslationContext newClass(@NotNull ClassDescriptor descriptor) {
JsScope classScope = declarations.getScope(descriptor);
Scopes newScopes = new Scopes(classScope, classScope, scopes.namespaceScope);
return new TranslationContext(namespaceName, program, bindingContext, newScopes, declarations, aliases);
return new TranslationContext(namespaceName, program, bindingContext,
newScopes, declarations, aliases, aliasForThis);
}
@NotNull
@@ -115,7 +122,8 @@ public final class TranslationContext {
public TranslationContext newFunctionDeclaration(@NotNull FunctionDescriptor descriptor) {
JsScope functionScope = declarations.getScope(descriptor);
Scopes newScopes = new Scopes(functionScope, scopes.classScope, scopes.namespaceScope);
return new TranslationContext(namespaceName, program, bindingContext, newScopes, declarations, aliases);
return new TranslationContext(namespaceName, program, bindingContext,
newScopes, declarations, aliases, aliasForThis);
}
// @NotNull TranslationContext newAliases(Map<JetDeclaration, JsName> newAliases) {
@@ -128,7 +136,8 @@ public final class TranslationContext {
@NotNull
public TranslationContext newEnclosingScope(@NotNull JsScope enclosingScope) {
Scopes newScopes = new Scopes(enclosingScope, scopes.classScope, scopes.namespaceScope);
return new TranslationContext(namespaceName, program, bindingContext, newScopes, declarations, aliases);
return new TranslationContext(namespaceName, program, bindingContext,
newScopes, declarations, aliases, aliasForThis);
}
@@ -204,6 +213,24 @@ public final class TranslationContext {
return descriptor;
}
@NotNull
public JsNameRef getAliasForThis() {
assert aliasForThis != null : "Alias is null. Use hasAliasForThis function to check.";
return aliasForThis.makeRef();
}
public void setAliasForThis(@NotNull JsName alias) {
aliasForThis = alias;
}
public void removeAliasForThis() {
aliasForThis = null;
}
public boolean hasAliasForThis() {
return (aliasForThis != null);
}
public boolean isDeclared(@NotNull DeclarationDescriptor descriptor) {
return declarations.isDeclared(descriptor);
}
translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java
+1 -13
View File
@@ -7,7 +7,6 @@ import com.google.dart.compiler.backend.js.ast.JsNameRef;
import com.google.dart.compiler.util.AstUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
import org.jetbrains.jet.lang.descriptors.PropertyGetterDescriptor;
import org.jetbrains.jet.lang.descriptors.PropertySetterDescriptor;
@@ -15,7 +14,6 @@ import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.psi.JetQualifiedExpression;
import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
import org.jetbrains.jet.lang.resolve.calls.ResolvedCall;
import org.jetbrains.k2js.translate.general.AbstractTranslator;
import org.jetbrains.k2js.translate.general.Translation;
import org.jetbrains.k2js.translate.general.TranslationContext;
@@ -169,7 +167,6 @@ public final class PropertyAccessTranslator extends AbstractTranslator {
return context().getNameForDescriptor(getter);
}
@NotNull
private JsName getNotNullSetterName(@NotNull JetSimpleNameExpression selectorExpression) {
JsName setterName = getNullableSetterName(selectorExpression);
@@ -192,15 +189,6 @@ public final class PropertyAccessTranslator extends AbstractTranslator {
@Nullable
private PropertyDescriptor getPropertyDescriptor(@NotNull JetSimpleNameExpression expression) {
ResolvedCall<?> resolvedCall =
BindingUtils.getResolvedCall(context().bindingContext(), expression);
if (resolvedCall != null) {
DeclarationDescriptor descriptor = resolvedCall.getCandidateDescriptor();
if (descriptor instanceof PropertyDescriptor) {
return (PropertyDescriptor) descriptor;
}
}
return null;
return BindingUtils.getPropertyDescriptorForSimpleName(context().bindingContext(), expression);
}
}
translator/src/org/jetbrains/k2js/translate/reference/ReferenceProvider.java
+10 -1
View File
@@ -48,11 +48,20 @@ public final class ReferenceProvider {
if (requiresNamespaceQualifier) {
return context.getNamespaceQualifiedReference(referencedName);
} else if (requiresThisQualifier) {
return AstUtil.thisQualifiedReference(referencedName);
return thisQualifiedReference();
}
return referencedName.makeRef();
}
private JsNameRef thisQualifiedReference() {
if (!context.hasAliasForThis()) {
return AstUtil.thisQualifiedReference(referencedName);
}
JsNameRef reference = referencedName.makeRef();
AstUtil.setQualifier(reference, context.getAliasForThis());
return reference;
}
private boolean requiresNamespaceQualifier() {
return context.namespaceScope().ownsName(referencedName);
}
translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class ReferenceTranslator extends AbstractTranslator {
@Nullable
private JsNameRef resolveAsAliasReference(@NotNull JetSimpleNameExpression expression) {
//TODO: decide if this code is actual
//TODO: decide if this code is meaningful
DeclarationDescriptor referencedDescriptor =
BindingUtils.getDescriptorForReferenceExpression(context().bindingContext(), expression);
if (referencedDescriptor == null) return null;
translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java
+23
View File
@@ -190,6 +190,29 @@ public final class BindingUtils {
return null;
}
//TODO: refactor
@Nullable
public static PropertyDescriptor getPropertyDescriptorForSimpleName(@NotNull BindingContext context,
@NotNull JetSimpleNameExpression expression) {
ResolvedCall<?> resolvedCall =
BindingUtils.getResolvedCall(context, expression);
if (resolvedCall != null) {
DeclarationDescriptor descriptor = resolvedCall.getCandidateDescriptor();
if (descriptor instanceof PropertyDescriptor) {
return (PropertyDescriptor) descriptor;
}
if (descriptor instanceof VariableAsFunctionDescriptor) {
VariableAsFunctionDescriptor functionVariable = (VariableAsFunctionDescriptor) descriptor;
VariableDescriptor variableDescriptor = functionVariable.getVariableDescriptor();
if (variableDescriptor instanceof PropertyDescriptor) {
return (PropertyDescriptor) variableDescriptor;
}
}
}
return null;
}
@Nullable
static public ResolvedCall<?> getResolvedCall(@NotNull BindingContext context,
@NotNull JetExpression expression) {
translator/test/org/jetbrains/k2js/test/JavascriptTest.java
+24
View File
@@ -0,0 +1,24 @@
package org.jetbrains.k2js.test;
import org.junit.Test;
import java.util.Arrays;
/**
* @author Talanov Pavel
*/
public final class JavascriptTest extends TranslationTest {
final private static String MAIN = "javascript/";
@Override
protected String mainDirectory() {
return MAIN;
}
@Test
public void enclosingThis() throws Exception {
runRhinoTest(Arrays.asList(kotlinLibraryPath(), cases("enclosingThis.js")),
new RhinoFunctionResultChecker("Anonymous", "box", "OK"));
}
}
translator/test/org/jetbrains/k2js/test/KotlinLibTest.java
+2
View File
@@ -36,6 +36,8 @@ public class KotlinLibTest extends TranslationTest {
});
}
//TODO: refactor
@Test
public void classObjectHasCreateMethod() throws Exception {
final Map<String, Class<? extends Scriptable>> propertyToType
translator/test/org/jetbrains/k2js/test/PatternMatchingTest.java
+15 -13
View File
@@ -39,10 +39,11 @@ public final class PatternMatchingTest extends TranslationTest {
testFooBoxIsTrue("whenNotValue.kt");
}
@Test
public void whenValueOrType() throws Exception {
testFooBoxIsTrue("whenValueOrType.kt");
}
//TODO: fails due to analyzing bug
// @Test
// public void whenValueOrType() throws Exception {
// testFooBoxIsTrue("whenValueOrType.kt");
// }
@Test
public void multipleCases() throws Exception {
@@ -54,14 +55,15 @@ public final class PatternMatchingTest extends TranslationTest {
testFooBoxIsTrue("matchNullableType.kt");
}
@Test
public void whenConditionMethodCall() throws Exception {
testFooBoxIsTrue("whenConditionMethodCall.kt");
}
@Test
public void whenConditionPropertyAccess() throws Exception {
testFooBoxIsTrue("whenConditionPropertyAccess.kt");
}
//TODO: tests not actual due to drop of conditionCall feature
// @Test
// public void whenConditionMethodCall() throws Exception {
// testFooBoxIsTrue("whenConditionMethodCall.kt");
// }
//
// @Test
// public void whenConditionPropertyAccess() throws Exception {
// testFooBoxIsTrue("whenConditionPropertyAccess.kt");
// }
}
translator/testFiles/sortedTests/failed/enclosingThis.jet → translator/testFiles/examples/cases/enclosingThis.jet
View File
translator/testFiles/javascript/cases/enclosingThis.js
+30
View File
@@ -0,0 +1,30 @@
{
classes = function () {
var Point = Class.create({initialize:function (x, y) {
this.$x = x;
this.$y = y;
}, get_x:function () {
return this.$x;
}, get_y:function () {
return this.$y;
}, mul:function () {
return (that = this, function (scalar) {
return new Point(that.get_x() * scalar, that.get_y() * scalar);
})
;
}
});
return {Point:Point};
}
();
Anonymous = Namespace.create({initialize:function () {
Anonymous.$m = (new Anonymous.Point(2, 3)).mul();
}, get_m:function () {
return Anonymous.$m;
}, box:function () {
var answer = Anonymous.get_m()(5);
return answer.get_x() === 10 && answer.get_y() === 15 ? 'OK' : 'FAIL';
}
}, classes);
Anonymous.initialize();
}
translator/testFiles/patternMatching/cases/whenConditionMethodCall.kt
-16
View File
@@ -1,16 +0,0 @@
namespace foo
class A() {
fun p() = true
}
fun box() : Boolean {
var a = 0
when(A()) {
.p() => a--
is A? => a++;
is A => a++;
else => a++;
}
return (a == -1)
}
translator/testFiles/patternMatching/cases/whenConditionPropertyAccess.kt
-18
View File
@@ -1,18 +0,0 @@
namespace foo
class A() {
val pp = true
fun p() = true
}
fun box() : Boolean {
var a = 0
when(A()) {
.pp => a -=2
.p() => a--
is A? => a++;
is A => a++;
else => a++;
}
return (a == -2)
}