refactoring call translator
This commit is contained in:
Pavel Talanov
Generated
+182
-132
@@ -16,6 +16,8 @@
|
||||
<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/translate/reference/CallTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.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/PsiUtils.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/PsiUtils.java" />
|
||||
</list>
|
||||
<ignored path="k2js.iws" />
|
||||
<ignored path=".idea/workspace.xml" />
|
||||
@@ -189,25 +191,13 @@
|
||||
<favorites_list name="k2js" />
|
||||
</component>
|
||||
<component name="FileEditorManager">
|
||||
<splitter split-orientation="horizontal" split-proportion="0.46178514">
|
||||
<splitter split-orientation="horizontal" split-proportion="0.44924554">
|
||||
<split-first>
|
||||
<leaf>
|
||||
<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="33" column="12" selection-start="1305" selection-end="1305" vertical-scroll-proportion="0.0">
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#6169#6182#0" expanded="true" />
|
||||
</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="104" column="28" selection-start="4744" selection-end="4744" vertical-scroll-proportion="0.0">
|
||||
<state line="109" column="0" selection-start="5186" selection-end="5186" vertical-scroll-proportion="0.0">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
@@ -258,10 +248,10 @@
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="RangeTest.java" pinned="false" current="true" current-in-tab="true">
|
||||
<file leaf-file-name="RangeTest.java" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/RangeTest.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="17" column="16" selection-start="304" selection-end="304" vertical-scroll-proportion="0.3900135">
|
||||
<state line="17" column="16" selection-start="304" selection-end="304" vertical-scroll-proportion="0.0">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
@@ -270,7 +260,16 @@
|
||||
<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="67" column="16" selection-start="1624" selection-end="1624" vertical-scroll-proportion="0.0">
|
||||
<state line="72" column="16" selection-start="1746" selection-end="1746" vertical-scroll-proportion="0.0">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="KT-921.js" pinned="false" current="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/out/KT-921.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>
|
||||
@@ -289,10 +288,10 @@
|
||||
</split-first>
|
||||
<split-second>
|
||||
<leaf>
|
||||
<file leaf-file-name="KT-921.kt" pinned="false" current="false" current-in-tab="false">
|
||||
<file leaf-file-name="KT-921.kt" pinned="false" current="true" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/cases/KT-921.kt">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="66" column="1" selection-start="1147" selection-end="1147" vertical-scroll-proportion="0.0">
|
||||
<state line="18" column="84" selection-start="288" selection-end="288" vertical-scroll-proportion="0.4390244">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
@@ -316,19 +315,28 @@
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="CallTranslator.java" pinned="false" current="false" current-in-tab="true">
|
||||
<file leaf-file-name="CallTranslator.java" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="163" column="48" selection-start="8734" selection-end="8734" vertical-scroll-proportion="0.8690958">
|
||||
<state line="125" column="41" selection-start="6814" selection-end="6814" vertical-scroll-proportion="0.0">
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#5459#5473#0" expanded="true" />
|
||||
<element signature="e#9985#9999#0" expanded="true" />
|
||||
<element signature="e#5572#5586#0" expanded="true" />
|
||||
<element signature="e#9536#9550#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="PsiUtils.java" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/PsiUtils.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="91" column="11" selection-start="3376" selection-end="3376" vertical-scroll-proportion="0.0">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="ValueParameterDescriptor.java" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ValueParameterDescriptor.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
@@ -347,15 +355,6 @@
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="ClassInitializerTranslator.java" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/ClassInitializerTranslator.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="74" column="60" selection-start="3191" selection-end="3191" vertical-scroll-proportion="0.0">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="JetDelegatorToSuperCall.java" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperCall.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
@@ -407,7 +406,6 @@
|
||||
<component name="IdeDocumentHistory">
|
||||
<option name="changedFiles">
|
||||
<list>
|
||||
<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" />
|
||||
<option value="$PROJECT_DIR$/translator/testFiles/java/arrayList/cases/arrayAccess.kt" />
|
||||
@@ -415,14 +413,15 @@
|
||||
<option value="$PROJECT_DIR$/translator/testFiles/kotlin_lib.js" />
|
||||
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java" />
|
||||
<option value="$PROJECT_DIR$/translator/testFiles/expression/function/cases/implicitItParameter.kt" />
|
||||
<option value="$PROJECT_DIR$/translator/testFiles/expression/function/out/KT-921.js" />
|
||||
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java" />
|
||||
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/ClassInitializerTranslator.java" />
|
||||
<option value="$PROJECT_DIR$/translator/testFiles/expression/function/cases/KT-921.kt" />
|
||||
<option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/FunctionTest.java" />
|
||||
<option value="$PROJECT_DIR$/translator/testFiles/expression/function/cases/defaultParameters.kt" />
|
||||
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java" />
|
||||
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/PsiUtils.java" />
|
||||
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java" />
|
||||
<option value="$PROJECT_DIR$/translator/testFiles/expression/function/cases/KT-921.kt" />
|
||||
<option value="$PROJECT_DIR$/translator/testFiles/expression/function/out/KT-921.js" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
@@ -690,6 +689,58 @@
|
||||
<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="expression" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="function" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="out" />
|
||||
<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="expression" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="function" />
|
||||
<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" />
|
||||
@@ -808,6 +859,7 @@
|
||||
<property name="recentsLimit" value="5" />
|
||||
<property name="MemberChooser.sorted" value="false" />
|
||||
<property name="options.lastSelected" value="fileTemplates" />
|
||||
<property name="last_opened_file_path" value="$USER_HOME$/Desktop" />
|
||||
<property name="project.structure.side.proportion" value="0.2" />
|
||||
<property name="MemberChooser.copyJavadoc" value="false" />
|
||||
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
|
||||
@@ -835,35 +887,7 @@
|
||||
<recent name="org.jetbrains.k2js.test.examples" />
|
||||
</key>
|
||||
</component>
|
||||
<component name="RunManager" selected="JUnit.tests">
|
||||
<configuration default="false" name="ArrayListTest.access" 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="jetTests" />
|
||||
<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.ArrayListTest" />
|
||||
<option name="METHOD_NAME" value="access" />
|
||||
<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>
|
||||
<component name="RunManager" selected="JUnit.FunctionTest.kt921">
|
||||
<configuration default="false" name="FunctionTest.kt921" type="JUnit" factoryName="JUnit" temporary="true">
|
||||
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
|
||||
<pattern>
|
||||
@@ -986,6 +1010,29 @@
|
||||
<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" />
|
||||
@@ -1142,11 +1189,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.ArrayListTest.access" />
|
||||
<item index="3" class="java.lang.String" itemvalue="JUnit.FunctionTest.kt921" />
|
||||
<item index="4" class="java.lang.String" itemvalue="JUnit.FunctionTest.implicitItParameter" />
|
||||
<item index="5" class="java.lang.String" itemvalue="JUnit.ForTest.forIteratesOverArray" />
|
||||
<item index="6" class="java.lang.String" itemvalue="JUnit.FunctionTest.defaultParameters" />
|
||||
<item index="2" class="java.lang.String" itemvalue="JUnit.FunctionTest.kt921" />
|
||||
<item index="3" class="java.lang.String" itemvalue="JUnit.FunctionTest.implicitItParameter" />
|
||||
<item index="4" class="java.lang.String" itemvalue="JUnit.ForTest.forIteratesOverArray" />
|
||||
<item index="5" class="java.lang.String" itemvalue="JUnit.FunctionTest.defaultParameters" />
|
||||
<item index="6" class="java.lang.String" itemvalue="JUnit.All in jetTests" />
|
||||
</list>
|
||||
<configuration name="<template>" type="WebApp" default="true" selected="false">
|
||||
<Host>localhost</Host>
|
||||
@@ -1218,10 +1265,10 @@
|
||||
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22382325" sideWeight="0.41956174" order="9" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32949087" sideWeight="0.49599144" order="6" 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.32756963" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.20363443" sideWeight="0.284342" order="1" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.20363443" sideWeight="0.7588857" 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.7002882" 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="false" weight="0.22073758" sideWeight="0.7588857" order="0" side_tool="false" content_ui="combo" />
|
||||
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22073758" sideWeight="0.7588857" order="0" side_tool="false" content_ui="combo" />
|
||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24111432" sideWeight="0.8530198" order="2" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.0908605" sideWeight="0.7146974" order="2" side_tool="false" content_ui="combo" />
|
||||
<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" />
|
||||
@@ -1266,7 +1313,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="switch to using descriptors on call site default arguments support" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="ongoing refactoring" />
|
||||
<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" />
|
||||
@@ -1279,7 +1326,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="removed accidentally commited files." />
|
||||
<MESSAGE value="very simple try/catch/finally support." />
|
||||
<MESSAGE value="range standard implementation added. tests added." />
|
||||
<MESSAGE value="bug fixes: 1. Range standard implementation size property fixed, iteration order fixed 2. System.println() without parameters fixed." />
|
||||
@@ -1304,6 +1350,7 @@
|
||||
<MESSAGE value="changed tests not to use std lib for now /*all tests pass*/" />
|
||||
<MESSAGE value="switch to using ValueParameterDescriptor instead of JetParameter when translating function declarations implemented support for implicit 'it' parameter added 'clear' function to ArrayList temporary implementation" />
|
||||
<MESSAGE value="switch to using descriptors on call site default arguments support" />
|
||||
<MESSAGE value="ongoing refactoring" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager />
|
||||
@@ -1313,55 +1360,6 @@
|
||||
<option name="FILTER_TARGETS" value="false" />
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/cases/KT-921.kt">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="66" column="1" selection-start="1147" selection-end="1147" vertical-scroll-proportion="0.0">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/out/KT-921.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="78" column="113" selection-start="1966" selection-end="1966" vertical-scroll-proportion="0.0">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="jar://C:/Program Files/Java/jdk1.6.0_29/src.zip!/java/util/Collections.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="2969" column="0" selection-start="115173" selection-end="115173" vertical-scroll-proportion="0.0">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/translator/testFiles/kotlin_lib.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="336" column="6" selection-start="8518" selection-end="8518" vertical-scroll-proportion="0.0">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ValueParameterDescriptor.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="9" column="17" selection-start="221" selection-end="221" vertical-scroll-proportion="0.0">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/FunctionTest.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="67" column="16" selection-start="1624" selection-end="1624" vertical-scroll-proportion="0.0">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="74" column="72" selection-start="3704" selection-end="3704" vertical-scroll-proportion="0.0">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="11" column="13" selection-start="274" selection-end="274" vertical-scroll-proportion="0.0">
|
||||
@@ -1404,27 +1402,79 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java">
|
||||
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/ClassInitializerTranslator.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="163" column="48" selection-start="8734" selection-end="8734" vertical-scroll-proportion="0.8690958">
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#5459#5473#0" expanded="true" />
|
||||
<element signature="e#9985#9999#0" expanded="true" />
|
||||
</folding>
|
||||
<state line="74" column="60" selection-start="3191" selection-end="3191" vertical-scroll-proportion="0.0">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java">
|
||||
<entry file="file://$USER_HOME$/Desktop/ShiftAction.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="104" column="28" selection-start="4744" selection-end="4744" vertical-scroll-proportion="0.0">
|
||||
<state line="154" column="90" selection-start="6837" selection-end="6837" vertical-scroll-proportion="0.7706044">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/PsiUtils.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="91" column="11" selection-start="3376" selection-end="3376" vertical-scroll-proportion="0.0">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="125" column="41" selection-start="6814" selection-end="6814" vertical-scroll-proportion="0.0">
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#5572#5586#0" expanded="true" />
|
||||
<element signature="e#9536#9550#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/RangeTest.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="17" column="16" selection-start="304" selection-end="304" vertical-scroll-proportion="0.3900135">
|
||||
<state line="17" column="16" selection-start="304" selection-end="304" vertical-scroll-proportion="0.0">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="109" column="0" selection-start="5186" selection-end="5186" vertical-scroll-proportion="0.0">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="33" column="12" selection-start="1305" selection-end="1305" vertical-scroll-proportion="0.0">
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#6169#6182#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/FunctionTest.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="72" column="16" selection-start="1746" selection-end="1746" vertical-scroll-proportion="0.0">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/out/KT-921.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>
|
||||
<entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/cases/KT-921.kt">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="18" column="84" selection-start="288" selection-end="288" vertical-scroll-proportion="0.4390244">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
|
||||
@@ -24,8 +24,7 @@ import static com.google.dart.compiler.util.AstUtil.not;
|
||||
import static org.jetbrains.k2js.translate.utils.BindingUtils.*;
|
||||
import static org.jetbrains.k2js.translate.utils.DescriptorUtils.getVariableDescriptorForVariableAsFunction;
|
||||
import static org.jetbrains.k2js.translate.utils.DescriptorUtils.isConstructorDescriptor;
|
||||
import static org.jetbrains.k2js.translate.utils.PsiUtils.isInOrNotInOperation;
|
||||
import static org.jetbrains.k2js.translate.utils.PsiUtils.isNotInOperation;
|
||||
import static org.jetbrains.k2js.translate.utils.PsiUtils.*;
|
||||
import static org.jetbrains.k2js.translate.utils.TranslationUtils.*;
|
||||
|
||||
/**
|
||||
@@ -54,6 +53,7 @@ public final class CallTranslator extends AbstractTranslator {
|
||||
return new CallTranslator(receiver, arguments, (FunctionDescriptor) descriptor, context);
|
||||
}
|
||||
|
||||
//TODO: method too long
|
||||
@NotNull
|
||||
private CallTranslator buildFromBinary(@NotNull JetBinaryExpression binaryExpression,
|
||||
boolean swapReceiverAndArgument) {
|
||||
@@ -119,16 +119,10 @@ public final class CallTranslator extends AbstractTranslator {
|
||||
@NotNull ValueParameterDescriptor parameterDescriptor, @NotNull TranslationContext context) {
|
||||
ResolvedValueArgument actualArgument = formalToActualArguments.get(parameterDescriptor);
|
||||
if (actualArgument instanceof DefaultValueArgument) {
|
||||
assert parameterDescriptor.hasDefaultValue() : "Unsupplied parameter must have default value.";
|
||||
JetParameter psiParameter = getParameterForDescriptor(context.bindingContext(), parameterDescriptor);
|
||||
JetExpression defaultValue = psiParameter.getDefaultValue();
|
||||
assert defaultValue != null : "No default value found in PSI.";
|
||||
return defaultValue;
|
||||
return getDefaultArgument(context.bindingContext(), parameterDescriptor);
|
||||
} else {
|
||||
return getExpressionArgument(actualArgument);
|
||||
}
|
||||
List<JetExpression> argumentExpressions = actualArgument.getArgumentExpressions();
|
||||
assert !argumentExpressions.isEmpty() : "Actual arguments must be supplied.";
|
||||
assert argumentExpressions.size() == 1 : "Varargs not supported.";
|
||||
return argumentExpressions.get(0);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -288,4 +288,14 @@ public final class BindingUtils {
|
||||
return null;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public static JetExpression getDefaultArgument(@NotNull BindingContext context,
|
||||
@NotNull ValueParameterDescriptor parameterDescriptor) {
|
||||
assert parameterDescriptor.hasDefaultValue() : "Unsupplied parameter must have default value.";
|
||||
JetParameter psiParameter = getParameterForDescriptor(context, parameterDescriptor);
|
||||
JetExpression defaultValue = psiParameter.getDefaultValue();
|
||||
assert defaultValue != null : "No default value found in PSI.";
|
||||
return defaultValue;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -4,9 +4,12 @@ import com.intellij.psi.tree.IElementType;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.jetbrains.jet.lang.psi.*;
|
||||
import org.jetbrains.jet.lang.resolve.calls.ResolvedValueArgument;
|
||||
import org.jetbrains.jet.lexer.JetToken;
|
||||
import org.jetbrains.jet.lexer.JetTokens;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author Pavel Talanov
|
||||
*/
|
||||
@@ -84,4 +87,12 @@ public final class PsiUtils {
|
||||
assert loopParameter != null;
|
||||
return loopParameter;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public static JetExpression getExpressionArgument(@NotNull ResolvedValueArgument actualArgument) {
|
||||
List<JetExpression> argumentExpressions = actualArgument.getArgumentExpressions();
|
||||
assert !argumentExpressions.isEmpty() : "Actual arguments must be supplied.";
|
||||
assert argumentExpressions.size() == 1 : "Varargs not supported.";
|
||||
return argumentExpressions.get(0);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user