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

added different configs for idea and test environment

Browse Source
This commit is contained in:
Pavel Talanov
2012-01-28 17:31:34 +04:00
parent d58b2afc8d
commit 337d6eb9e4
12 changed files with 361 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+203 -247
View File
@@ -10,13 +10,22 @@
</component>
<component name="BookmarkManager">
<bookmark url="file://$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/safeCallReturnsNullIfFails.kt" line="3" />
<bookmark url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java" line="86" />
<bookmark url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java" line="155" mnemonic="2" />
</component>
<component name="ChangeListManager">
<list default="true" id="f02ef53d-47a4-4f5e-a1aa-3df68aae9b20" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/Config.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/IDEAConfig.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/TestConfig.java" />
<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$/jslib/src/core/javautil.kt" afterPath="$PROJECT_DIR$/jslib/src/core/javautil.kt" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jslib/src/jquery/common.kt" afterPath="$PROJECT_DIR$/jslib/src/jquery/common.kt" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/Analyzer.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/Analyzer.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslatorApplet.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslatorApplet.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/utils/JetFileUtils.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/utils/JetFileUtils.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" />
</list>
<ignored path="k2js.iws" />
<ignored path=".idea/workspace.xml" />
@@ -36,10 +45,10 @@
<SUITE FILE_PATH="coverage/k2js$All_in_translator.ic" NAME="All in translator Coverage Results" MODIFIED="1322842646613" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
<FILTER>org.jetbrains.k2js.translate.*</FILTER>
</SUITE>
<SUITE FILE_PATH="coverage/k2js$WebDemoExamples1Test_isCheck.ic" NAME="WebDemoExamples1Test.isCheck Coverage Results" MODIFIED="1326900366996" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
<SUITE FILE_PATH="coverage/k2js$tests.ic" NAME="tests Coverage Results" MODIFIED="1323868123819" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
<FILTER>org.jetbrains.k2js.*</FILTER>
</SUITE>
<SUITE FILE_PATH="coverage/k2js$tests.ic" NAME="tests Coverage Results" MODIFIED="1323868123819" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
<SUITE FILE_PATH="coverage/k2js$WebDemoExamples1Test_isCheck.ic" NAME="WebDemoExamples1Test.isCheck Coverage Results" MODIFIED="1326900366996" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
<FILTER>org.jetbrains.k2js.*</FILTER>
</SUITE>
<SUITE FILE_PATH="coverage/k2js$OperationTest_assign.ic" NAME="OperationTest.assign Coverage Results" MODIFIED="1326894346349" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
@@ -217,19 +226,6 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
<breakpoint url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/utils/JetFileUtils.java" line="68" class="org.jetbrains.k2js.utils.JetFileUtils" package="org.jetbrains.k2js.utils">
<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="false" />
<option name="CLASS_FILTERS_ENABLED" value="false" />
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
</line_breakpoints>
<breakpoint_any>
<breakpoint>
@@ -278,8 +274,8 @@
<property name="field_breakpoints_groupByClasses" value="true" />
<property name="method_breakpoints_groupByClasses" value="true" />
<property name="exception_breakpoints_viewId" value="TABLE" />
<property name="exception_breakpoints_groupByClasses" value="true" />
<property name="field_breakpoints_viewId" value="TABLE" />
<property name="exception_breakpoints_groupByClasses" value="true" />
<property name="method_breakpoints_groupByMethods" value="false" />
</ui_properties>
</component>
@@ -287,7 +283,7 @@
<favorites_list name="k2js" />
</component>
<component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.27184466">
<splitter split-orientation="horizontal" split-proportion="0.46606094">
<split-first>
<leaf>
<file leaf-file-name="common.kt" pinned="false" current="false" current-in-tab="false">
@@ -299,10 +295,10 @@
</provider>
</entry>
</file>
<file leaf-file-name="Analyzer.java" pinned="false" current="false" current-in-tab="false">
<file leaf-file-name="Analyzer.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/Analyzer.java">
<provider selected="true" editor-type-id="text-editor">
<state line="23" column="19" selection-start="787" selection-end="787" vertical-scroll-proportion="0.0">
<state line="43" column="78" selection-start="1650" selection-end="1650" vertical-scroll-proportion="0.8982387">
<folding />
</state>
</provider>
@@ -311,19 +307,17 @@
<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="890" column="44" selection-start="25843" selection-end="25843" vertical-scroll-proportion="-15.0">
<state line="890" column="44" selection-start="25843" selection-end="25843" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="jQuery.js" pinned="false" current="false" current-in-tab="true">
<file leaf-file-name="jQuery.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/testFiles/libImplementations/jQuery.js">
<provider selected="true" editor-type-id="text-editor">
<state line="2975" column="57" selection-start="80542" selection-end="80546" vertical-scroll-proportion="0.36754176">
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
<state line="1875" column="17" selection-start="51382" selection-end="51382" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
@@ -386,57 +380,88 @@
</split-first>
<split-second>
<leaf>
<file leaf-file-name="CallTranslator.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java">
<file leaf-file-name="JetFileUtils.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/utils/JetFileUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state line="37" column="56" selection-start="1682" selection-end="1682" vertical-scroll-proportion="0.35687023">
<state line="58" column="82" selection-start="2120" selection-end="2120" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Config.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/Config.java">
<provider selected="true" editor-type-id="text-editor">
<state line="9" column="0" selection-start="176" selection-end="176" vertical-scroll-proportion="0.0">
<folding>
<element signature="e#12788#12833#0" expanded="true" />
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="extensionFunctionOnExpression.kt" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/testFiles/extensionFunction/cases/extensionFunctionOnExpression.kt">
<file leaf-file-name="IDEAConfig.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/IDEAConfig.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="13" column="11" selection-start="261" selection-end="261" vertical-scroll-proportion="0.0">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="TestConfig.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/TestConfig.java">
<provider selected="true" editor-type-id="text-editor">
<state line="11" column="19" selection-start="306" selection-end="306" vertical-scroll-proportion="0.0">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="K2JSTranslator.java" pinned="false" current="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java">
<provider selected="true" editor-type-id="text-editor">
<state line="31" column="0" selection-start="938" selection-end="938" vertical-scroll-proportion="-2.5038168">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="extensionInsideFunctionLiteral.kt" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/testFiles/extensionFunction/cases/extensionInsideFunctionLiteral.kt">
<file leaf-file-name="CodeGenerator.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/generate/CodeGenerator.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="16" column="4" selection-start="459" selection-end="459" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="extensionLiteralPassedToFunction.kt" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/testFiles/extensionFunction/cases/extensionLiteralPassedToFunction.kt">
<file leaf-file-name="K2JSTranslatorApplet.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslatorApplet.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="38" column="51" selection-start="1190" selection-end="1190" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="extensionLiteralPassedToFunction.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/testFiles/extensionFunction/out/extensionLiteralPassedToFunction.js">
<file leaf-file-name="TranslationTest.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/TranslationTest.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="94" column="25" selection-start="3080" selection-end="3080" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="extensionInsideFunctionLiteral.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/testFiles/extensionFunction/out/extensionInsideFunctionLiteral.js">
<file leaf-file-name="StandardClasses.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/StandardClasses.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="24" column="44" selection-start="683" selection-end="683" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -451,33 +476,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="AstUtil.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/src/com/google/dart/compiler/util/AstUtil.java">
<provider selected="true" editor-type-id="text-editor">
<state line="293" column="23" selection-start="10232" selection-end="10232" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ExtensionFunctionTest.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ExtensionFunctionTest.java">
<provider selected="true" editor-type-id="text-editor">
<state line="51" column="16" selection-start="1275" selection-end="1275" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="b.kt" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/testFiles/multiFile/cases/functionsVisibleFromOtherFile/b.kt">
<provider selected="true" editor-type-id="text-editor">
<state line="2" column="21" selection-start="34" selection-end="34" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</split-second>
</splitter>
@@ -503,22 +501,22 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
<option value="$PROJECT_DIR$/translator/testFiles/examples/cases/jquery.kt" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java" />
<option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/StdlibTest.java" />
<option value="$PROJECT_DIR$/translator/testFiles/expression/misc/cases/jquery.kt" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java" />
<option value="$PROJECT_DIR$/translator/testFiles/expression/misc/out/jquery.js" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/Analyzer.java" />
<option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/MiscTest.java" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java" />
<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/src/org/jetbrains/k2js/utils/JetFileUtils.java" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java" />
<option value="$PROJECT_DIR$/translator/testFiles/extensionFunction/out/extensionLiteralPassedToFunction.js" />
<option value="$PROJECT_DIR$/translator/testFiles/extensionFunction/out/extensionInsideFunctionLiteral.js" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/Config.java" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/IDEAConfig.java" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/TestConfig.java" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/Analyzer.java" />
<option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/TranslationTest.java" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/utils/JetFileUtils.java" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/generate/CodeGenerator.java" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslatorApplet.java" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java" />
</list>
</option>
</component>
@@ -733,6 +731,16 @@
</PATH>
</subPane>
</pane>
<pane id="PackagesPane">
<subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="k2js" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -840,6 +848,10 @@
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="k2js" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -865,62 +877,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="jslib" />
<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="jslib" />
<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="jquery" />
<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="jslib" />
<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="core" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="PackagesPane">
<subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="k2js" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Favorites" />
@@ -942,9 +898,9 @@
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="MemberChooser.showClasses" value="true" />
<property name="GoToClass.includeLibraries" value="false" />
<property name="options.searchVisible" value="true" />
<property name="options.splitter.details.proportions" value="0.2" />
<property name="dynamic.classpath" value="false" />
<property name="options.splitter.details.proportions" value="0.2" />
<property name="options.searchVisible" value="true" />
</component>
<component name="RecentsManager">
<key name="CopyClassDialog.RECENTS_KEY">
@@ -1168,17 +1124,6 @@
<option name="Maven.BeforeRunTask" enabled="false" />
</method>
</configuration>
<configuration default="true" type="JavascriptDebugSession" factoryName="Local">
<JSDebuggerConfigurationSettings>
<option name="engineId" value="embedded" />
<option name="fileUrl" />
</JSDebuggerConfigurationSettings>
<method>
<option name="AntTarget" enabled="false" />
<option name="BuildArtifacts" enabled="false" />
<option name="Maven.BeforeRunTask" enabled="false" />
</method>
</configuration>
<configuration default="true" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="" />
@@ -1205,6 +1150,17 @@
<option name="Maven.BeforeRunTask" enabled="false" />
</method>
</configuration>
<configuration default="true" type="JavascriptDebugSession" factoryName="Local">
<JSDebuggerConfigurationSettings>
<option name="engineId" value="embedded" />
<option name="fileUrl" />
</JSDebuggerConfigurationSettings>
<method>
<option name="AntTarget" enabled="false" />
<option name="BuildArtifacts" enabled="false" />
<option name="Maven.BeforeRunTask" enabled="false" />
</method>
</configuration>
<configuration default="false" name="Applet" type="Applet" factoryName="Applet">
<module name="translator" />
<option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.K2JSTranslatorApplet" />
@@ -1382,7 +1338,7 @@
<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.6570605" 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.22928914" sideWeight="0.55043226" 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="false" weight="0.22928914" sideWeight="0.55043226" 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.44956774" sideWeight="0.8530198" order="2" side_tool="false" content_ui="tabs" />
<window_info id="CodeWindow" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" 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" />
@@ -1430,7 +1386,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="reimplemented extension literal definition and calls to comply with jquery conventions" />
<option name="LAST_COMMIT_MESSAGE" value="refactor changes" />
<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" />
@@ -1443,7 +1399,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="Migrated to new main project code.&#10;Added test for named arguments.&#10;Minor refactoring changes." />
<MESSAGE value="Fixed bug where standard methods names may become obfuscated." />
<MESSAGE value="fixed arrayList tests." />
<MESSAGE value="KT-962: Function is called two times &#10;safecall expression now compute receiver only once." />
@@ -1468,6 +1423,7 @@
<MESSAGE value="add jslib module which has the declarations which are use by js-backend&#10;rework dependncies of modules" />
<MESSAGE value="changes to make action work" />
<MESSAGE value="reimplemented extension literal definition and calls to comply with jquery conventions" />
<MESSAGE value="refactor changes" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
@@ -1477,94 +1433,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/jet/Ranges.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$/js/src/com/google/dart/compiler/util/AstUtil.java">
<provider selected="true" editor-type-id="text-editor">
<state line="293" column="23" selection-start="10232" selection-end="10232" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java">
<provider selected="true" editor-type-id="text-editor">
<state line="90" column="45" selection-start="3628" selection-end="3628" 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="96" column="24" selection-start="3019" selection-end="3019" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/testFiles/extensionFunction/cases/extensionFunctionOnExpression.kt">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/utils/JetFileUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state line="24" column="39" selection-start="783" selection-end="783" vertical-scroll-proportion="0.0">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/cli/src/org/jetbrains/jet/compiler/JetCoreEnvironment.java">
<provider selected="true" editor-type-id="text-editor">
<state line="12" column="55" selection-start="401" selection-end="401" 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="190" column="34" selection-start="7954" selection-end="7954" vertical-scroll-proportion="-12.307693">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/src/com/google/dart/compiler/backend/js/ast/JsInvocation.java">
<provider selected="true" editor-type-id="text-editor">
<state line="18" column="11" selection-start="594" selection-end="594" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ExtensionFunctionTest.java">
<provider selected="true" editor-type-id="text-editor">
<state line="51" column="16" selection-start="1275" selection-end="1275" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/testFiles/extensionFunction/out/extensionLiteralPassedToFunction.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$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptor.java">
<provider selected="true" editor-type-id="text-editor">
<state line="10" column="26" selection-start="218" selection-end="218" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/testFiles/extensionFunction/cases/extensionLiteralPassedToFunction.kt">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
@@ -1572,7 +1440,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/testFiles/extensionFunction/cases/extensionInsideFunctionLiteral.kt">
<entry file="file://$PROJECT_DIR$/translator/testFiles/extensionFunction/out/extensionLiteralPassedToFunction.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 />
@@ -1586,15 +1454,103 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java">
<entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ExtensionFunctionTest.java">
<provider selected="true" editor-type-id="text-editor">
<state line="37" column="56" selection-start="1682" selection-end="1682" vertical-scroll-proportion="0.35687023">
<state line="51" column="16" selection-start="1275" selection-end="1275" 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="24" column="44" selection-start="683" selection-end="683" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/Config.java">
<provider selected="true" editor-type-id="text-editor">
<state line="9" column="0" selection-start="176" selection-end="176" vertical-scroll-proportion="0.0">
<folding>
<element signature="e#12788#12833#0" expanded="true" />
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/TestConfig.java">
<provider selected="true" editor-type-id="text-editor">
<state line="11" column="19" selection-start="306" selection-end="306" vertical-scroll-proportion="0.0">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/IDEAConfig.java">
<provider selected="true" editor-type-id="text-editor">
<state line="13" column="11" selection-start="261" selection-end="261" vertical-scroll-proportion="0.0">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/testFiles/libImplementations/jQuery.js">
<provider selected="true" editor-type-id="text-editor">
<state line="1875" column="17" selection-start="51382" selection-end="51382" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/src/com/google/dart/compiler/backend/js/ast/JsInvocation.java">
<provider selected="true" editor-type-id="text-editor">
<state line="18" column="11" selection-start="594" selection-end="594" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/TranslationTest.java">
<provider selected="true" editor-type-id="text-editor">
<state line="94" column="25" selection-start="3080" selection-end="3080" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/utils/JetFileUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state line="58" column="82" selection-start="2120" selection-end="2120" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/generate/CodeGenerator.java">
<provider selected="true" editor-type-id="text-editor">
<state line="16" column="4" selection-start="459" selection-end="459" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslatorApplet.java">
<provider selected="true" editor-type-id="text-editor">
<state line="38" column="51" selection-start="1190" selection-end="1190" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java">
<provider selected="true" editor-type-id="text-editor">
<state line="31" column="0" selection-start="938" selection-end="938" vertical-scroll-proportion="-2.5038168">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/Analyzer.java">
<provider selected="true" editor-type-id="text-editor">
<state line="43" column="78" selection-start="1650" selection-end="1650" vertical-scroll-proportion="0.8982387">
<folding />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
jslib/src/core/javautil.kt
+3
View File
@@ -58,13 +58,16 @@ public trait List<E> : Collection<E> {
open public fun get(index : Int) : E
open public fun set(index : Int, element : E) : E
open public fun add(index : Int, element : E) : Unit
js_name("remove_foo")
open public fun remove(index : Int) : E?
open public fun indexOf(o : Any?) : Int
open public fun lastIndexOf(o : Any?) : Int
open public fun subList(fromIndex : Int, toIndex : Int) : List<E?>?
js_name("remove_foo")
override public fun remove(o : Any?) : Boolean
}
annotation class js_name(s : String)
trait Set<E> : Collection<E>
jslib/src/jquery/common.kt
+14 -4
View File
@@ -1,26 +1,36 @@
package jquery;
fun fail() : Nothing = throw RuntimeException();
fun JQuery.toString() = ""
class JQuery() {
fun addClass(className : String) : JQuery = fail();
fun attr(attrName : String) = ""
fun attr(attrName : String, value : String) = this
fun hasClass(attrName : String) = true
fun hasClass(className : String) = true
fun removeClass(className : String) = this
fun html() : String = ""
fun height() = 0
fun width() = 0
fun click() = this;
fun click(handler : (DomElement)->Unit) = this;
fun click(handler : DomElement.()->Unit) = this;
fun append(str : String) = this;
fun ready(handler : ()->Unit) = this;
fun text(text : String) = this;
fun slideUp() = this;
fun hover(handlerInOut : DomElement.() -> Unit) = this;
fun hover(handlerIn : DomElement.() -> Unit, handlerOut : DomElement.() -> Unit) = this;
}
class DomElement() {
open class DomElement() {
}
//val document = object : DomElement() {}
fun jq(selector : String) = JQuery();
fun jq(selector : String, context : DomElement) = JQuery();
fun jq(callback : () -> Unit) = JQuery();
fun jq(obj : JQuery) = JQuery();
fun jq(el : DomElement) = JQuery();
fun jq() = JQuery();
translator/src/org/jetbrains/k2js/Analyzer.java
+1 -5
View File
@@ -41,11 +41,7 @@ public final class Analyzer {
@NotNull
public static BindingContext analyzeFiles(@NotNull List<JetFile> files,
@Nullable Project externalProject) {
Project project = externalProject;
if (project == null) {
project = getProject(files);
}
@NotNull Project project) {
final List<JetFile> jsLibFiles = getJsSupportStdLib(project);
List<JetFile> allFiles = allFiles(files, jsLibFiles);
return AnalyzingUtils.analyzeFiles(project, JsConfiguration.jsLibConfiguration(project),
translator/src/org/jetbrains/k2js/Config.java
+13
View File
@@ -0,0 +1,13 @@
package org.jetbrains.k2js;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
/**
* @author Pavel Talanov
*/
public interface Config {
@NotNull
Project getProject();
}
translator/src/org/jetbrains/k2js/IDEAConfig.java
+23
View File
@@ -0,0 +1,23 @@
package org.jetbrains.k2js;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
/**
* @author Pavel Talanov
*/
public final class IDEAConfig implements Config {
@NotNull
private final Project project;
public IDEAConfig(@NotNull Project project) {
this.project = project;
}
@NotNull
@Override
public Project getProject() {
return project;
}
}
translator/src/org/jetbrains/k2js/K2JSTranslator.java
+44 -56
View File
@@ -3,8 +3,8 @@ package org.jetbrains.k2js;
import com.google.dart.compiler.backend.js.ast.JsProgram;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetNamespaceHeader;
import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.k2js.generate.CodeGenerator;
@@ -20,8 +20,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.StringTokenizer;
import static org.jetbrains.k2js.translate.utils.BindingUtils.getNamespaceDescriptor;
import static org.jetbrains.k2js.translate.utils.DescriptorUtils.getNameForNamespace;
import static org.jetbrains.k2js.utils.JetFileUtils.createPsiFileList;
//TODO: clean up the code
@@ -30,66 +29,51 @@ import static org.jetbrains.k2js.translate.utils.DescriptorUtils.getNameForNames
*/
public final class K2JSTranslator {
public static void translatePsiFile(@NotNull JetFile file,
@NotNull String outputFile,
@NotNull Project project) throws Exception {
(new K2JSTranslator()).generateAndSaveProgram(file, outputFile, project);
}
public static void doNothing() {
}
public static void translateWithCallToMainAndSaveToFile(@NotNull JetFile file,
@NotNull String outputPath,
@NotNull Project project) throws Exception {
K2JSTranslator translator = new K2JSTranslator();
String programCode = translator.generateProgramCode(file, project) + "\n";
K2JSTranslator translator = new K2JSTranslator(new IDEAConfig(project));
String programCode = translator.generateProgramCode(file) + "\n";
String callToMain = translator.generateCallToMain(file, "");
FileWriter writer = new FileWriter(new File(outputPath));
writer.write(programCode + callToMain);
writer.close();
}
@Nullable
private BindingContext bindingContext = null;
public K2JSTranslator() {
}
public void testTranslateFile(@NotNull String inputFile, @NotNull String outputFile) throws Exception {
JetFile psiFile = JetFileUtils.loadPsiFile(inputFile, null);
generateAndSaveProgram(psiFile, outputFile, null);
}
private void generateAndSaveProgram(@NotNull JetFile psiFile,
@NotNull String outputFile,
@Nullable Project project) throws IOException {
JsProgram program = generateProgram(Arrays.asList(psiFile), project);
CodeGenerator generator = new CodeGenerator();
generator.generateToFile(program, new File(outputFile));
}
public void testTranslateFiles(@NotNull List<String> inputFiles, @NotNull String outputFile) throws Exception {
List<JetFile> psiFiles = createPsiFileList(inputFiles);
JsProgram program = generateProgram(psiFiles, null);
CodeGenerator generator = new CodeGenerator();
generator.generateToFile(program, new File(outputFile));
public static void testTranslateFile(@NotNull String inputFile, @NotNull String outputFile) throws Exception {
K2JSTranslator translator = new K2JSTranslator(new TestConfig());
JetFile psiFile = JetFileUtils.loadPsiFile(inputFile, translator.getProject());
translator.generateAndSaveProgram(psiFile, outputFile);
}
@NotNull
private List<JetFile> createPsiFileList(@NotNull List<String> inputFiles) {
List<JetFile> psiFiles = new ArrayList<JetFile>();
for (String inputFile : inputFiles) {
psiFiles.add(JetFileUtils.loadPsiFile(inputFile, null));
}
return psiFiles;
private Config config;
public K2JSTranslator(@NotNull Config config) {
this.config = config;
}
private void generateAndSaveProgram(@NotNull JetFile psiFile,
@NotNull String outputFile) throws IOException {
JsProgram program = generateProgram(Arrays.asList(psiFile));
CodeGenerator generator = new CodeGenerator();
generator.generateToFile(program, new File(outputFile));
}
public static void testTranslateFiles(@NotNull List<String> inputFiles, @NotNull String outputFile)
throws Exception {
K2JSTranslator translator = new K2JSTranslator(new TestConfig());
List<JetFile> psiFiles = createPsiFileList(inputFiles, translator.getProject());
JsProgram program = translator.generateProgram(psiFiles);
CodeGenerator generator = new CodeGenerator();
generator.generateToFile(program, new File(outputFile));
}
@NotNull
public String translateStringWithCallToMain(@NotNull String programText, @NotNull String argumentsString) {
JetFile file = JetFileUtils.createPsiFile("test", programText, null);
String programCode = generateProgramCode(file, null) + "\n";
JetFile file = JetFileUtils.createPsiFile("test", programText, getProject());
String programCode = generateProgramCode(file) + "\n";
String flushOutput = "Kotlin.System.flush();\n";
String callToMain = generateCallToMain(file, argumentsString);
String programOutput = "Kotlin.System.output();\n";
@@ -97,23 +81,20 @@ public final class K2JSTranslator {
}
@NotNull
private String generateProgramCode(@NotNull JetFile psiFile,
@Nullable Project project) {
JsProgram program = generateProgram(Arrays.asList(psiFile), project);
private String generateProgramCode(@NotNull JetFile psiFile) {
JsProgram program = generateProgram(Arrays.asList(psiFile));
CodeGenerator generator = new CodeGenerator();
return generator.generateToString(program);
}
@NotNull
private JsProgram generateProgram(@NotNull List<JetFile> files,
@Nullable Project project) {
bindingContext = Analyzer.analyzeFiles(files, project);
private JsProgram generateProgram(@NotNull List<JetFile> files) {
BindingContext bindingContext = Analyzer.analyzeFiles(files, config.getProject());
for (JetFile file : files) {
AnalyzingUtils.checkForSyntacticErrors(file);
AnalyzingUtils.throwExceptionOnErrors(bindingContext);
}
assert bindingContext != null;
JetFile file = files.iterator().next();
return Translation.generateAst(bindingContext, file, file.getProject());
}
@@ -138,8 +119,15 @@ public final class K2JSTranslator {
@NotNull
private String getRootNamespaceName(@NotNull JetFile psiFile) {
assert bindingContext != null;
return getNameForNamespace(getNamespaceDescriptor(bindingContext, psiFile));
JetNamespaceHeader namespaceHeader = psiFile.getNamespaceHeader();
String name = namespaceHeader.getName();
assert name != null : "NamespaceHeader must have a name";
return name;
}
@NotNull
private Project getProject() {
return config.getProject();
}
}
translator/src/org/jetbrains/k2js/K2JSTranslatorApplet.java
+1 -1
View File
@@ -36,7 +36,7 @@ public final class K2JSTranslatorApplet extends Applet {
@NotNull
private String generateJSCode(@NotNull String code, @NotNull String arguments) {
String generatedCode = (new K2JSTranslator()).translateStringWithCallToMain(code, arguments);
String generatedCode = (new K2JSTranslator(new TestConfig())).translateStringWithCallToMain(code, arguments);
System.out.println("GENERATED JAVASCRIPT CODE:\n-----------------------------------\n");
System.out.println(generatedCode);
return generatedCode;
translator/src/org/jetbrains/k2js/TestConfig.java
+37
View File
@@ -0,0 +1,37 @@
package org.jetbrains.k2js;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.compiler.JetCoreEnvironment;
/**
* @author Pavel Talanov
*/
public final class TestConfig implements Config {
@NotNull
private static JetCoreEnvironment getTestEnvironment() {
if (testOnlyEnvironment == null) {
testOnlyEnvironment = new JetCoreEnvironment(new Disposable() {
@Override
public void dispose() {
}
});
}
return testOnlyEnvironment;
}
@Nullable
private static /*var*/ JetCoreEnvironment testOnlyEnvironment = null;
public TestConfig() {
}
@NotNull
@Override
public Project getProject() {
return getTestEnvironment().getProject();
}
}
translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java
+4 -2
View File
@@ -103,9 +103,11 @@ public final class StandardClasses {
private static void declareJQuery(@NotNull StandardClasses standardClasses) {
standardClasses.declare().forFQ("jquery.JQuery").externalClass("jQuery")
.methods("addClass", "attr", "hasClass", "append", "text", "ready");
.methods("addClass", "attr", "hasClass", "append",
"text", "ready", "click", "hover", "slideUp",
"removeClass");
standardClasses.declare().forFQ("jquery.jq").externalFunction("jQuery");
standardClasses.declare().forFQ("jquery.get-document").externalObject("document");
//standardClasses.declare().forFQ("jquery.get-document").externalObject("document");
}
//TODO: test all the methods
translator/src/org/jetbrains/k2js/utils/JetFileUtils.java
+16 -20
View File
@@ -1,6 +1,5 @@
package org.jetbrains.k2js.utils;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
@@ -10,27 +9,19 @@ import com.intellij.psi.PsiFileFactory;
import com.intellij.psi.impl.PsiFileFactoryImpl;
import com.intellij.testFramework.LightVirtualFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.compiler.JetCoreEnvironment;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.plugin.JetLanguage;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
/**
* @author Pavel Talanov
*/
public final class JetFileUtils {
@NotNull
private static JetCoreEnvironment testOnlyEnvironment = new JetCoreEnvironment(new Disposable() {
@Override
public void dispose() {
}
});
@NotNull
public static String loadFile(@NotNull String path) throws IOException {
return doLoadFile(path);
@@ -46,12 +37,12 @@ public final class JetFileUtils {
@NotNull
public static JetFile createPsiFile(@NotNull String name,
@NotNull String text,
@Nullable Project project) {
@NotNull Project project) {
return (JetFile) createFile(name + ".jet", text, project);
}
@NotNull
public static JetFile loadPsiFile(@NotNull String name, @Nullable Project project) {
public static JetFile loadPsiFile(@NotNull String name, @NotNull Project project) {
try {
return createPsiFile(name, loadFile(name), project);
} catch (IOException e) {
@@ -60,18 +51,23 @@ public final class JetFileUtils {
}
@NotNull
private static PsiFile createFile(@NotNull String name, @NotNull String text, @Nullable Project project) {
private static PsiFile createFile(@NotNull String name, @NotNull String text, @NotNull Project project) {
LightVirtualFile virtualFile = new LightVirtualFile(name, JetLanguage.INSTANCE, text);
virtualFile.setCharset(CharsetToolkit.UTF8_CHARSET);
Project realProject = project;
if (realProject == null) {
realProject = testOnlyEnvironment.getProject();
//throw new RuntimeException();
}
PsiFile result = ((PsiFileFactoryImpl) PsiFileFactory.getInstance(realProject))
PsiFile result = ((PsiFileFactoryImpl) PsiFileFactory.getInstance(project))
.trySetupPsiForFile(virtualFile, JetLanguage.INSTANCE, true, false);
assert result != null;
return result;
}
@NotNull
public static List<JetFile> createPsiFileList(@NotNull List<String> inputFiles,
@NotNull Project project) {
List<JetFile> psiFiles = new ArrayList<JetFile>();
for (String inputFile : inputFiles) {
psiFiles.add(JetFileUtils.loadPsiFile(inputFile, project));
}
return psiFiles;
}
}
translator/test/org/jetbrains/k2js/test/TranslationTest.java
+2 -2
View File
@@ -81,7 +81,7 @@ public abstract class TranslationTest {
}
protected void translateFile(String filename) throws Exception {
(new K2JSTranslator()).testTranslateFile(getInputFilePath(filename), getOutputFilePath(filename));
K2JSTranslator.testTranslateFile(getInputFilePath(filename), getOutputFilePath(filename));
}
protected void translateFilesInDir(String dirName) throws Exception {
@@ -92,7 +92,7 @@ public abstract class TranslationTest {
fullFilePaths.add(getInputFilePath(dirName) + "\\" + fileName);
}
assert dir.isDirectory();
(new K2JSTranslator()).testTranslateFiles(fullFilePaths, getOutputFilePath(dirName + ".kt"));
K2JSTranslator.testTranslateFiles(fullFilePaths, getOutputFilePath(dirName + ".kt"));
}
protected List<String> generateFilenameList(String inputFile) {