Parse as .kt file by default

Add missing generated files
final
2026-03-13 00:21:27 +00:00 · 2014-09-26 18:18:28 +04:00 · 2014-09-26 18:18:17 +04:00 · 2014-09-26 17:37:53 +04:00 · 2014-09-25 20:55:14 +04:00 · 2014-09-24 19:38:51 +04:00
26932 changed files with 432690 additions and 706320 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 .DS_Store
-.idea/shelf
 /android.tests.dependencies
 /confluence/target
 /dependencies
@@ -14,4 +13,4 @@ tmp
 workspace.xml
 *.versionsBackup
 /idea/testData/debugger/tinyApp/classes*
-/jps-plugin/testData/kannotator
+/jps-plugin/testData/kannotator
--- a/.idea/ant.xml
+++ b/.idea/ant.xml
@@ -1,23 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="AntConfiguration">
+    <buildFile url="file://$PROJECT_DIR$/grammar/buildGrammarLexer.xml" />
    <buildFile url="file://$PROJECT_DIR$/compiler/frontend/buildLexer.xml" />
    <buildFile url="file://$PROJECT_DIR$/build.xml">
-      <antCommandLine value="-J-XX:MaxPermSize=100m" />
-      <maximumHeapSize value="1024" />
+      <maximumHeapSize value="900" />
+      <maximumStackSize value="20" />
    </buildFile>
    <buildFile url="file://$PROJECT_DIR$/update_dependencies.xml" />
    <buildFile url="file://$PROJECT_DIR$/TeamCityBuild.xml">
      <maximumHeapSize value="512" />
    </buildFile>
    <buildFile url="file://$PROJECT_DIR$/pluginPublisher/TeamCityPluginPublisher.xml" />
-    <buildFile url="file://$PROJECT_DIR$/idea-runner/runner.xml" />
-    <buildFile url="file://$PROJECT_DIR$/replicate_versions.xml" />
-    <buildFile url="file://$PROJECT_DIR$/libraries/build-docs.xml">
-      <maximumHeapSize value="1024" />
-      <properties>
-        <property name="dokka.path" value="../../dokka" />
-      </properties>
-    </buildFile>
+    <buildFile url="file://$PROJECT_DIR$/idea_runner/runner.xml" />
  </component>
-</project>
+</project>
+
--- a/.idea/artifacts/IdeLazyResolver.xml
+++ b/.idea/artifacts/IdeLazyResolver.xml
@@ -1,9 +1,9 @@
 <component name="ArtifactManager">
  <artifact type="jar" name="IdeLazyResolver">
-    <output-path>$PROJECT_DIR$/out/artifacts/internal/</output-path>
-    <root id="archive" name="kotlin-ide-common.jar">
-      <element id="module-output" name="ide-common" />
-      <element id="dir-copy" path="$PROJECT_DIR$/idea/ide-common" />
+    <output-path>$PROJECT_DIR$/out/artifacts/IdeLazyResolver</output-path>
+    <root id="archive" name="ide-lazy-resolver.jar">
+      <element id="module-output" name="ide-lazy-resolve" />
+      <element id="dir-copy" path="$PROJECT_DIR$/idea/ide-lazy-resolve" />
    </root>
  </artifact>
 </component>
--- a/.idea/artifacts/InjectorGenerator.xml
+++ b/.idea/artifacts/InjectorGenerator.xml
@@ -1,9 +1,9 @@
 <component name="ArtifactManager">
  <artifact type="jar" name="InjectorGenerator">
-    <output-path>$PROJECT_DIR$/out/artifacts/internal/</output-path>
+    <output-path>$PROJECT_DIR$/out/artifacts/InjectorGenerator</output-path>
    <root id="archive" name="injector-generator.jar">
      <element id="module-output" name="injector-generator" />
-      <element id="dir-copy" path="$PROJECT_DIR$/generators/injector-generator" />
+      <element id="dir-copy" path="$PROJECT_DIR$/injector-generator" />
    </root>
  </artifact>
 </component>
--- a/.idea/artifacts/Instrumentation.xml
+++ b/.idea/artifacts/Instrumentation.xml
@@ -3,7 +3,8 @@
    <output-path>$PROJECT_DIR$/out/artifacts/Instrumentation</output-path>
    <root id="archive" name="Instrumentation.jar">
      <element id="module-output" name="instrumentation" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/ideaSDK/lib/asm-all.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/ideaSDK/lib/jetbrains-asm-debug-all-4.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/ideaSDK/lib/guava-17.0.jar" path-in-jar="/" />
    </root>
  </artifact>
 </component>
--- a/.idea/artifacts/KotlinAndroidExtensions.xml
+++ b/.idea/artifacts/KotlinAndroidExtensions.xml
@@ -1,20 +0,0 @@
-<component name="ArtifactManager">
-  <artifact name="KotlinAndroidExtensions">
-    <output-path>$PROJECT_DIR$/out/artifacts/KotlinAndroidExtensions</output-path>
-    <root id="root">
-      <element id="directory" name="lib">
-        <element id="archive" name="kotlin-android-extensions.jar">
-          <element id="module-output" name="android-idea-plugin" />
-        </element>
-        <element id="directory" name="jps">
-          <element id="archive" name="kotlin-android-extensions-jps.jar">
-            <element id="module-output" name="android-jps-plugin" />
-          </element>
-        </element>
-        <element id="archive" name="android-compiler-plugin.jar">
-          <element id="module-output" name="android-compiler-plugin" />
-        </element>
-      </element>
-    </root>
-  </artifact>
-</component>
--- a/.idea/artifacts/KotlinBarePlugin.xml
+++ b/.idea/artifacts/KotlinBarePlugin.xml
@@ -1,12 +1,6 @@
 <component name="ArtifactManager">
  <artifact name="KotlinBarePlugin">
    <output-path>$PROJECT_DIR$/out/artifacts/BareKotlin</output-path>
-    <properties id="ant-postprocessing">
-      <options enabled="true">
-        <file>file://$PROJECT_DIR$/idea-runner/runner.xml</file>
-        <target>copy-runtime-for-idea-plugin</target>
-      </options>
-    </properties>
    <root id="root">
      <element id="directory" name="kotlinc">
        <element id="dir-copy" path="$PROJECT_DIR$/dist/kotlinc" />
@@ -16,11 +10,13 @@
          <element id="module-output" name="bare-plugin" />
          <element id="module-output" name="descriptor.loader.java" />
          <element id="module-output" name="frontend.java" />
+          <element id="module-output" name="serialization.java" />
          <element id="module-output" name="descriptors" />
        </element>
        <element id="directory" name="jps">
          <element id="artifact" artifact-name="KotlinJpsPlugin" />
        </element>
+        <element id="file-copy" path="$PROJECT_DIR$/dist/kotlinc/lib/kotlin-runtime.jar" />
      </element>
    </root>
  </artifact>
--- a/.idea/artifacts/KotlinJpsPlugin.xml
+++ b/.idea/artifacts/KotlinJpsPlugin.xml
@@ -1,24 +1,18 @@
 <component name="ArtifactManager">
  <artifact type="jar" name="KotlinJpsPlugin">
    <output-path>$PROJECT_DIR$/out/artifacts/KotlinJpsPlugin</output-path>
-    <properties id="ant-postprocessing">
-      <options enabled="true">
-        <file>file://$PROJECT_DIR$/idea-runner/runner.xml</file>
-        <target>copy-runtime-for-jps-plugin</target>
-      </options>
-    </properties>
    <root id="archive" name="kotlin-jps-plugin.jar">
      <element id="directory" name="META-INF">
        <element id="dir-copy" path="$PROJECT_DIR$/jps-plugin/src/META-INF" />
      </element>
      <element id="extracted-dir" path="$PROJECT_DIR$/dependencies/cli-parser-1.1.1.jar" path-in-jar="/" />
      <element id="module-output" name="cli-common" />
-      <element id="module-output" name="idea-jps-common" />
+      <element id="module-output" name="ide-compiler-runner" />
      <element id="module-output" name="jps-plugin" />
      <element id="module-output" name="preloader" />
      <element id="module-output" name="util" />
      <element id="module-output" name="util.runtime" />
-      <element id="file-copy" path="$PROJECT_DIR$/resources/kotlinManifest.properties" />
+      <element id="file-copy" path="$PROJECT_DIR$/resources/manifest.properties" />
    </root>
  </artifact>
 </component>
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -1,12 +1,6 @@
 <component name="ArtifactManager">
  <artifact name="KotlinPlugin">
    <output-path>$PROJECT_DIR$/out/artifacts/Kotlin</output-path>
-    <properties id="ant-postprocessing">
-      <options enabled="true">
-        <file>file://$PROJECT_DIR$/idea-runner/runner.xml</file>
-        <target>copy-runtime-for-idea-plugin</target>
-      </options>
-    </properties>
    <root id="root">
      <element id="directory" name="lib">
        <element id="archive" name="kotlin-plugin.jar">
@@ -16,16 +10,17 @@
          <element id="module-output" name="frontend.java" />
          <element id="module-output" name="descriptor.loader.java" />
          <element id="module-output" name="idea" />
-          <element id="module-output" name="light-classes" />
+          <element id="module-output" name="jet.as.java.psi" />
          <element id="module-output" name="util" />
          <element id="module-output" name="util.runtime" />
          <element id="module-output" name="j2k" />
+          <element id="module-output" name="js.translator" />
          <element id="module-output" name="js.frontend" />
-          <element id="module-output" name="js.parser" />
          <element id="module-output" name="cli-common" />
-          <element id="module-output" name="idea-jps-common" />
+          <element id="module-output" name="ide-compiler-runner" />
          <element id="module-output" name="preloader" />
-          <element id="module-output" name="deserialization" />
+          <element id="module-output" name="serialization" />
+          <element id="module-output" name="serialization.java" />
          <element id="module-output" name="backend-common" />
          <element id="library" level="project" name="builtins" />
          <element id="module-output" name="js.dart-ast" />
@@ -35,20 +30,13 @@
          </element>
          <element id="module-output" name="eval4j" />
          <element id="module-output" name="idea-analysis" />
-          <element id="module-output" name="ide-common" />
-          <element id="file-copy" path="$PROJECT_DIR$/resources/kotlinManifest.properties" />
-          <element id="module-output" name="kotlin-android-plugin" />
-          <element id="module-output" name="js.serializer" />
-          <element id="module-output" name="serialization" />
-          <element id="module-output" name="idea-completion" />
-          <element id="module-output" name="idea-core" />
-          <element id="module-output" name="idea-js" />
+          <element id="module-output" name="ide-lazy-resolve" />
        </element>
        <element id="library" level="project" name="javax.inject" />
        <element id="directory" name="jps">
          <element id="artifact" artifact-name="KotlinJpsPlugin" />
        </element>
-        <element id="library" level="project" name="markdown" />
+        <element id="file-copy" path="$PROJECT_DIR$/dist/kotlinc/lib/kotlin-runtime.jar" />
      </element>
      <element id="directory" name="kotlinc">
        <element id="dir-copy" path="$PROJECT_DIR$/dist/kotlinc" />
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -287,4 +287,5 @@
    </option>
    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
  </component>
-</project>
+</project>
+
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,9 +2,6 @@
 <project version="4">
  <component name="CompilerConfiguration">
    <option name="DEFAULT_COMPILER" value="Javac" />
-    <excludeFromCompile>
-      <directory url="file://$PROJECT_DIR$/core/reflection.jvm" includeSubdirectories="true" />
-    </excludeFromCompile>
    <resourceExtensions />
    <wildcardResourcePatterns>
      <entry name="!?*.java" />
@@ -25,4 +22,5 @@
  <component name="JavacSettings">
    <option name="ADDITIONAL_OPTIONS_STRING" value="-target 1.6" />
  </component>
-</project>
+</project>
+
--- a/.idea/dictionaries/Nikolay_Krasko.xml
+++ b/.idea/dictionaries/Nikolay_Krasko.xml
@@ -3,16 +3,9 @@
    <words>
      <w>accessors</w>
      <w>goto</w>
-      <w>gradle</w>
-      <w>intrinsics</w>
      <w>kdoc</w>
-      <w>kompiler</w>
-      <w>memoize</w>
      <w>memoized</w>
      <w>multiline</w>
-      <w>preload</w>
-      <w>preloader</w>
-      <w>preloading</w>
      <w>preprocess</w>
      <w>redeclarations</w>
      <w>subclassed</w>
--- a/.idea/dictionaries/bashor.xml
+++ b/.idea/dictionaries/bashor.xml
@@ -1,7 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="bashor">
-    <words>
-      <w>ctor</w>
-    </words>
-  </dictionary>
-</component>
--- a/.idea/dictionaries/valentin.xml
+++ b/.idea/dictionaries/valentin.xml
@@ -1,17 +1,9 @@
 <component name="ProjectDictionaryState">
  <dictionary name="valentin">
    <words>
-      <w>delegator</w>
-      <w>funs</w>
      <w>initializers</w>
-      <w>inserter</w>
-      <w>negatable</w>
      <w>pparent</w>
-      <w>processings</w>
-      <w>rbracket</w>
      <w>rparenth</w>
-      <w>selectioner</w>
-      <w>unpluralize</w>
    </words>
  </dictionary>
 </component>
--- a/.idea/inspectionProfiles/idea_default.xml
+++ b/.idea/inspectionProfiles/idea_default.xml
@@ -402,6 +402,7 @@
      </scope>
      <option name="m_ignoreJavadoc" value="true" />
    </inspection_tool>
+    <inspection_tool class="UnnecessaryInterfaceModifier" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="UnnecessaryLabelOnBreakStatement" enabled="false" level="WARNING" enabled_by_default="false" />
    <inspection_tool class="UnnecessaryLabelOnContinueStatement" enabled="false" level="WARNING" enabled_by_default="false" />
    <inspection_tool class="UnnecessaryQualifierForThis" enabled="true" level="WARNING" enabled_by_default="true" />
--- a/.idea/libraries/Rhino.xml
+++ b/.idea/libraries/Rhino.xml
@@ -1,14 +0,0 @@
-<component name="libraryTable">
-  <library name="Rhino">
-    <ANNOTATIONS>
-      <root url="file://$PROJECT_DIR$/annotations" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/dependencies/rhino-1.7.6.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/dependencies/rhino-1.7.6-sources.jar!/rhino1.7.6/src" />
-    </SOURCES>
-  </library>
-</component>
--- a/.idea/libraries/android_plugin.xml
+++ b/.idea/libraries/android_plugin.xml
@@ -1,21 +0,0 @@
-<component name="libraryTable">
-  <library name="android-plugin">
-    <ANNOTATIONS>
-      <root url="file://$PROJECT_DIR$/annotations" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/ideaSDK/plugins/android/lib" />
-      <root url="file://$PROJECT_DIR$/ideaSDK/plugins/android/lib/jps" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/android/android/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/android/android/common/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/android/android/rt/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/android/android/jps-plugin/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/android/android/ultimate/src" />
-    </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/plugins/android/lib" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/plugins/android/lib/jps" recursive="false" />
-  </library>
-</component>
--- a/.idea/libraries/ant.xml
+++ b/.idea/libraries/ant.xml
@@ -1,14 +0,0 @@
-<component name="libraryTable">
-  <library name="ant">
-    <ANNOTATIONS>
-      <root url="file://$PROJECT_DIR$/annotations" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/dependencies/ant-1.8/lib/ant.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.8.2-src.zip!/apache-ant-1.8.2/src/main" />
-    </SOURCES>
-  </library>
-</component>
--- a/.idea/libraries/ant_1_7.xml
+++ b/.idea/libraries/ant_1_7.xml
@@ -0,0 +1,21 @@
+<component name="libraryTable">
+  <library name="ant-1.7">
+    <ANNOTATIONS>
+      <root url="file://$PROJECT_DIR$/annotations" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/dependencies/ant-1.7/lib/ant.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.7.0-src.zip!/apache-ant-1.7.0/src/etc/testcases/core/loaderref/src" />
+      <root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.7.0-src.zip!/apache-ant-1.7.0/src/etc/testcases/core/containersrc" />
+      <root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.7.0-src.zip!/apache-ant-1.7.0/src/etc/testcases/types/assertions" />
+      <root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.7.0-src.zip!/apache-ant-1.7.0/src/etc/testcases/taskdefs/apt" />
+      <root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.7.0-src.zip!/apache-ant-1.7.0/src/etc/testcases/taskdefs/rmic/src" />
+      <root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.7.0-src.zip!/apache-ant-1.7.0/src/etc/testcases/taskdefs/fixcrlf/input" />
+      <root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.7.0-src.zip!/apache-ant-1.7.0/src/etc/testcases/taskdefs/fixcrlf/expected" />
+      <root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.7.0-src.zip!/apache-ant-1.7.0/src/main" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/cli_parser.xml
+++ b/.idea/libraries/cli_parser.xml
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="cli-parser">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/dependencies/cli-parser-1.1.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/dependencies/cli-parser-1.1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
--- a/.idea/libraries/coverage_plugin.xml
+++ b/.idea/libraries/coverage_plugin.xml
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="coverage-plugin">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/ideaSDK/plugins/coverage/lib/coverage.jar!/" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/plugins/coverage/lib/jacocoant.jar!/" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/plugins/coverage/lib/coverage-agent.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/coverage/src" />
-    </SOURCES>
-  </library>
-</component>
--- a/.idea/libraries/dx_android.xml
+++ b/.idea/libraries/dx_android.xml
@@ -4,11 +4,11 @@
      <root url="file://$PROJECT_DIR$/annotations" />
    </ANNOTATIONS>
    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/dependencies/android-5.0/lib/dx.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dependencies/dx.jar!/" />
    </CLASSES>
    <JAVADOC />
    <SOURCES>
-      <root url="file://$PROJECT_DIR$/dependencies/dx-src/src" />
+      <root url="jar://$PROJECT_DIR$/dependencies/dx-sources.jar!/" />
    </SOURCES>
  </library>
 </component>
--- a/.idea/libraries/idea_full.xml
+++ b/.idea/libraries/idea_full.xml
@@ -2,7 +2,6 @@
  <library name="idea-full">
    <ANNOTATIONS>
      <root url="file://$PROJECT_DIR$/annotations" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/" />
    </ANNOTATIONS>
    <CLASSES>
      <root url="file://$PROJECT_DIR$/ideaSDK/lib" />
@@ -11,7 +10,6 @@
    <SOURCES>
      <root url="jar://$PROJECT_DIR$/dependencies/guava-17.0-sources.jar!/" />
      <root url="jar://$PROJECT_DIR$/dependencies/asm5-src.zip!/" />
-      <root url="jar://$PROJECT_DIR$/dependencies/cli-parser-1.1.1-sources.jar!/" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/gradle-tooling-extension-impl/java-production" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/groovy-psi/java-production" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/jetgroovy/java-production" />
@@ -20,6 +18,7 @@
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/spellchecker/java-test" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/testFramework-java/java-production" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/testFramework/java-production" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/testFramework/java-test" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/util/java-test" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/RegExpSupport/gen" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/RegExpSupport/src" />
@@ -74,9 +73,6 @@
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/model-serialization/testSrc" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/plugin-system/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/standalone-builder/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/json/gen" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/json/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/json/tests/test" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/analysis-api/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/analysis-impl/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/annotations/src" />
@@ -85,8 +81,6 @@
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/core-api/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/core-impl/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/duplicates-analysis/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/dvcs-api/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/dvcs-impl/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/editor-ui-api/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/editor-ui-ex/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/extensions/src" />
@@ -137,7 +131,6 @@
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/util/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/util/testSrc" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/vcs-api/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/vcs-api/vcs-api-core/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/vcs-impl/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/vcs-impl/testSrc" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/vcs-log/api/src" />
@@ -185,7 +178,6 @@
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/eclipse/resources" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/eclipse/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/eclipse/testSources" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/editorconfig/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/generate-tostring/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/generate-tostring/testSrc" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/git4idea/remote-servers-git/src" />
@@ -196,9 +188,9 @@
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/git4idea/tests" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/github/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/github/test" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/google-app-engine/gen" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/google-app-engine/jps-plugin/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/google-app-engine/jps-plugin/testSource" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/google-app-engine/resources" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/google-app-engine/runtime/source" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/google-app-engine/source" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/google-app-engine/testSource" />
@@ -220,10 +212,8 @@
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/groovy/test" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/hg4idea/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/hg4idea/testSrc" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/java-decompiler/engine/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/java-decompiler/engine/test" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/java-decompiler/plugin/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/java-decompiler/plugin/test" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/java-decompiler/src" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/java-decompiler/test" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/java-i18n/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/java-i18n/testSrc" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/javaFX/FxBuilderEmbedder/src" />
@@ -277,16 +267,9 @@
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/xslt-debugger/rt/impl/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/xslt-debugger/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/IntelliLang-python/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/edu/course-creator/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/edu/course-creator/tests" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/edu/learn-python/gen" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/edu/learn-python/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/edu/learn-python/tests" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/edu/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/gen" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/ide/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/ipnb/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/ipnb/testSrc" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/openapi/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/pluginSrc" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/pluginTestSrc" />
@@ -334,6 +317,7 @@
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/xml/xml-psi-impl/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/xml/xml-structure-view-api/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/xml/xml-structure-view-impl/src" />
+      <root url="jar://$PROJECT_DIR$/dependencies/cli-parser-1.1.1-sources.jar!/" />
    </SOURCES>
    <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/lib" recursive="false" />
  </library>
--- a/.idea/libraries/intellij_core.xml
+++ b/.idea/libraries/intellij_core.xml
@@ -2,13 +2,14 @@
  <library name="intellij-core">
    <ANNOTATIONS>
      <root url="file://$PROJECT_DIR$/annotations" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/" />
    </ANNOTATIONS>
    <CLASSES>
      <root url="file://$PROJECT_DIR$/ideaSDK/core" />
+      <root url="jar://$PROJECT_DIR$/dependencies/cli-parser-1.1.1.jar!/" />
    </CLASSES>
    <JAVADOC />
    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/dependencies/cli-parser-1.1.1-sources.jar!/" />
      <root url="jar://$PROJECT_DIR$/dependencies/guava-17.0-sources.jar!/" />
      <root url="jar://$PROJECT_DIR$/dependencies/asm5-src.zip!/" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/gradle-tooling-extension-impl/java-production" />
@@ -19,6 +20,7 @@
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/spellchecker/java-test" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/testFramework-java/java-production" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/testFramework/java-production" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/testFramework/java-test" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/util/java-test" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/RegExpSupport/gen" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/RegExpSupport/src" />
@@ -73,9 +75,6 @@
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/model-serialization/testSrc" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/plugin-system/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/standalone-builder/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/json/gen" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/json/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/json/tests/test" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/analysis-api/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/analysis-impl/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/annotations/src" />
@@ -84,8 +83,6 @@
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/core-api/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/core-impl/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/duplicates-analysis/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/dvcs-api/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/dvcs-impl/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/editor-ui-api/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/editor-ui-ex/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/extensions/src" />
@@ -136,7 +133,6 @@
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/util/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/util/testSrc" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/vcs-api/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/vcs-api/vcs-api-core/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/vcs-impl/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/vcs-impl/testSrc" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/vcs-log/api/src" />
@@ -184,7 +180,6 @@
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/eclipse/resources" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/eclipse/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/eclipse/testSources" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/editorconfig/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/generate-tostring/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/generate-tostring/testSrc" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/git4idea/remote-servers-git/src" />
@@ -195,9 +190,9 @@
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/git4idea/tests" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/github/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/github/test" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/google-app-engine/gen" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/google-app-engine/jps-plugin/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/google-app-engine/jps-plugin/testSource" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/google-app-engine/resources" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/google-app-engine/runtime/source" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/google-app-engine/source" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/google-app-engine/testSource" />
@@ -219,10 +214,8 @@
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/groovy/test" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/hg4idea/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/hg4idea/testSrc" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/java-decompiler/engine/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/java-decompiler/engine/test" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/java-decompiler/plugin/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/java-decompiler/plugin/test" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/java-decompiler/src" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/java-decompiler/test" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/java-i18n/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/java-i18n/testSrc" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/javaFX/FxBuilderEmbedder/src" />
@@ -276,16 +269,9 @@
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/xslt-debugger/rt/impl/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/xslt-debugger/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/IntelliLang-python/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/edu/course-creator/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/edu/course-creator/tests" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/edu/learn-python/gen" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/edu/learn-python/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/edu/learn-python/tests" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/edu/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/gen" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/ide/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/ipnb/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/ipnb/testSrc" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/openapi/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/pluginSrc" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/pluginTestSrc" />
--- a/.idea/libraries/intellij_core_analysis.xml
+++ b/.idea/libraries/intellij_core_analysis.xml
@@ -2,7 +2,6 @@
  <library name="intellij-core-analysis">
    <ANNOTATIONS>
      <root url="file://$PROJECT_DIR$/annotations" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/" />
    </ANNOTATIONS>
    <CLASSES>
      <root url="jar://$PROJECT_DIR$/ideaSDK/core-analysis/intellij-core-analysis.jar!/" />
@@ -10,6 +9,7 @@
    <JAVADOC />
    <SOURCES>
      <root url="jar://$PROJECT_DIR$/dependencies/asm5-src.zip!/" />
+      <root url="jar://$PROJECT_DIR$/dependencies/cli-parser-1.1.1-sources.jar!/" />
      <root url="jar://$PROJECT_DIR$/dependencies/guava-17.0-sources.jar!/" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/gradle-tooling-extension-impl/java-production" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/groovy-psi/java-production" />
@@ -19,6 +19,7 @@
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/spellchecker/java-test" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/testFramework-java/java-production" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/testFramework/java-production" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/testFramework/java-test" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/util/java-test" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/RegExpSupport/gen" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/RegExpSupport/src" />
@@ -73,9 +74,6 @@
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/model-serialization/testSrc" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/plugin-system/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/standalone-builder/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/json/gen" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/json/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/json/tests/test" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/analysis-api/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/analysis-impl/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/annotations/src" />
@@ -84,8 +82,6 @@
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/core-api/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/core-impl/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/duplicates-analysis/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/dvcs-api/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/dvcs-impl/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/editor-ui-api/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/editor-ui-ex/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/extensions/src" />
@@ -136,7 +132,6 @@
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/util/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/util/testSrc" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/vcs-api/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/vcs-api/vcs-api-core/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/vcs-impl/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/vcs-impl/testSrc" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/vcs-log/api/src" />
@@ -184,7 +179,6 @@
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/eclipse/resources" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/eclipse/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/eclipse/testSources" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/editorconfig/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/generate-tostring/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/generate-tostring/testSrc" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/git4idea/remote-servers-git/src" />
@@ -195,9 +189,9 @@
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/git4idea/tests" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/github/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/github/test" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/google-app-engine/gen" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/google-app-engine/jps-plugin/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/google-app-engine/jps-plugin/testSource" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/google-app-engine/resources" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/google-app-engine/runtime/source" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/google-app-engine/source" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/google-app-engine/testSource" />
@@ -219,10 +213,8 @@
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/groovy/test" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/hg4idea/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/hg4idea/testSrc" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/java-decompiler/engine/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/java-decompiler/engine/test" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/java-decompiler/plugin/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/java-decompiler/plugin/test" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/java-decompiler/src" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/java-decompiler/test" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/java-i18n/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/java-i18n/testSrc" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/javaFX/FxBuilderEmbedder/src" />
@@ -276,16 +268,9 @@
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/xslt-debugger/rt/impl/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/xslt-debugger/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/IntelliLang-python/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/edu/course-creator/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/edu/course-creator/tests" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/edu/learn-python/gen" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/edu/learn-python/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/edu/learn-python/tests" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/edu/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/gen" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/ide/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/ipnb/src" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/ipnb/testSrc" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/openapi/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/pluginSrc" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/python/pluginTestSrc" />
--- a/.idea/libraries/intellilang_plugin.xml
+++ b/.idea/libraries/intellilang_plugin.xml
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="intellilang-plugin">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/ideaSDK/plugins/IntelliLang/lib/IntelliLang.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/IntelliLang/java-support" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/IntelliLang/src" />
-    </SOURCES>
-  </library>
-</component>
--- a/.idea/libraries/jps.xml
+++ b/.idea/libraries/jps.xml
@@ -19,7 +19,6 @@
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/standalone-builder/src" />
      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/util/src" />
      <root url="jar://$PROJECT_DIR$/dependencies/protobuf-java-2.5.0-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/util-rt/src" />
    </SOURCES>
    <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/jps" recursive="false" />
  </library>
--- a/.idea/libraries/js_test_libs.xml
+++ b/.idea/libraries/js_test_libs.xml
@@ -0,0 +1,14 @@
+<component name="libraryTable">
+  <library name="js-test-libs">
+    <ANNOTATIONS>
+      <root url="file://$PROJECT_DIR$/annotations" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/js/js.tests/testLib/rhino-1.7R4.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/js/js.tests/testLib/src/rhino-1.7R4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/kotlin_runtime.xml
+++ b/.idea/libraries/kotlin_runtime.xml
@@ -2,13 +2,10 @@
  <library name="kotlin-runtime">
    <CLASSES>
      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-runtime.jar!/" />
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar!/" />
    </CLASSES>
    <JAVADOC />
    <SOURCES>
-      <root url="file://$PROJECT_DIR$/libraries/stdlib/src" />
-      <root url="file://$PROJECT_DIR$/core/builtins/src" />
-      <root url="file://$PROJECT_DIR$/core/runtime.jvm/src" />
+      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-runtime-sources.jar!/" />
    </SOURCES>
  </library>
 </component>
--- a/.idea/libraries/markdown.xml
+++ b/.idea/libraries/markdown.xml
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="markdown">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/dependencies/markdown.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -51,7 +51,7 @@
  <component name="ProjectResources">
    <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/out" />
  </component>
  <component name="WebServicesPlugin" addRequiredLibraries="true" />
@@ -60,4 +60,5 @@
    <option name="autoscroll" value="false" />
    <option name="showOnlyWarnings" value="false" />
  </component>
-</project>
+</project>
+
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,61 +3,49 @@
  <component name="ProjectModuleManager">
    <modules>
      <module fileurl="file://$PROJECT_DIR$/Kotlin.iml" filepath="$PROJECT_DIR$/Kotlin.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/android-compiler-plugin/android-compiler-plugin.iml" filepath="$PROJECT_DIR$/plugins/android-compiler-plugin/android-compiler-plugin.iml" group="plugins" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/android-idea-plugin/android-idea-plugin.iml" filepath="$PROJECT_DIR$/plugins/android-idea-plugin/android-idea-plugin.iml" group="plugins" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/android-jps-plugin/android-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/android-jps-plugin/android-jps-plugin.iml" group="plugins" />
+      <module fileurl="file://$PROJECT_DIR$/_my/_my.iml" filepath="$PROJECT_DIR$/_my/_my.iml" />
      <module fileurl="file://$PROJECT_DIR$/android-studio/android-studio.iml" filepath="$PROJECT_DIR$/android-studio/android-studio.iml" group="ide" />
      <module fileurl="file://$PROJECT_DIR$/compiler/android-tests/android-tests.iml" filepath="$PROJECT_DIR$/compiler/android-tests/android-tests.iml" group="compiler" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/annotation-collector/annotation-collector.iml" filepath="$PROJECT_DIR$/plugins/annotation-collector/annotation-collector.iml" group="plugins" />
-      <module fileurl="file://$PROJECT_DIR$/ant/ant.iml" filepath="$PROJECT_DIR$/ant/ant.iml" />
      <module fileurl="file://$PROJECT_DIR$/compiler/backend/backend.iml" filepath="$PROJECT_DIR$/compiler/backend/backend.iml" group="compiler/java" />
      <module fileurl="file://$PROJECT_DIR$/compiler/backend-common/backend-common.iml" filepath="$PROJECT_DIR$/compiler/backend-common/backend-common.iml" group="compiler" />
      <module fileurl="file://$PROJECT_DIR$/jps-plugin/bare-plugin/bare-plugin.iml" filepath="$PROJECT_DIR$/jps-plugin/bare-plugin/bare-plugin.iml" group="ide/jps" />
+      <module fileurl="file://$PROJECT_DIR$/build-tools/build-tools.iml" filepath="$PROJECT_DIR$/build-tools/build-tools.iml" />
      <module fileurl="file://$PROJECT_DIR$/core/builtins/builtins.iml" filepath="$PROJECT_DIR$/core/builtins/builtins.iml" group="core" />
      <module fileurl="file://$PROJECT_DIR$/compiler/builtins-serializer/builtins-serializer.iml" filepath="$PROJECT_DIR$/compiler/builtins-serializer/builtins-serializer.iml" group="compiler/cli" />
      <module fileurl="file://$PROJECT_DIR$/compiler/cli/cli.iml" filepath="$PROJECT_DIR$/compiler/cli/cli.iml" group="compiler/cli" />
      <module fileurl="file://$PROJECT_DIR$/compiler/cli/cli-common/cli-common.iml" filepath="$PROJECT_DIR$/compiler/cli/cli-common/cli-common.iml" group="compiler/cli" />
+      <module fileurl="file://$PROJECT_DIR$/compiler/integration-tests/compiler-integration-tests.iml" filepath="$PROJECT_DIR$/compiler/integration-tests/compiler-integration-tests.iml" group="compiler/cli" />
      <module fileurl="file://$PROJECT_DIR$/compiler/tests/compiler-tests.iml" filepath="$PROJECT_DIR$/compiler/tests/compiler-tests.iml" group="compiler" />
      <module fileurl="file://$PROJECT_DIR$/core/descriptor.loader.java/descriptor.loader.java.iml" filepath="$PROJECT_DIR$/core/descriptor.loader.java/descriptor.loader.java.iml" group="core" />
      <module fileurl="file://$PROJECT_DIR$/core/descriptors/descriptors.iml" filepath="$PROJECT_DIR$/core/descriptors/descriptors.iml" group="core" />
-      <module fileurl="file://$PROJECT_DIR$/core/descriptors.runtime/descriptors.runtime.iml" filepath="$PROJECT_DIR$/core/descriptors.runtime/descriptors.runtime.iml" group="core" />
-      <module fileurl="file://$PROJECT_DIR$/core/deserialization/deserialization.iml" filepath="$PROJECT_DIR$/core/deserialization/deserialization.iml" group="core" />
      <module fileurl="file://$PROJECT_DIR$/eval4j/eval4j.iml" filepath="$PROJECT_DIR$/eval4j/eval4j.iml" group="ide" />
      <module fileurl="file://$PROJECT_DIR$/compiler/frontend/frontend.iml" filepath="$PROJECT_DIR$/compiler/frontend/frontend.iml" group="compiler" />
      <module fileurl="file://$PROJECT_DIR$/compiler/frontend.java/frontend.java.iml" filepath="$PROJECT_DIR$/compiler/frontend.java/frontend.java.iml" group="compiler/java" />
      <module fileurl="file://$PROJECT_DIR$/generators/generators.iml" filepath="$PROJECT_DIR$/generators/generators.iml" group="infrastructure" />
      <module fileurl="file://$PROJECT_DIR$/grammar/grammar.iml" filepath="$PROJECT_DIR$/grammar/grammar.iml" group="compiler" />
-      <module fileurl="file://$PROJECT_DIR$/idea/ide-common/ide-common.iml" filepath="$PROJECT_DIR$/idea/ide-common/ide-common.iml" group="ide" />
+      <module fileurl="file://$PROJECT_DIR$/ide-compiler-runner/ide-compiler-runner.iml" filepath="$PROJECT_DIR$/ide-compiler-runner/ide-compiler-runner.iml" group="ide" />
+      <module fileurl="file://$PROJECT_DIR$/idea/ide-lazy-resolve/ide-lazy-resolve.iml" filepath="$PROJECT_DIR$/idea/ide-lazy-resolve/ide-lazy-resolve.iml" group="ide" />
      <module fileurl="file://$PROJECT_DIR$/idea/idea.iml" filepath="$PROJECT_DIR$/idea/idea.iml" group="ide" />
      <module fileurl="file://$PROJECT_DIR$/idea/idea-analysis/idea-analysis.iml" filepath="$PROJECT_DIR$/idea/idea-analysis/idea-analysis.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/idea/idea-completion/idea-completion.iml" filepath="$PROJECT_DIR$/idea/idea-completion/idea-completion.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/idea/idea-core/idea-core.iml" filepath="$PROJECT_DIR$/idea/idea-core/idea-core.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/idea/idea-jps-common/idea-jps-common.iml" filepath="$PROJECT_DIR$/idea/idea-jps-common/idea-jps-common.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/idea/idea-js/idea-js.iml" filepath="$PROJECT_DIR$/idea/idea-js/idea-js.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/idea-runner/idea-runner.iml" filepath="$PROJECT_DIR$/idea-runner/idea-runner.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/idea/idea-test-framework/idea-test-framework.iml" filepath="$PROJECT_DIR$/idea/idea-test-framework/idea-test-framework.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/generators/injector-generator/injector-generator.iml" filepath="$PROJECT_DIR$/generators/injector-generator/injector-generator.iml" group="infrastructure" />
+      <module fileurl="file://$PROJECT_DIR$/idea_runner/idea_runner.iml" filepath="$PROJECT_DIR$/idea_runner/idea_runner.iml" group="ide" />
+      <module fileurl="file://$PROJECT_DIR$/injector-generator/injector-generator.iml" filepath="$PROJECT_DIR$/injector-generator/injector-generator.iml" group="infrastructure" />
      <module fileurl="file://$PROJECT_DIR$/compiler/preloader/instrumentation/instrumentation.iml" filepath="$PROJECT_DIR$/compiler/preloader/instrumentation/instrumentation.iml" group="compiler/cli" />
      <module fileurl="file://$PROJECT_DIR$/j2k/j2k.iml" filepath="$PROJECT_DIR$/j2k/j2k.iml" group="j2k" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/java8-tests/java8-tests.iml" filepath="$PROJECT_DIR$/compiler/java8-tests/java8-tests.iml" group="compiler" />
+      <module fileurl="file://$PROJECT_DIR$/compiler/jet.as.java.psi/jet.as.java.psi.iml" filepath="$PROJECT_DIR$/compiler/jet.as.java.psi/jet.as.java.psi.iml" group="compiler/java" />
      <module fileurl="file://$PROJECT_DIR$/jps-plugin/jps-plugin.iml" filepath="$PROJECT_DIR$/jps-plugin/jps-plugin.iml" group="ide/jps" />
      <module fileurl="file://$PROJECT_DIR$/js/js.dart-ast/js.dart-ast.iml" filepath="$PROJECT_DIR$/js/js.dart-ast/js.dart-ast.iml" group="compiler/js" />
      <module fileurl="file://$PROJECT_DIR$/js/js.frontend/js.frontend.iml" filepath="$PROJECT_DIR$/js/js.frontend/js.frontend.iml" group="compiler/js" />
-      <module fileurl="file://$PROJECT_DIR$/js/js.inliner/js.inliner.iml" filepath="$PROJECT_DIR$/js/js.inliner/js.inliner.iml" group="compiler/js" />
-      <module fileurl="file://$PROJECT_DIR$/js/js.parser/js.parser.iml" filepath="$PROJECT_DIR$/js/js.parser/js.parser.iml" group="compiler/js" />
-      <module fileurl="file://$PROJECT_DIR$/js/js.serializer/js.serializer.iml" filepath="$PROJECT_DIR$/js/js.serializer/js.serializer.iml" group="compiler/js" />
      <module fileurl="file://$PROJECT_DIR$/js/js.tests/js.tests.iml" filepath="$PROJECT_DIR$/js/js.tests/js.tests.iml" group="compiler/js" />
      <module fileurl="file://$PROJECT_DIR$/js/js.translator/js.translator.iml" filepath="$PROJECT_DIR$/js/js.translator/js.translator.iml" group="compiler/js" />
      <module fileurl="file://$PROJECT_DIR$/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml" filepath="$PROJECT_DIR$/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml" group="ide/jps" />
-      <module fileurl="file://$PROJECT_DIR$/idea/kotlin-android-plugin/kotlin-android-plugin.iml" filepath="$PROJECT_DIR$/idea/kotlin-android-plugin/kotlin-android-plugin.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/light-classes/light-classes.iml" filepath="$PROJECT_DIR$/compiler/light-classes/light-classes.iml" group="compiler/java" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/plugin-api/plugin-api.iml" filepath="$PROJECT_DIR$/compiler/plugin-api/plugin-api.iml" group="compiler" />
      <module fileurl="file://$PROJECT_DIR$/compiler/preloader/preloader.iml" filepath="$PROJECT_DIR$/compiler/preloader/preloader.iml" group="compiler/cli" />
-      <module fileurl="file://$PROJECT_DIR$/core/reflection.jvm/reflection.jvm.iml" filepath="$PROJECT_DIR$/core/reflection.jvm/reflection.jvm.iml" group="core" />
+      <module fileurl="file://$PROJECT_DIR$/core/reflection/reflection.iml" filepath="$PROJECT_DIR$/core/reflection/reflection.iml" group="core" />
      <module fileurl="file://$PROJECT_DIR$/core/runtime.jvm/runtime.jvm.iml" filepath="$PROJECT_DIR$/core/runtime.jvm/runtime.jvm.iml" group="core" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/serialization/serialization.iml" filepath="$PROJECT_DIR$/compiler/serialization/serialization.iml" group="compiler" />
+      <module fileurl="file://$PROJECT_DIR$/core/serialization/serialization.iml" filepath="$PROJECT_DIR$/core/serialization/serialization.iml" group="core" />
+      <module fileurl="file://$PROJECT_DIR$/core/serialization.java/serialization.java.iml" filepath="$PROJECT_DIR$/core/serialization.java/serialization.java.iml" group="core" />
      <module fileurl="file://$PROJECT_DIR$/compiler/util/util.iml" filepath="$PROJECT_DIR$/compiler/util/util.iml" />
      <module fileurl="file://$PROJECT_DIR$/core/util.runtime/util.runtime.iml" filepath="$PROJECT_DIR$/core/util.runtime/util.runtime.iml" group="core" />
    </modules>
  </component>
-</project>
+</project>
+
--- a/.idea/runConfigurations/All_Compiler_Tests.xml
+++ b/.idea/runConfigurations/All_Compiler_Tests.xml
@@ -2,18 +2,18 @@
  <configuration default="false" name="All Compiler Tests" type="JUnit" factoryName="JUnit">
    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
      <pattern>
-        <option name="PATTERN" value="org.jetbrains.kotlin.*" />
+        <option name="PATTERN" value="org.jetbrains.jet.*" />
        <option name="ENABLED" value="true" />
      </pattern>
    </extension>
    <module name="compiler-tests" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="PACKAGE_NAME" value="org.jetbrains.kotlin" />
+    <option name="PACKAGE_NAME" value="org.jetbrains.jet" />
    <option name="MAIN_CLASS_NAME" value="" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx900m -XX:MaxPermSize=320m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=64m" />
+    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx512m -XX:MaxPermSize=320m" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
    <option name="ENV_VARIABLES" />
--- a/.idea/runConfigurations/All_IDEA_Plugin_Tests.xml
+++ b/.idea/runConfigurations/All_IDEA_Plugin_Tests.xml
@@ -2,18 +2,18 @@
  <configuration default="false" name="All IDEA Plugin Tests" type="JUnit" factoryName="JUnit">
    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
      <pattern>
-        <option name="PATTERN" value="org.jetbrains.kotlin.*" />
+        <option name="PATTERN" value="org.jetbrains.jet.*" />
        <option name="ENABLED" value="true" />
      </pattern>
    </extension>
    <module name="idea" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="PACKAGE_NAME" value="org.jetbrains.kotlin" />
+    <option name="PACKAGE_NAME" value="org.jetbrains.jet" />
    <option name="MAIN_CLASS_NAME" value="" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx900m -XX:MaxPermSize=320m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=64m" />
+    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx512m -XX:MaxPermSize=320m" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
    <option name="ENV_VARIABLES" />
--- a/.idea/runConfigurations/All_Jvm_Backend_Tests.xml
+++ b/.idea/runConfigurations/All_Jvm_Backend_Tests.xml
@@ -2,18 +2,18 @@
  <configuration default="false" name="All Jvm Backend Tests" type="JUnit" factoryName="JUnit">
    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
      <pattern>
-        <option name="PATTERN" value="org.jetbrains.kotlin.*" />
+        <option name="PATTERN" value="org.jetbrains.jet.*" />
        <option name="ENABLED" value="true" />
      </pattern>
    </extension>
    <module name="compiler-tests" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="PACKAGE_NAME" value="org.jetbrains.kotlin.codegen" />
+    <option name="PACKAGE_NAME" value="org.jetbrains.jet.codegen" />
    <option name="MAIN_CLASS_NAME" value="" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx900m -XX:MaxPermSize=320m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=64m" />
+    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx512m -XX:MaxPermSize=320m" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
    <option name="ENV_VARIABLES" />
--- a/.idea/runConfigurations/All_Tests.xml
+++ b/.idea/runConfigurations/All_Tests.xml
@@ -2,7 +2,7 @@
  <configuration default="false" name="All Tests" type="JUnit" factoryName="JUnit">
    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
      <pattern>
-        <option name="PATTERN" value="org.jetbrains.kotlin.*" />
+        <option name="PATTERN" value="org.jetbrains.jet.*" />
        <option name="ENABLED" value="true" />
      </pattern>
    </extension>
@@ -13,7 +13,7 @@
    <option name="MAIN_CLASS_NAME" value="" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx900m -XX:MaxPermSize=400m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=128m" />
+    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx900m -XX:MaxPermSize=320m -XX:+UseCodeCacheFlushing" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
    <option name="ENV_VARIABLES" />
@@ -22,6 +22,7 @@
      <value defaultName="moduleWithDependencies" />
    </option>
    <envs>
+      <env name="kotlin.tests.actually.compile" value="true" />
      <env name="NO_FS_ROOTS_ACCESS_CHECK" value="true" />
    </envs>
    <patterns />
@@ -34,9 +35,6 @@
    <RunnerSettings RunnerId="Run" />
    <ConfigurationWrapper RunnerId="Debug" />
    <ConfigurationWrapper RunnerId="Run" />
-    <method>
-      <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/build.xml" target="compiler-quick" />
-      <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/build.xml" target="runtime" />
-    </method>
+    <method />
  </configuration>
 </component>
--- a/.idea/runConfigurations/Android_Studio.xml
+++ b/.idea/runConfigurations/Android_Studio.xml
@@ -2,7 +2,7 @@
  <configuration default="false" name="Android Studio" type="Application" factoryName="Application">
    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
    <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
-    <option name="VM_PARAMETERS" value="-Didea.paths.selector=AndroidStudioPreview -Didea.platform.prefix=AndroidStudio -Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=450m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin,$PROJECT_DIR$/out/artifacts/KotlinAndroidExtensions" />
+    <option name="VM_PARAMETERS" value="-Didea.paths.selector=AndroidStudioPreview -Didea.platform.prefix=AndroidStudio -Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=450m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system -Didea.config.path=../config -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android-studio/sdk/bin" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -24,9 +24,6 @@
      <option name="BuildArtifacts" enabled="true">
        <artifact name="KotlinPlugin" />
      </option>
-      <option name="BuildArtifacts" enabled="true">
-        <artifact name="KotlinAndroidExtensions" />
-      </option>
    </method>
  </configuration>
 </component>
--- a/.idea/runConfigurations/Codegen_Tests_on_Android.xml
+++ b/.idea/runConfigurations/Codegen_Tests_on_Android.xml
@@ -4,8 +4,8 @@
    <module name="android-tests" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="PACKAGE_NAME" value="org.jetbrains.kotlin.android.tests" />
-    <option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.android.tests.AndroidRunner" />
+    <option name="PACKAGE_NAME" value="org.jetbrains.jet.compiler.android" />
+    <option name="MAIN_CLASS_NAME" value="org.jetbrains.jet.compiler.android.AndroidRunner" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="class" />
    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx512m -XX:MaxPermSize=320m -XX:+UseCodeCacheFlushing" />
--- a/.idea/runConfigurations/Generate_Injectors.xml
+++ b/.idea/runConfigurations/Generate_Injectors.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="Generate Injectors" type="JetRunConfigurationType" factoryName="Kotlin">
    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.generators.injectors.InjectorsPackage" />
+    <option name="MAIN_CLASS_NAME" value="org.jetbrains.jet.generators.injectors.InjectorsPackage" />
    <option name="VM_PARAMETERS" value="" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="" />
@@ -10,13 +10,7 @@
    <option name="PASS_PARENT_ENVS" value="true" />
    <module name="generators" />
    <envs />
-    <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>
--- a/.idea/runConfigurations/Generate_Tests.xml
+++ b/.idea/runConfigurations/Generate_Tests.xml
@@ -2,11 +2,11 @@
  <configuration default="false" name="Generate Tests" type="Application" factoryName="Application">
    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
      <pattern>
-        <option name="PATTERN" value="org.jetbrains.kotlin.generators.tests.*" />
+        <option name="PATTERN" value="org.jetbrains.jet.generators.tests.*" />
        <option name="ENABLED" value="true" />
      </pattern>
    </extension>
-    <option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.generators.tests.TestsPackage" />
+    <option name="MAIN_CLASS_NAME" value="org.jetbrains.jet.generators.tests.TestsPackage" />
    <option name="VM_PARAMETERS" value="-ea" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
--- a/.idea/runConfigurations/IDEA.xml
+++ b/.idea/runConfigurations/IDEA.xml
@@ -2,7 +2,7 @@
  <configuration default="false" name="IDEA" type="Application" factoryName="Application">
    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
    <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
-    <option name="VM_PARAMETERS" value="-Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=450m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin,$PROJECT_DIR$/out/artifacts/KotlinAndroidExtensions -Dkotlin.internal.mode.enabled=true" />
+    <option name="VM_PARAMETERS" value="-Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=450m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin -Dkotlin.internal.mode.enabled=true" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/ideaSDK/bin" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -10,7 +10,7 @@
    <option name="ENABLE_SWING_INSPECTOR" value="false" />
    <option name="ENV_VARIABLES" />
    <option name="PASS_PARENT_ENVS" value="true" />
-    <module name="idea-runner" />
+    <module name="idea_runner" />
    <envs />
    <RunnerSettings RunnerId="Debug">
      <option name="DEBUG_PORT" value="" />
@@ -43,10 +43,7 @@
      <option name="BuildArtifacts" enabled="true">
        <artifact name="KotlinPlugin" />
      </option>
-      <option name="BuildArtifacts" enabled="true">
-        <artifact name="KotlinAndroidExtensions" />
-      </option>
-      <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/idea-runner/runner.xml" target="force-enable-kotlin-plugin" />
+      <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/idea_runner/runner.xml" target="force_enable_kotlin_plugin" />
    </method>
  </configuration>
 </component>
--- a/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml
+++ b/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml
@@ -2,7 +2,7 @@
  <configuration default="false" name="IDEA (No ProcessCanceledException)" type="Application" factoryName="Application">
    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
    <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
-    <option name="VM_PARAMETERS" value="-Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=250m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin,$PROJECT_DIR$/out/artifacts/KotlinAndroidExtensions -Didea.ProcessCanceledException=disabled -Dkotlin.internal.mode.enabled=true" />
+    <option name="VM_PARAMETERS" value="-Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=250m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin -Didea.ProcessCanceledException=disabled -Dkotlin.internal.mode.enabled=true" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/ideaSDK/bin" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -10,7 +10,7 @@
    <option name="ENABLE_SWING_INSPECTOR" value="false" />
    <option name="ENV_VARIABLES" />
    <option name="PASS_PARENT_ENVS" value="true" />
-    <module name="idea-runner" />
+    <module name="idea_runner" />
    <envs />
    <RunnerSettings RunnerId="Debug">
      <option name="DEBUG_PORT" value="" />
@@ -24,10 +24,7 @@
      <option name="BuildArtifacts" enabled="true">
        <artifact name="KotlinPlugin" />
      </option>
-      <option name="BuildArtifacts" enabled="true">
-        <artifact name="KotlinAndroidExtensions" />
-      </option>
-      <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/idea-runner/runner.xml" target="force-enable-kotlin-plugin" />
+      <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/idea_runner/runner.xml" target="force_enable_kotlin_plugin" />
    </method>
  </configuration>
 </component>
--- a/.idea/runConfigurations/Incremental_Compilation_Tests.xml
+++ b/.idea/runConfigurations/Incremental_Compilation_Tests.xml
@@ -1,37 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Incremental Compilation Tests" type="JUnit" factoryName="JUnit">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <module name="jps-plugin" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="PACKAGE_NAME" value="org.jetbrains.kotlin.jps.build" />
-    <option name="MAIN_CLASS_NAME" value="" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="pattern" />
-    <option name="VM_PARAMETERS" value="-ea -Xmx512m -XX:MaxPermSize=320m -Dkotlin.incremental.compilation=true" />
-    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="moduleWithDependencies" />
-    </option>
-    <envs />
-    <patterns>
-      <pattern testClass="org.jetbrains.kotlin.jps.build.IncrementalJpsTestGenerated" />
-      <pattern testClass="org.jetbrains.kotlin.jps.build.IncrementalCacheVersionChangedTest" />
-      <pattern testClass="org.jetbrains.kotlin.jps.build.IncrementalConstantSearchTest" />
-    </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>
-      <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/build.xml" target="dist-quick-compiler-only" />
-    </method>
-  </configuration>
-</component>
--- a/.idea/runConfigurations/Integration_Tests.xml
+++ b/.idea/runConfigurations/Integration_Tests.xml
@@ -0,0 +1,31 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Integration Tests" type="JUnit" factoryName="JUnit">
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
+      <pattern>
+        <option name="PATTERN" value="org.jetbrains.jet.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <module name="compiler-integration-tests" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" value="" />
+    <option name="PACKAGE_NAME" value="org.jetbrains.kotlin" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="package" />
+    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx350m -XX:MaxPermSize=320m" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+    <option name="ENV_VARIABLES" />
+    <option name="PASS_PARENT_ENVS" value="true" />
+    <option name="TEST_SEARCH_SCOPE">
+      <value defaultName="moduleWithDependencies" />
+    </option>
+    <envs />
+    <patterns />
+    <RunnerSettings RunnerId="Profile " />
+    <RunnerSettings RunnerId="Run" />
+    <ConfigurationWrapper RunnerId="Run" />
+    <method />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/J2K_Tests.xml
+++ b/.idea/runConfigurations/J2K_Tests.xml
@@ -2,11 +2,11 @@
  <configuration default="false" name="J2K Tests" type="JUnit" factoryName="JUnit">
    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
      <pattern>
-        <option name="PATTERN" value="org.jetbrains.kotlin.*" />
+        <option name="PATTERN" value="org.jetbrains.jet.*" />
        <option name="ENABLED" value="true" />
      </pattern>
    </extension>
-    <module name="j2k" />
+    <module name="j2k-tests" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
    <option name="ALTERNATIVE_JRE_PATH" value="" />
    <option name="PACKAGE_NAME" value="" />
@@ -23,14 +23,8 @@
    </option>
    <envs />
    <patterns />
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="true" />
-    </RunnerSettings>
    <RunnerSettings RunnerId="Profile " />
    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Debug" />
    <ConfigurationWrapper RunnerId="Run" />
    <method />
  </configuration>
--- a/.idea/runConfigurations/Java_8_Tests.xml
+++ b/.idea/runConfigurations/Java_8_Tests.xml
@@ -1,28 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Java 8 Tests" type="JUnit" factoryName="JUnit">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-      <pattern>
-        <option name="PATTERN" value="org.jetbrains.kotlin.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <module name="java8-tests" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="ALTERNATIVE_JRE_PATH" value="1.8" />
-    <option name="PACKAGE_NAME" value="org.jetbrains.kotlin" />
-    <option name="MAIN_CLASS_NAME" value="" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=64m" />
-    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="singleModule" />
-    </option>
-    <envs />
-    <patterns />
-    <method />
-  </configuration>
-</component>
--- a/.idea/runConfigurations/Js_backend_tests.xml
+++ b/.idea/runConfigurations/Js_backend_tests.xml
@@ -4,11 +4,11 @@
    <module name="js.tests" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="PACKAGE_NAME" value="org.jetbrains.kotlin.js.test" />
+    <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
    <option name="MAIN_CLASS_NAME" value="" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx900m -XX:MaxPermSize=320m -XX:+UseCodeCacheFlushing" />
+    <option name="VM_PARAMETERS" value="-ea" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
    <option name="ENV_VARIABLES" />
--- a/.idea/runConfigurations/KAnnotator_Jps_Plugin_Test.xml
+++ b/.idea/runConfigurations/KAnnotator_Jps_Plugin_Test.xml
@@ -4,7 +4,7 @@
    <module name="kannotator-jps-plugin-test" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="PACKAGE_NAME" value="org.jetbrains.kotlin.jps.build.kannotator" />
+    <option name="PACKAGE_NAME" value="org.jetbrains.jet.jps.build.kannotator" />
    <option name="MAIN_CLASS_NAME" value="" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="package" />
--- a/.idea/runConfigurations/Smart_Completion_Tests.xml
+++ b/.idea/runConfigurations/Smart_Completion_Tests.xml
@@ -2,14 +2,14 @@
  <configuration default="false" name="Smart Completion Tests" type="JUnit" factoryName="JUnit">
    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
      <pattern>
-        <option name="PATTERN" value="org.jetbrains.kotlin.completion.handlers.*" />
+        <option name="PATTERN" value="org.jetbrains.jet.completion.handlers.*" />
        <option name="ENABLED" value="true" />
      </pattern>
    </extension>
    <module name="idea" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="PACKAGE_NAME" value="org.jetbrains.kotlin.completion.handlers" />
+    <option name="PACKAGE_NAME" value="org.jetbrains.jet.completion.handlers" />
    <option name="MAIN_CLASS_NAME" value="" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="pattern" />
@@ -21,13 +21,12 @@
    <option name="TEST_SEARCH_SCOPE">
      <value defaultName="singleModule" />
    </option>
-    <envs />
+    <envs>
+      <env name="kotlin.tests.actually.compile" value="false" />
+    </envs>
    <patterns>
-      <pattern testClass="org.jetbrains.kotlin.idea.completion.test.JvmSmartCompletionTestGenerated" />
-      <pattern testClass="org.jetbrains.kotlin.idea.completion.test.handlers.SmartCompletionHandlerTestGenerated" />
-      <pattern testClass="org.jetbrains.kotlin.idea.completion.test.handlers.SmartCompletionMultifileHandlerTest" />
-      <pattern testClass="org.jetbrains.kotlin.idea.completion.test.weighers.SmartCompletionWeigherTestGenerated" />
-      <pattern testClass="org.jetbrains.kotlin.idea.completion.test.MultiFileSmartCompletionTestGenerated" />
+      <pattern testClass="org.jetbrains.jet.completion.JvmSmartCompletionTestGenerated" />
+      <pattern testClass="org.jetbrains.jet.completion.handlers.SmartCompletionHandlerTestGenerated" />
    </patterns>
    <RunnerSettings RunnerId="Debug">
      <option name="DEBUG_PORT" value="" />
--- a/.idea/scopes/IDE.xml
+++ b/.idea/scopes/IDE.xml
@@ -1,3 +1,3 @@
 <component name="DependencyValidationManager">
-  <scope name="IDE" pattern="file[idea]:*/||file[idea-analysis]:*/||file[ide-lazy-resolve]:*/" />
+  <scope name="IDE" pattern="idea||file[idea]:*/" />
 </component>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -7,10 +7,6 @@
          <option name="issueRegexp" value="[A-Z]+\-\d+" />
          <option name="linkRegexp" value="http://youtrack.jetbrains.com/issue/$0" />
        </IssueNavigationLink>
-        <IssueNavigationLink>
-          <option name="issueRegexp" value="EA\-(\d+)" />
-          <option name="linkRegexp" value="http://ea.jetbrains.com/browser/ea_problems/$1" />
-        </IssueNavigationLink>
      </list>
    </option>
  </component>
--- a/Kotlin.iml
+++ b/Kotlin.iml
@@ -8,9 +8,7 @@
      <excludeFolder url="file://$MODULE_DIR$/android.tests.dependencies" />
      <excludeFolder url="file://$MODULE_DIR$/dependencies" />
      <excludeFolder url="file://$MODULE_DIR$/dist" />
-      <excludeFolder url="file://$MODULE_DIR$/ideaSDK/androidSDK" />
      <excludeFolder url="file://$MODULE_DIR$/ideaSDK/config" />
-      <excludeFolder url="file://$MODULE_DIR$/ideaSDK/config-idea" />
      <excludeFolder url="file://$MODULE_DIR$/ideaSDK/system" />
      <excludeFolder url="file://$MODULE_DIR$/ideaSDK/system-idea" />
      <excludeFolder url="file://$MODULE_DIR$/libraries/.idea" />
@@ -22,25 +20,14 @@
      <excludeFolder url="file://$MODULE_DIR$/libraries/kotlin-jdbc/target" />
      <excludeFolder url="file://$MODULE_DIR$/libraries/kotlin-swing/target" />
      <excludeFolder url="file://$MODULE_DIR$/libraries/kunit/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/stdlib/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/stdlib/validator/target" />
      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/.idea" />
      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kdoc-maven-plugin/target" />
      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kdoc/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-compiler/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-gradle-plugin-core/local-repo" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-gradle-plugin-core/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-gradle-plugin-test/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-gradle-plugin/local-repo" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-gradle-plugin/target" />
      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-js-library/target" />
      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-js-tests-junit/target" />
      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-js-tests/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-maven-plugin-test/local-repo" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-maven-plugin-test/target" />
      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-maven-plugin/local-repo" />
      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-maven-plugin/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-reflect/target" />
      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-stdlib-gen/target" />
      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/runtime/target" />
    </content>
@@ -48,3 +35,4 @@
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
+
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -2,24 +2,24 @@

 Welcome to [Kotlin](http://kotlinlang.org/)! Some handy links:

- * [Kotlin Site](http://kotlinlang.org/)
- * [Getting Started Guide](http://kotlinlang.org/docs/tutorials/getting-started.html)
+ * [Getting Started Guide](http://confluence.jetbrains.net/display/Kotlin/Getting+Started)
 * [Web Demo](http://kotlin-demo.jetbrains.com/)
+ * [Kotlin Site](http://jetbrains.github.com/kotlin/)
 * [API](http://jetbrains.github.com/kotlin/versions/snapshot/apidocs/index.html)
 * [Issue Tracker](http://youtrack.jetbrains.com/issues/KT)
 * [Forum](http://devnet.jetbrains.net/community/kotlin?view=discussions)
 * [Kotlin Blog](http://blog.jetbrains.com/kotlin/)
- * [Follow Kotlin on Twitter](http://twitter.com/#!/project_kotlin)
- * [TeamCity CI build](https://teamcity.jetbrains.com/project.html?tab=projectOverview&projectId=Kotlin)
+ * [follow Kotlin on twitter](http://twitter.com/#!/project_kotlin)
+ * [TeamCity CI build](http://teamcity.jetbrains.com/project.html?projectId=project67&tab=projectOverview)

 ## Editing Kotlin

- * [Kotlin IntelliJ IDEA Plugin](http://hadihariri.com/2012/02/17/the-kotlin-journey-part-i-getting-things-set-up/)
+ * [Kotlin IDEA Plugin](http://hadihariri.com/2012/02/17/the-kotlin-journey-part-i-getting-things-set-up/)
 * [Kotlin TextMate Bundle](https://github.com/k33g/kotlin-textmate-bundle#readme)

 ## Building

-To build this project, first time you try to build you need to run this (requires Apache **Ant 1.8** or higher and **JDK 1.6**):
+To build this project, first time you try to build you need to run this (requires Apache Ant 1.8 or higher):

    ant -f update_dependencies.xml

@@ -41,9 +41,9 @@ which will build the binaries of the compiler and put them into the 'dist' direc

 from 'libraries' directory after building the compiler. Refer to `libraries/ReadMe.md` for details.

-## Working with the project in IntelliJ IDEA
+## Working with the project in IDEA

-The [root kotlin project](https://github.com/JetBrains/kotlin) already has an IntelliJ IDEA project, you can just open it in IntelliJ IDEA.
+The [root kotlin project](https://github.com/JetBrains/kotlin) already has an IDEA project, you can just open it in IDEA.

 You may need to set the Project SDK (File -> Project Structure -> Project).
 You may also need to add `tools.jar` to your SDK: File -> Project Structure -> SDKs -> <Your JDK> -> Classpath,
@@ -52,27 +52,27 @@ then choose the `tools.jar` in the JDK's `lib` directory.
 If you are not dealing with Android, you may need to disable the Android Plugin in order to compile the project.

 Since Kotlin project contains code written in Kotlin itself, you will also need a Kotlin plugin to build the project in IntelliJ IDEA.
-To keep the plugin version in sync with the rest of the team and our [Continuous Integration server](https://teamcity.jetbrains.com/project.html?projectId=Kotlin&tab=projectOverview)
+To keep the plugin version in sync with the rest of the team and our [Continuous Integration server](http://teamcity.jetbrains.com/project.html?projectId=Kotlin&tab=projectOverview)
 you should install the according to the [instructions below](#plugin-for-contributors).

-If you want to have an IntelliJ IDEA installation without the Kotlin plugin which is separate to your default IntelliJ IDEA installation which has the Kotlin
-plugin [see this document](http://devnet.jetbrains.net/docs/DOC-181) which describes how to have mutliple IntelliJ IDEA installations using different configurations and plugin directories.
+If you want to have an IDEA installation without the Kotlin plugin which is separate to your default IDEA installation which has the Kotlin
+plugin [see this document](http://devnet.jetbrains.net/docs/DOC-181) which describes how to have mutliple IDEA installs using different configurations and plugin directories.

-From this root project there are Run/Debug Configurations for running IDEA or the Compiler Tests for example; so if you want to try out the latest and greatest IDEA plugin
+From this root project there are Run/Debug Configurations for running IDEA or the Compiler Tests for example; so if you want to try out the latest greatest IDEA plugin

 * VCS -> Git -> Pull
-* Run IntelliJ IDEA
-* a child IntelliJ IDEA with the Kotlin plugin will then startup
+* Run IDEA
+* a child IDEA with the Kotlin plugin will then startup
 * you can now open the [kotlin libraries project](https://github.com/JetBrains/kotlin/tree/master/libraries) to then work with the various kotlin libraries etc.

-### <a name="pre-built-plugin"></a>Using a pre-built Kotlin IntelliJ IDEA plugin
+### <a name="pre-built-plugin"></a>Using a pre-built Kotlin IDEA plugin

-There are several options for getting Kotlin plugin. A stable version can be obtained as any other plugin for IntelliJ IDEA:
+There are several options for getting Kotlin plugin. A stable version can be obtained as any other plugin for Intellij IDEA:

-    Preferences -> Plugins -> Install JetBrains plugin... -> Search with "Kotlin" string
+    Preferences -> Plugins -> Browse Repositories -> Search with "Kotlin" string

 The most recent version of the plugin can be downloaded from the
-[IDEA Plugin and Tests CI build](https://teamcity.jetbrains.com/project.html?projectId=project67&tab=projectOverview). When downloading is
+[IDEA Plugin and Tests CI build](http://teamcity.jetbrains.com/project.html?projectId=project67&tab=projectOverview). When downloading is
 finished you can install it with "Install plugin from disk...":

    Preferences -> Plugins -> Install plugin from disk...
@@ -81,7 +81,7 @@ You can now open any Kotlin based projects.

 <a name="plugin-for-contributors"></a>
 **Note for contributors**: If you are planning to contribute to Kotlin project you probably want to have locally the same version of plugin that build server is using for building.
-As this version is constantly moving, the best way to always be updated is to let IntelliJ IDEA notify you when it is time to renew your plugin.
+As this version is constantly moving, the best way to always be updated is to let IDEA notify you when it is time to renew you plugin.

 Open 

@@ -89,15 +89,15 @@ Open

 and add the following URL to your repositories:

-    https://teamcity.jetbrains.com/guestAuth/repository/download/bt345/bootstrap.tcbuildtag/updatePlugins.xml
+    http://teamcity.jetbrains.com/guestAuth/repository/download/bt345/bootstrap.tcbuildtag/updatePlugins.xml

 Then update the list of plugins in "Browse Repositories", you'll see two versions of Kotlin there, install the one with the higher version number.

 # Contributing

-We love contributions! There's [lots to do on Kotlin](http://youtrack.jetbrains.com/issues/KT) and on the [standard library](https://youtrack.jetbrains.com/issues/KT?q=Subtask+of%3A+KT-2554+%23Unresolved) so why not chat with us on the [forum](http://devnet.jetbrains.net/community/kotlin?view=discussions) about what you're interested in doing?
+We love contributions! There's [lots to do on kotlin](http://youtrack.jetbrains.com/issues/KT) and on the [standard library](http://youtrack.jetbrains.com/issues/KT?q=%23%7BStandard+Library%7D+-Resolved) so why not chat with us on the [forum](http://devnet.jetbrains.net/community/kotlin?view=discussions) about what you're interested in doing?

-If you want to find some issues to start off with, try [this query](https://youtrack.jetbrains.com/issues?q=tag%3A+%7BUp+For+Grabs%7D+%23Unresolved) which should find all issues that marked as "up-for-grabs".
+If you want to find some issues to start off with, try [this query](http://youtrack.jetbrains.com/issues?q=tag%3A+%7BUp+For+Grabs%7D) which should find all issues that marked as "up-for-grabs".

 Currently only committers can assign issues to themselves so just add a comment if you're starting work on it.

@@ -110,7 +110,7 @@ Also the [JavaScript translation](https://github.com/JetBrains/kotlin/blob/maste

 ## If you want to work on the compiler

-The Kotlin compiler is written in Java and Kotlin (we gradually migrate more and more of it to pure Kotlin). So the easiest way to work on the compiler or IntelliJ IDEA plugin is
+The Kotlin compiler is written in Java and Kotlin (we gradually migrate more and more of it to pure Kotlin). So the easiest way to work on the compiler or IDEA plugin is

 * download a clean [IDEA 14 EAP build](http://confluence.jetbrains.com/display/IDEADEV/IDEA+14+EAP)
 * [install the Kotlin plugin](#pre-built-plugin)
--- a/TeamCityBuild.xml
+++ b/TeamCityBuild.xml
@@ -1,6 +1,5 @@
 <project name="Jet CI Steps" default="none">
    <import file="build.xml" optional="false"/>
-    <import file="replicate_versions.xml" optional="false"/>

    <property name="build.number" value="snapshot"/>
    <property name="jdk16.home" value="${java.home}"/>
@@ -13,17 +12,12 @@
    <property name="plugin.xml.bk" value="${version_substitute_dir}/plugin.xml.bk"/>
    <property name="plugin.xml.versioned" value="${plugin.xml}.versioned" />

-    <property name="android-extensions.plugin.xml" value="plugins/android-idea-plugin/src/META-INF/plugin.xml"/>
-    <property name="android-extensions.plugin.xml.bk" value="${version_substitute_dir}/kotlin-android-extensions.plugin.xml.bk"/>
-    <property name="android-extensions.plugin.xml.versioned" value="${android-extensions.plugin.xml}.versioned" />
-
-    <property name="compiler.version.java" value="compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/KotlinVersion.java"/>
+    <property name="compiler.version.java" value="compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/KotlinVersion.java"/>
    <property name="compiler.version.java.bk" value="${version_substitute_dir}/KotlinVersion.java.bk"/>
    <property name="compiler.version.java.versioned" value="${compiler.version.java}.versioned" />

    <property name="plugin.zip" value="${artifact.output.path}/kotlin-plugin-${build.number}.zip" />
    <property name="bare.plugin.zip" value="${artifact.output.path}/kotlin-bare-plugin-${build.number}.zip" />
-    <property name="android-extensions.zip" value="${artifact.output.path}/kotlin-android-extensions-plugin-${build.number}.zip" />

    <macrodef name="echoprop">
        <attribute name="prop"/>
@@ -87,24 +81,15 @@
          target.file.versioned="${plugin.xml.versioned}"
          test.string="&lt;version&gt;@snapshot@&lt;/version&gt;"/>

-      <substituteVersionInFile
-          target.file="${android-extensions.plugin.xml}"
-          target.file.bk="${android-extensions.plugin.xml.bk}"
-          target.file.versioned="${android-extensions.plugin.xml.versioned}"
-          test.string="&lt;version&gt;@snapshot@&lt;/version&gt;"/>
-
      <substituteVersionInFile
          target.file="${compiler.version.java}"
          target.file.bk="${compiler.version.java.bk}"
          target.file.versioned="${compiler.version.java.versioned}"
          test.string="public static final String VERSION = &quot;@snapshot@&quot;;"/>
-
-      <replicateIdeaVersion target.file="${android-extensions.plugin.xml}" />
    </target>

  <target name="revertTemplateFiles">
      <copy file="${plugin.xml.bk}" tofile="${plugin.xml}" overwrite="true"/>
-      <copy file="${android-extensions.plugin.xml.bk}" tofile="${android-extensions.plugin.xml}" overwrite="true"/>
      <copy file="${compiler.version.java.bk}" tofile="${compiler.version.java}" overwrite="true"/>

      <delete dir="${version_substitute_dir}" quiet="true"/>
@@ -129,46 +114,9 @@

        <zipPlugin filename="${plugin.zip}" dir="Kotlin"/>
        <zipPlugin filename="${bare.plugin.zip}" dir="BareKotlin"/>
-
-        <zip destfile="${android-extensions.zip}">
-            <zipfileset prefix="KotlinAndroidExtensions" dir="${artifact.output.path}/KotlinAndroidExtensions" />
-        </zip>
-        <delete dir="${artifact.output.path}/KotlinAndroidExtensions" quiet="true"/>
    </target>

-    <macrodef name="print-statistic">
-        <attribute name="key"/>
-        <attribute name="value"/>
-
-        <sequential>
-            <echo message="##teamcity[buildStatisticValue key='@{key}' value='@{value}']"/>
-        </sequential>
-    </macrodef>
-
-    <macrodef name="print-file-size-statistic">
-        <attribute name="path"/>
-        <attribute name="file-name"/>
-
-        <sequential>
-            <local name="file.size" />
-            <length file="@{path}/@{file-name}" property="file.size"/>
-            <print-statistic key="@{file-name} size" value="${file.size}"/>
-        </sequential>
-    </macrodef>
-
-    <target name="printStatistics">
-        <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-runtime.jar"/>
-        <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-reflect.jar"/>
-
-        <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-jslib.jar"/>
-        <print-file-size-statistic path="${output}" file-name="kotlin.js"/>
-        <print-file-size-statistic path="${output}" file-name="builtins.js"/>
-        <print-file-size-statistic path="${output}" file-name="builtins.meta.js"/>
-        <print-file-size-statistic path="${output}" file-name="stdlib.js"/>
-        <print-file-size-statistic path="${output}" file-name="stdlib.meta.js"/>
-    </target>
-
-    <target name="post_build" depends="zipArtifacts, revertTemplateFiles, printStatistics"/>
+    <target name="post_build" depends="zipArtifacts, revertTemplateFiles"/>

    <target name="none">
        <fail message="Either specify pre_build or post_build"/>
--- a/_my/_my.iml
+++ b/_my/_my.iml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="intellij-core" level="project" />
+    <orderEntry type="module" module-name="frontend" />
+    <orderEntry type="library" name="idea-full" level="project" />
+    <orderEntry type="module" module-name="compiler-tests" />
+  </component>
+</module>
+
--- a/_my/gen/generated/KotlinParser.java
+++ b/_my/gen/generated/KotlinParser.java
--- a/_my/gen/generated/KotlinTypes.java
+++ b/_my/gen/generated/KotlinTypes.java
@@ -0,0 +1,651 @@
+// This is a generated file. Not intended for manual editing.
+package generated;
+
+import com.intellij.psi.tree.IElementType;
+import com.intellij.psi.PsiElement;
+import com.intellij.lang.ASTNode;
+import kt.KotlinParserDefinition;
+import generated.psi.impl.*;
+
+public interface KotlinTypes {
+
+  IElementType ADDITIVE_EXPRESSION_PLUS = KotlinParserDefinition.createType("ADDITIVE_EXPRESSION_PLUS");
+  IElementType ADDITIVE_OPERATION = KotlinParserDefinition.createType("ADDITIVE_OPERATION");
+  IElementType AND_OPERATION = KotlinParserDefinition.createType("AND_OPERATION");
+  IElementType ANNOTATED_EXPRESSION = KotlinParserDefinition.createType("ANNOTATED_EXPRESSION");
+  IElementType ANNOTATIONS = KotlinParserDefinition.createType("ANNOTATIONS");
+  IElementType ANNOTATION_ENTRY = KotlinParserDefinition.createType("ANNOTATION_ENTRY");
+  IElementType ANONYMOUS_INITIALIZER = KotlinParserDefinition.createType("ANONYMOUS_INITIALIZER");
+  IElementType ARRAY_ACCESS = KotlinParserDefinition.createType("ARRAY_ACCESS");
+  IElementType ASSIGNMENT_EXPRESSION = KotlinParserDefinition.createType("ASSIGNMENT_EXPRESSION");
+  IElementType ASSIGNMENT_OPERATOR = KotlinParserDefinition.createType("ASSIGNMENT_OPERATOR");
+  IElementType ASTERISK = KotlinParserDefinition.createType("ASTERISK");
+  IElementType ATOMIC_PACKAGE = KotlinParserDefinition.createType("ATOMIC_PACKAGE");
+  IElementType BINARY_CONSTANT = KotlinParserDefinition.createType("BINARY_CONSTANT");
+  IElementType BLOCK = KotlinParserDefinition.createType("BLOCK");
+  IElementType BODY = KotlinParserDefinition.createType("BODY");
+  IElementType CALLABLE_REFERENCE = KotlinParserDefinition.createType("CALLABLE_REFERENCE");
+  IElementType CALL_SUFFIX = KotlinParserDefinition.createType("CALL_SUFFIX");
+  IElementType CATCH_BLOCK = KotlinParserDefinition.createType("CATCH_BLOCK");
+  IElementType CHARACTER_CONSTANT = KotlinParserDefinition.createType("CHARACTER_CONSTANT");
+  IElementType CLASS_BODY = KotlinParserDefinition.createType("CLASS_BODY");
+  IElementType CLASS_DECLARATION = KotlinParserDefinition.createType("CLASS_DECLARATION");
+  IElementType CLASS_DECLARATION_LOCAL = KotlinParserDefinition.createType("CLASS_DECLARATION_LOCAL");
+  IElementType CLASS_OBJECT = KotlinParserDefinition.createType("CLASS_OBJECT");
+  IElementType COMPARISON_EXPRESSION = KotlinParserDefinition.createType("COMPARISON_EXPRESSION");
+  IElementType COMPARISON_OPERATION = KotlinParserDefinition.createType("COMPARISON_OPERATION");
+  IElementType CONDITION = KotlinParserDefinition.createType("CONDITION");
+  IElementType CONJUNCTION_PLUS = KotlinParserDefinition.createType("CONJUNCTION_PLUS");
+  IElementType CONSTRUCTOR_CALLEE = KotlinParserDefinition.createType("CONSTRUCTOR_CALLEE");
+  IElementType DELEGATION_SPECIFIER_EXT = KotlinParserDefinition.createType("DELEGATION_SPECIFIER_EXT");
+  IElementType DELEGATOR_SUPER_CALL = KotlinParserDefinition.createType("DELEGATOR_SUPER_CALL");
+  IElementType DELEGATOR_SUPER_CLASS = KotlinParserDefinition.createType("DELEGATOR_SUPER_CLASS");
+  IElementType DISJUNCTION_PLUS = KotlinParserDefinition.createType("DISJUNCTION_PLUS");
+  IElementType DOT_IDENTIFIER = KotlinParserDefinition.createType("DOT_IDENTIFIER");
+  IElementType DOT_QUALIFIED_EXPRESSION = KotlinParserDefinition.createType("DOT_QUALIFIED_EXPRESSION");
+  IElementType DO_WHILE_LOOP = KotlinParserDefinition.createType("DO_WHILE_LOOP");
+  IElementType ELSE_EXPRESSION = KotlinParserDefinition.createType("ELSE_EXPRESSION");
+  IElementType ELVIS_ACCESS_EXPRESSION = KotlinParserDefinition.createType("ELVIS_ACCESS_EXPRESSION");
+  IElementType ELVIS_OPERATION = KotlinParserDefinition.createType("ELVIS_OPERATION");
+  IElementType ENUM_CLASS_BODY = KotlinParserDefinition.createType("ENUM_CLASS_BODY");
+  IElementType ENUM_ENTRY = KotlinParserDefinition.createType("ENUM_ENTRY");
+  IElementType EQUALITY_COMPARISON_EXPRESSION = KotlinParserDefinition.createType("EQUALITY_COMPARISON_EXPRESSION");
+  IElementType EQUALITY_OPERATION = KotlinParserDefinition.createType("EQUALITY_OPERATION");
+  IElementType EXPLICIT_DELEGATION = KotlinParserDefinition.createType("EXPLICIT_DELEGATION");
+  IElementType FIELD_IDENTIFIER_REFERENCE = KotlinParserDefinition.createType("FIELD_IDENTIFIER_REFERENCE");
+  IElementType FINALLY_BLOCK = KotlinParserDefinition.createType("FINALLY_BLOCK");
+  IElementType FLOAT_CONSTANT = KotlinParserDefinition.createType("FLOAT_CONSTANT");
+  IElementType FOR_LOOP = KotlinParserDefinition.createType("FOR_LOOP");
+  IElementType FOR_VALUE_PARAMETER = KotlinParserDefinition.createType("FOR_VALUE_PARAMETER");
+  IElementType FUNCTION = KotlinParserDefinition.createType("FUNCTION");
+  IElementType FUNCTION_LITERAL = KotlinParserDefinition.createType("FUNCTION_LITERAL");
+  IElementType FUNCTION_LITERAL_ARGUMENT = KotlinParserDefinition.createType("FUNCTION_LITERAL_ARGUMENT");
+  IElementType FUNCTION_LITERAL_EXPRESSION = KotlinParserDefinition.createType("FUNCTION_LITERAL_EXPRESSION");
+  IElementType FUNCTION_LITERAL_VALUE_PARAMETER_LIST_1 = KotlinParserDefinition.createType("FUNCTION_LITERAL_VALUE_PARAMETER_LIST_1");
+  IElementType FUNCTION_LITERAL_VALUE_PARAMETER_LIST_2 = KotlinParserDefinition.createType("FUNCTION_LITERAL_VALUE_PARAMETER_LIST_2");
+  IElementType FUNCTION_PARAMETER = KotlinParserDefinition.createType("FUNCTION_PARAMETER");
+  IElementType FUNCTION_TYPE = KotlinParserDefinition.createType("FUNCTION_TYPE");
+  IElementType FUNCTION_TYPE_RECEIVER = KotlinParserDefinition.createType("FUNCTION_TYPE_RECEIVER");
+  IElementType FUNCTION_TYPE_RECEIVER_REFERENCE = KotlinParserDefinition.createType("FUNCTION_TYPE_RECEIVER_REFERENCE");
+  IElementType GETTER = KotlinParserDefinition.createType("GETTER");
+  IElementType IF_EXPRESSION = KotlinParserDefinition.createType("IF_EXPRESSION");
+  IElementType IMPORT_DIRECTIVE = KotlinParserDefinition.createType("IMPORT_DIRECTIVE");
+  IElementType IMPORT_LIST = KotlinParserDefinition.createType("IMPORT_LIST");
+  IElementType INDICES = KotlinParserDefinition.createType("INDICES");
+  IElementType INFIX_FUNCTION_CALL_PLUS = KotlinParserDefinition.createType("INFIX_FUNCTION_CALL_PLUS");
+  IElementType INITIALIZER_EXT = KotlinParserDefinition.createType("INITIALIZER_EXT");
+  IElementType INTEGER_CONSTANT = KotlinParserDefinition.createType("INTEGER_CONSTANT");
+  IElementType IN_OPERATION = KotlinParserDefinition.createType("IN_OPERATION");
+  IElementType IS_OPERATION = KotlinParserDefinition.createType("IS_OPERATION");
+  IElementType JUMP_BREAK = KotlinParserDefinition.createType("JUMP_BREAK");
+  IElementType JUMP_CONTINUE = KotlinParserDefinition.createType("JUMP_CONTINUE");
+  IElementType JUMP_RETURN = KotlinParserDefinition.createType("JUMP_RETURN");
+  IElementType JUMP_THROW = KotlinParserDefinition.createType("JUMP_THROW");
+  IElementType LABEL = KotlinParserDefinition.createType("LABEL");
+  IElementType LABEL_EXPRESSION = KotlinParserDefinition.createType("LABEL_EXPRESSION");
+  IElementType LABEL_LABEL = KotlinParserDefinition.createType("LABEL_LABEL");
+  IElementType LEFT_FUNCTION_TYPE = KotlinParserDefinition.createType("LEFT_FUNCTION_TYPE");
+  IElementType LITERAL_STRING_TEMPLATE_ENTRY = KotlinParserDefinition.createType("LITERAL_STRING_TEMPLATE_ENTRY");
+  IElementType LONG_ANNOTATION = KotlinParserDefinition.createType("LONG_ANNOTATION");
+  IElementType LONG_TEMPLATE = KotlinParserDefinition.createType("LONG_TEMPLATE");
+  IElementType LOOP_RANGE = KotlinParserDefinition.createType("LOOP_RANGE");
+  IElementType MODIFIER_LIST = KotlinParserDefinition.createType("MODIFIER_LIST");
+  IElementType MULTIPLE_VARIABLE_DECLARATIONS = KotlinParserDefinition.createType("MULTIPLE_VARIABLE_DECLARATIONS");
+  IElementType MULTIPLICATIVE_EXPRESSION_PLUS = KotlinParserDefinition.createType("MULTIPLICATIVE_EXPRESSION_PLUS");
+  IElementType MULTIPLICATIVE_OPERATION = KotlinParserDefinition.createType("MULTIPLICATIVE_OPERATION");
+  IElementType NAMED_INFIX_FIRST = KotlinParserDefinition.createType("NAMED_INFIX_FIRST");
+  IElementType NAMED_INFIX_PLUS = KotlinParserDefinition.createType("NAMED_INFIX_PLUS");
+  IElementType NULL = KotlinParserDefinition.createType("NULL");
+  IElementType NULLABLE_TYPE = KotlinParserDefinition.createType("NULLABLE_TYPE");
+  IElementType OBJECT = KotlinParserDefinition.createType("OBJECT");
+  IElementType OBJECT_DECLARATION = KotlinParserDefinition.createType("OBJECT_DECLARATION");
+  IElementType OBJECT_DECLARATION_NAME = KotlinParserDefinition.createType("OBJECT_DECLARATION_NAME");
+  IElementType OBJECT_LITERAL = KotlinParserDefinition.createType("OBJECT_LITERAL");
+  IElementType OBJECT_NAME = KotlinParserDefinition.createType("OBJECT_NAME");
+  IElementType OBJECT_UNNAMED = KotlinParserDefinition.createType("OBJECT_UNNAMED");
+  IElementType OR_OPERATION = KotlinParserDefinition.createType("OR_OPERATION");
+  IElementType PACKAGE_DIRECTIVE = KotlinParserDefinition.createType("PACKAGE_DIRECTIVE");
+  IElementType PACKAGE_HEADER = KotlinParserDefinition.createType("PACKAGE_HEADER");
+  IElementType PARAMETER = KotlinParserDefinition.createType("PARAMETER");
+  IElementType PARAMETER_OR_MODIFIER_TYPE = KotlinParserDefinition.createType("PARAMETER_OR_MODIFIER_TYPE");
+  IElementType PARENTHESIZED_EXPRESSION = KotlinParserDefinition.createType("PARENTHESIZED_EXPRESSION");
+  IElementType PLUS_PLUS_AND_OTHERS_EXPRESSION = KotlinParserDefinition.createType("PLUS_PLUS_AND_OTHERS_EXPRESSION");
+  IElementType PLUS_PLUS_AND_OTHERS_OPERATION = KotlinParserDefinition.createType("PLUS_PLUS_AND_OTHERS_OPERATION");
+  IElementType PREFIX_OPERATION = KotlinParserDefinition.createType("PREFIX_OPERATION");
+  IElementType PREFIX_OPERATION_EXPRESSION = KotlinParserDefinition.createType("PREFIX_OPERATION_EXPRESSION");
+  IElementType PRIMARY_CONSTRUCTOR_MODIFIER_LIST = KotlinParserDefinition.createType("PRIMARY_CONSTRUCTOR_MODIFIER_LIST");
+  IElementType PROPERTY = KotlinParserDefinition.createType("PROPERTY");
+  IElementType PROPERTY_DELEGATE = KotlinParserDefinition.createType("PROPERTY_DELEGATE");
+  IElementType PROPERTY_LOCAL = KotlinParserDefinition.createType("PROPERTY_LOCAL");
+  IElementType RANGE_EXPRESSION_PLUS = KotlinParserDefinition.createType("RANGE_EXPRESSION_PLUS");
+  IElementType RANGE_OPERATION = KotlinParserDefinition.createType("RANGE_OPERATION");
+  IElementType REFERENCE_EXPRESSION = KotlinParserDefinition.createType("REFERENCE_EXPRESSION");
+  IElementType SAFE_ACCESS_EXPRESSION = KotlinParserDefinition.createType("SAFE_ACCESS_EXPRESSION");
+  IElementType SCRIPT = KotlinParserDefinition.createType("SCRIPT");
+  IElementType SELF_TYPE = KotlinParserDefinition.createType("SELF_TYPE");
+  IElementType SETTER = KotlinParserDefinition.createType("SETTER");
+  IElementType SHORT_TEMPLATE_ENTRY = KotlinParserDefinition.createType("SHORT_TEMPLATE_ENTRY");
+  IElementType SIMPLE_NAME_OPERATION = KotlinParserDefinition.createType("SIMPLE_NAME_OPERATION");
+  IElementType SIMPLE_USER_TYPE = KotlinParserDefinition.createType("SIMPLE_USER_TYPE");
+  IElementType SIMPLE_USER_TYPE_ADD = KotlinParserDefinition.createType("SIMPLE_USER_TYPE_ADD");
+  IElementType SINGLE_VALUE_PARAMETER_LIST = KotlinParserDefinition.createType("SINGLE_VALUE_PARAMETER_LIST");
+  IElementType SINGLE_VALUE_PARAMETER_LIST_WITH_BRACKETS = KotlinParserDefinition.createType("SINGLE_VALUE_PARAMETER_LIST_WITH_BRACKETS");
+  IElementType STATEMENTS_BLOCK = KotlinParserDefinition.createType("STATEMENTS_BLOCK");
+  IElementType STRING_TEMPLATE = KotlinParserDefinition.createType("STRING_TEMPLATE");
+  IElementType SUPER_EXPRESSION = KotlinParserDefinition.createType("SUPER_EXPRESSION");
+  IElementType SUPER_REFERENCE = KotlinParserDefinition.createType("SUPER_REFERENCE");
+  IElementType THEN_EXPRESSION = KotlinParserDefinition.createType("THEN_EXPRESSION");
+  IElementType THEN_EXPRESSION_WITH_SEMI = KotlinParserDefinition.createType("THEN_EXPRESSION_WITH_SEMI");
+  IElementType THIS_EXPRESSION = KotlinParserDefinition.createType("THIS_EXPRESSION");
+  IElementType THIS_REFERENCE = KotlinParserDefinition.createType("THIS_REFERENCE");
+  IElementType TRY_BLOCK = KotlinParserDefinition.createType("TRY_BLOCK");
+  IElementType TYPE = KotlinParserDefinition.createType("TYPE");
+  IElementType TYPEDEF = KotlinParserDefinition.createType("TYPEDEF");
+  IElementType TYPE_ARGUMENTS = KotlinParserDefinition.createType("TYPE_ARGUMENTS");
+  IElementType TYPE_ARGUMENT_LIST = KotlinParserDefinition.createType("TYPE_ARGUMENT_LIST");
+  IElementType TYPE_CONSTRAINT = KotlinParserDefinition.createType("TYPE_CONSTRAINT");
+  IElementType TYPE_CONSTRAINT_EXT = KotlinParserDefinition.createType("TYPE_CONSTRAINT_EXT");
+  IElementType TYPE_LIST = KotlinParserDefinition.createType("TYPE_LIST");
+  IElementType TYPE_OPERATION = KotlinParserDefinition.createType("TYPE_OPERATION");
+  IElementType TYPE_PARAMETER = KotlinParserDefinition.createType("TYPE_PARAMETER");
+  IElementType TYPE_PARAMETERS = KotlinParserDefinition.createType("TYPE_PARAMETERS");
+  IElementType TYPE_PROJECTION = KotlinParserDefinition.createType("TYPE_PROJECTION");
+  IElementType TYPE_RHS_PLUS = KotlinParserDefinition.createType("TYPE_RHS_PLUS");
+  IElementType USER_TYPE_REFERENCE = KotlinParserDefinition.createType("USER_TYPE_REFERENCE");
+  IElementType VALUE_ARGUMENT = KotlinParserDefinition.createType("VALUE_ARGUMENT");
+  IElementType VALUE_ARGUMENTS = KotlinParserDefinition.createType("VALUE_ARGUMENTS");
+  IElementType VALUE_ARGUMENT_NAME = KotlinParserDefinition.createType("VALUE_ARGUMENT_NAME");
+  IElementType VALUE_PARAMETERS = KotlinParserDefinition.createType("VALUE_PARAMETERS");
+  IElementType VALUE_PARAMETER_LIST = KotlinParserDefinition.createType("VALUE_PARAMETER_LIST");
+  IElementType VALUE_PARAMETER_NO_TYPE = KotlinParserDefinition.createType("VALUE_PARAMETER_NO_TYPE");
+  IElementType VALUE_PARAMETER_WITH_TYPE = KotlinParserDefinition.createType("VALUE_PARAMETER_WITH_TYPE");
+  IElementType VARIABLE_DECLARATION_ENTRY_EXT = KotlinParserDefinition.createType("VARIABLE_DECLARATION_ENTRY_EXT");
+  IElementType WHEN = KotlinParserDefinition.createType("WHEN");
+  IElementType WHEN_CONDITION_EXPRESSION = KotlinParserDefinition.createType("WHEN_CONDITION_EXPRESSION");
+  IElementType WHEN_CONDITION_IN_RANGE = KotlinParserDefinition.createType("WHEN_CONDITION_IN_RANGE");
+  IElementType WHEN_CONDITION_IS_PATTERN = KotlinParserDefinition.createType("WHEN_CONDITION_IS_PATTERN");
+  IElementType WHEN_ENTRY = KotlinParserDefinition.createType("WHEN_ENTRY");
+  IElementType WHEN_PROPERTY = KotlinParserDefinition.createType("WHEN_PROPERTY");
+  IElementType WHILE_LOOP = KotlinParserDefinition.createType("WHILE_LOOP");
+
+  class Factory {
+    public static PsiElement createElement(ASTNode node) {
+      IElementType type = node.getElementType();
+       if (type == ADDITIVE_EXPRESSION_PLUS) {
+        return new KtAdditiveExpressionPlusImpl(node);
+      }
+      else if (type == ADDITIVE_OPERATION) {
+        return new KtAdditiveOperationImpl(node);
+      }
+      else if (type == AND_OPERATION) {
+        return new KtAndOperationImpl(node);
+      }
+      else if (type == ANNOTATED_EXPRESSION) {
+        return new KtAnnotatedExpressionImpl(node);
+      }
+      else if (type == ANNOTATIONS) {
+        return new KtAnnotationsImpl(node);
+      }
+      else if (type == ANNOTATION_ENTRY) {
+        return new KtAnnotationEntryImpl(node);
+      }
+      else if (type == ANONYMOUS_INITIALIZER) {
+        return new KtAnonymousInitializerImpl(node);
+      }
+      else if (type == ARRAY_ACCESS) {
+        return new KtArrayAccessImpl(node);
+      }
+      else if (type == ASSIGNMENT_EXPRESSION) {
+        return new KtAssignmentExpressionImpl(node);
+      }
+      else if (type == ASSIGNMENT_OPERATOR) {
+        return new KtAssignmentOperatorImpl(node);
+      }
+      else if (type == ASTERISK) {
+        return new KtAsteriskImpl(node);
+      }
+      else if (type == ATOMIC_PACKAGE) {
+        return new KtAtomicPackageImpl(node);
+      }
+      else if (type == BINARY_CONSTANT) {
+        return new KtBinaryConstantImpl(node);
+      }
+      else if (type == BLOCK) {
+        return new KtBlockImpl(node);
+      }
+      else if (type == BODY) {
+        return new KtBodyImpl(node);
+      }
+      else if (type == CALLABLE_REFERENCE) {
+        return new KtCallableReferenceImpl(node);
+      }
+      else if (type == CALL_SUFFIX) {
+        return new KtCallSuffixImpl(node);
+      }
+      else if (type == CATCH_BLOCK) {
+        return new KtCatchBlockImpl(node);
+      }
+      else if (type == CHARACTER_CONSTANT) {
+        return new KtCharacterConstantImpl(node);
+      }
+      else if (type == CLASS_BODY) {
+        return new KtClassBodyImpl(node);
+      }
+      else if (type == CLASS_DECLARATION) {
+        return new KtClassDeclarationImpl(node);
+      }
+      else if (type == CLASS_DECLARATION_LOCAL) {
+        return new KtClassDeclarationLocalImpl(node);
+      }
+      else if (type == CLASS_OBJECT) {
+        return new KtClassObjectImpl(node);
+      }
+      else if (type == COMPARISON_EXPRESSION) {
+        return new KtComparisonExpressionImpl(node);
+      }
+      else if (type == COMPARISON_OPERATION) {
+        return new KtComparisonOperationImpl(node);
+      }
+      else if (type == CONDITION) {
+        return new KtConditionImpl(node);
+      }
+      else if (type == CONJUNCTION_PLUS) {
+        return new KtConjunctionPlusImpl(node);
+      }
+      else if (type == CONSTRUCTOR_CALLEE) {
+        return new KtConstructorCalleeImpl(node);
+      }
+      else if (type == DELEGATION_SPECIFIER_EXT) {
+        return new KtDelegationSpecifierExtImpl(node);
+      }
+      else if (type == DELEGATOR_SUPER_CALL) {
+        return new KtDelegatorSuperCallImpl(node);
+      }
+      else if (type == DELEGATOR_SUPER_CLASS) {
+        return new KtDelegatorSuperClassImpl(node);
+      }
+      else if (type == DISJUNCTION_PLUS) {
+        return new KtDisjunctionPlusImpl(node);
+      }
+      else if (type == DOT_IDENTIFIER) {
+        return new KtDotIdentifierImpl(node);
+      }
+      else if (type == DOT_QUALIFIED_EXPRESSION) {
+        return new KtDotQualifiedExpressionImpl(node);
+      }
+      else if (type == DO_WHILE_LOOP) {
+        return new KtDoWhileLoopImpl(node);
+      }
+      else if (type == ELSE_EXPRESSION) {
+        return new KtElseExpressionImpl(node);
+      }
+      else if (type == ELVIS_ACCESS_EXPRESSION) {
+        return new KtElvisAccessExpressionImpl(node);
+      }
+      else if (type == ELVIS_OPERATION) {
+        return new KtElvisOperationImpl(node);
+      }
+      else if (type == ENUM_CLASS_BODY) {
+        return new KtEnumClassBodyImpl(node);
+      }
+      else if (type == ENUM_ENTRY) {
+        return new KtEnumEntryImpl(node);
+      }
+      else if (type == EQUALITY_COMPARISON_EXPRESSION) {
+        return new KtEqualityComparisonExpressionImpl(node);
+      }
+      else if (type == EQUALITY_OPERATION) {
+        return new KtEqualityOperationImpl(node);
+      }
+      else if (type == EXPLICIT_DELEGATION) {
+        return new KtExplicitDelegationImpl(node);
+      }
+      else if (type == FIELD_IDENTIFIER_REFERENCE) {
+        return new KtFieldIdentifierReferenceImpl(node);
+      }
+      else if (type == FINALLY_BLOCK) {
+        return new KtFinallyBlockImpl(node);
+      }
+      else if (type == FLOAT_CONSTANT) {
+        return new KtFloatConstantImpl(node);
+      }
+      else if (type == FOR_LOOP) {
+        return new KtForLoopImpl(node);
+      }
+      else if (type == FOR_VALUE_PARAMETER) {
+        return new KtForValueParameterImpl(node);
+      }
+      else if (type == FUNCTION) {
+        return new KtFunctionImpl(node);
+      }
+      else if (type == FUNCTION_LITERAL) {
+        return new KtFunctionLiteralImpl(node);
+      }
+      else if (type == FUNCTION_LITERAL_ARGUMENT) {
+        return new KtFunctionLiteralArgumentImpl(node);
+      }
+      else if (type == FUNCTION_LITERAL_EXPRESSION) {
+        return new KtFunctionLiteralExpressionImpl(node);
+      }
+      else if (type == FUNCTION_LITERAL_VALUE_PARAMETER_LIST_1) {
+        return new KtFunctionLiteralValueParameterList1Impl(node);
+      }
+      else if (type == FUNCTION_LITERAL_VALUE_PARAMETER_LIST_2) {
+        return new KtFunctionLiteralValueParameterList2Impl(node);
+      }
+      else if (type == FUNCTION_PARAMETER) {
+        return new KtFunctionParameterImpl(node);
+      }
+      else if (type == FUNCTION_TYPE) {
+        return new KtFunctionTypeImpl(node);
+      }
+      else if (type == FUNCTION_TYPE_RECEIVER) {
+        return new KtFunctionTypeReceiverImpl(node);
+      }
+      else if (type == FUNCTION_TYPE_RECEIVER_REFERENCE) {
+        return new KtFunctionTypeReceiverReferenceImpl(node);
+      }
+      else if (type == GETTER) {
+        return new KtGetterImpl(node);
+      }
+      else if (type == IF_EXPRESSION) {
+        return new KtIfExpressionImpl(node);
+      }
+      else if (type == IMPORT_DIRECTIVE) {
+        return new KtImportDirectiveImpl(node);
+      }
+      else if (type == IMPORT_LIST) {
+        return new KtImportListImpl(node);
+      }
+      else if (type == INDICES) {
+        return new KtIndicesImpl(node);
+      }
+      else if (type == INFIX_FUNCTION_CALL_PLUS) {
+        return new KtInfixFunctionCallPlusImpl(node);
+      }
+      else if (type == INITIALIZER_EXT) {
+        return new KtInitializerExtImpl(node);
+      }
+      else if (type == INTEGER_CONSTANT) {
+        return new KtIntegerConstantImpl(node);
+      }
+      else if (type == IN_OPERATION) {
+        return new KtInOperationImpl(node);
+      }
+      else if (type == IS_OPERATION) {
+        return new KtIsOperationImpl(node);
+      }
+      else if (type == JUMP_BREAK) {
+        return new KtJumpBreakImpl(node);
+      }
+      else if (type == JUMP_CONTINUE) {
+        return new KtJumpContinueImpl(node);
+      }
+      else if (type == JUMP_RETURN) {
+        return new KtJumpReturnImpl(node);
+      }
+      else if (type == JUMP_THROW) {
+        return new KtJumpThrowImpl(node);
+      }
+      else if (type == LABEL) {
+        return new KtLabelImpl(node);
+      }
+      else if (type == LABEL_EXPRESSION) {
+        return new KtLabelExpressionImpl(node);
+      }
+      else if (type == LABEL_LABEL) {
+        return new KtLabelLabelImpl(node);
+      }
+      else if (type == LEFT_FUNCTION_TYPE) {
+        return new KtLeftFunctionTypeImpl(node);
+      }
+      else if (type == LITERAL_STRING_TEMPLATE_ENTRY) {
+        return new KtLiteralStringTemplateEntryImpl(node);
+      }
+      else if (type == LONG_ANNOTATION) {
+        return new KtLongAnnotationImpl(node);
+      }
+      else if (type == LONG_TEMPLATE) {
+        return new KtLongTemplateImpl(node);
+      }
+      else if (type == LOOP_RANGE) {
+        return new KtLoopRangeImpl(node);
+      }
+      else if (type == MODIFIER_LIST) {
+        return new KtModifierListImpl(node);
+      }
+      else if (type == MULTIPLE_VARIABLE_DECLARATIONS) {
+        return new KtMultipleVariableDeclarationsImpl(node);
+      }
+      else if (type == MULTIPLICATIVE_EXPRESSION_PLUS) {
+        return new KtMultiplicativeExpressionPlusImpl(node);
+      }
+      else if (type == MULTIPLICATIVE_OPERATION) {
+        return new KtMultiplicativeOperationImpl(node);
+      }
+      else if (type == NAMED_INFIX_FIRST) {
+        return new KtNamedInfixFirstImpl(node);
+      }
+      else if (type == NAMED_INFIX_PLUS) {
+        return new KtNamedInfixPlusImpl(node);
+      }
+      else if (type == NULL) {
+        return new KtNullImpl(node);
+      }
+      else if (type == NULLABLE_TYPE) {
+        return new KtNullableTypeImpl(node);
+      }
+      else if (type == OBJECT) {
+        return new KtObjectImpl(node);
+      }
+      else if (type == OBJECT_DECLARATION) {
+        return new KtObjectDeclarationImpl(node);
+      }
+      else if (type == OBJECT_DECLARATION_NAME) {
+        return new KtObjectDeclarationNameImpl(node);
+      }
+      else if (type == OBJECT_LITERAL) {
+        return new KtObjectLiteralImpl(node);
+      }
+      else if (type == OBJECT_NAME) {
+        return new KtObjectNameImpl(node);
+      }
+      else if (type == OBJECT_UNNAMED) {
+        return new KtObjectUnnamedImpl(node);
+      }
+      else if (type == OR_OPERATION) {
+        return new KtOrOperationImpl(node);
+      }
+      else if (type == PACKAGE_DIRECTIVE) {
+        return new KtPackageDirectiveImpl(node);
+      }
+      else if (type == PACKAGE_HEADER) {
+        return new KtPackageHeaderImpl(node);
+      }
+      else if (type == PARAMETER) {
+        return new KtParameterImpl(node);
+      }
+      else if (type == PARAMETER_OR_MODIFIER_TYPE) {
+        return new KtParameterOrModifierTypeImpl(node);
+      }
+      else if (type == PARENTHESIZED_EXPRESSION) {
+        return new KtParenthesizedExpressionImpl(node);
+      }
+      else if (type == PLUS_PLUS_AND_OTHERS_EXPRESSION) {
+        return new KtPlusPlusAndOthersExpressionImpl(node);
+      }
+      else if (type == PLUS_PLUS_AND_OTHERS_OPERATION) {
+        return new KtPlusPlusAndOthersOperationImpl(node);
+      }
+      else if (type == PREFIX_OPERATION) {
+        return new KtPrefixOperationImpl(node);
+      }
+      else if (type == PREFIX_OPERATION_EXPRESSION) {
+        return new KtPrefixOperationExpressionImpl(node);
+      }
+      else if (type == PRIMARY_CONSTRUCTOR_MODIFIER_LIST) {
+        return new KtPrimaryConstructorModifierListImpl(node);
+      }
+      else if (type == PROPERTY) {
+        return new KtPropertyImpl(node);
+      }
+      else if (type == PROPERTY_DELEGATE) {
+        return new KtPropertyDelegateImpl(node);
+      }
+      else if (type == PROPERTY_LOCAL) {
+        return new KtPropertyLocalImpl(node);
+      }
+      else if (type == RANGE_EXPRESSION_PLUS) {
+        return new KtRangeExpressionPlusImpl(node);
+      }
+      else if (type == RANGE_OPERATION) {
+        return new KtRangeOperationImpl(node);
+      }
+      else if (type == REFERENCE_EXPRESSION) {
+        return new KtReferenceExpressionImpl(node);
+      }
+      else if (type == SAFE_ACCESS_EXPRESSION) {
+        return new KtSafeAccessExpressionImpl(node);
+      }
+      else if (type == SCRIPT) {
+        return new KtScriptImpl(node);
+      }
+      else if (type == SELF_TYPE) {
+        return new KtSelfTypeImpl(node);
+      }
+      else if (type == SETTER) {
+        return new KtSetterImpl(node);
+      }
+      else if (type == SHORT_TEMPLATE_ENTRY) {
+        return new KtShortTemplateEntryImpl(node);
+      }
+      else if (type == SIMPLE_NAME_OPERATION) {
+        return new KtSimpleNameOperationImpl(node);
+      }
+      else if (type == SIMPLE_USER_TYPE) {
+        return new KtSimpleUserTypeImpl(node);
+      }
+      else if (type == SIMPLE_USER_TYPE_ADD) {
+        return new KtSimpleUserTypeAddImpl(node);
+      }
+      else if (type == SINGLE_VALUE_PARAMETER_LIST) {
+        return new KtSingleValueParameterListImpl(node);
+      }
+      else if (type == SINGLE_VALUE_PARAMETER_LIST_WITH_BRACKETS) {
+        return new KtSingleValueParameterListWithBracketsImpl(node);
+      }
+      else if (type == STATEMENTS_BLOCK) {
+        return new KtStatementsBlockImpl(node);
+      }
+      else if (type == STRING_TEMPLATE) {
+        return new KtStringTemplateImpl(node);
+      }
+      else if (type == SUPER_EXPRESSION) {
+        return new KtSuperExpressionImpl(node);
+      }
+      else if (type == SUPER_REFERENCE) {
+        return new KtSuperReferenceImpl(node);
+      }
+      else if (type == THEN_EXPRESSION) {
+        return new KtThenExpressionImpl(node);
+      }
+      else if (type == THEN_EXPRESSION_WITH_SEMI) {
+        return new KtThenExpressionWithSemiImpl(node);
+      }
+      else if (type == THIS_EXPRESSION) {
+        return new KtThisExpressionImpl(node);
+      }
+      else if (type == THIS_REFERENCE) {
+        return new KtThisReferenceImpl(node);
+      }
+      else if (type == TRY_BLOCK) {
+        return new KtTryBlockImpl(node);
+      }
+      else if (type == TYPE) {
+        return new KtTypeImpl(node);
+      }
+      else if (type == TYPEDEF) {
+        return new KtTypedefImpl(node);
+      }
+      else if (type == TYPE_ARGUMENTS) {
+        return new KtTypeArgumentsImpl(node);
+      }
+      else if (type == TYPE_ARGUMENT_LIST) {
+        return new KtTypeArgumentListImpl(node);
+      }
+      else if (type == TYPE_CONSTRAINT) {
+        return new KtTypeConstraintImpl(node);
+      }
+      else if (type == TYPE_CONSTRAINT_EXT) {
+        return new KtTypeConstraintExtImpl(node);
+      }
+      else if (type == TYPE_LIST) {
+        return new KtTypeListImpl(node);
+      }
+      else if (type == TYPE_OPERATION) {
+        return new KtTypeOperationImpl(node);
+      }
+      else if (type == TYPE_PARAMETER) {
+        return new KtTypeParameterImpl(node);
+      }
+      else if (type == TYPE_PARAMETERS) {
+        return new KtTypeParametersImpl(node);
+      }
+      else if (type == TYPE_PROJECTION) {
+        return new KtTypeProjectionImpl(node);
+      }
+      else if (type == TYPE_RHS_PLUS) {
+        return new KtTypeRHSPlusImpl(node);
+      }
+      else if (type == USER_TYPE_REFERENCE) {
+        return new KtUserTypeReferenceImpl(node);
+      }
+      else if (type == VALUE_ARGUMENT) {
+        return new KtValueArgumentImpl(node);
+      }
+      else if (type == VALUE_ARGUMENTS) {
+        return new KtValueArgumentsImpl(node);
+      }
+      else if (type == VALUE_ARGUMENT_NAME) {
+        return new KtValueArgumentNameImpl(node);
+      }
+      else if (type == VALUE_PARAMETERS) {
+        return new KtValueParametersImpl(node);
+      }
+      else if (type == VALUE_PARAMETER_LIST) {
+        return new KtValueParameterListImpl(node);
+      }
+      else if (type == VALUE_PARAMETER_NO_TYPE) {
+        return new KtValueParameterNoTypeImpl(node);
+      }
+      else if (type == VALUE_PARAMETER_WITH_TYPE) {
+        return new KtValueParameterWithTypeImpl(node);
+      }
+      else if (type == VARIABLE_DECLARATION_ENTRY_EXT) {
+        return new KtVariableDeclarationEntryExtImpl(node);
+      }
+      else if (type == WHEN) {
+        return new KtWhenImpl(node);
+      }
+      else if (type == WHEN_CONDITION_EXPRESSION) {
+        return new KtWhenConditionExpressionImpl(node);
+      }
+      else if (type == WHEN_CONDITION_IN_RANGE) {
+        return new KtWhenConditionInRangeImpl(node);
+      }
+      else if (type == WHEN_CONDITION_IS_PATTERN) {
+        return new KtWhenConditionIsPatternImpl(node);
+      }
+      else if (type == WHEN_ENTRY) {
+        return new KtWhenEntryImpl(node);
+      }
+      else if (type == WHEN_PROPERTY) {
+        return new KtWhenPropertyImpl(node);
+      }
+      else if (type == WHILE_LOOP) {
+        return new KtWhileLoopImpl(node);
+      }
+      throw new AssertionError("Unknown element type: " + type);
+    }
+  }
+}
--- a/_my/gen/generated/psi/KtAdditiveExpressionPlus.java
+++ b/_my/gen/generated/psi/KtAdditiveExpressionPlus.java
@@ -0,0 +1,127 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtAdditiveExpressionPlus extends PsiElement {
+
+  @NotNull
+  List<KtCharacterConstant> getCharacterConstantList();
+
+  @NotNull
+  List<KtFloatConstant> getFloatConstantList();
+
+  @NotNull
+  List<KtIntegerConstant> getIntegerConstantList();
+
+  @NotNull
+  List<KtNull> getNullList();
+
+  @Nullable
+  KtAdditiveExpressionPlus getAdditiveExpressionPlus();
+
+  @NotNull
+  KtAdditiveOperation getAdditiveOperation();
+
+  @NotNull
+  List<KtAnnotatedExpression> getAnnotatedExpressionList();
+
+  @NotNull
+  List<KtArrayAccess> getArrayAccessList();
+
+  @NotNull
+  List<KtAtomicPackage> getAtomicPackageList();
+
+  @NotNull
+  List<KtBinaryConstant> getBinaryConstantList();
+
+  @NotNull
+  List<KtCallSuffix> getCallSuffixList();
+
+  @NotNull
+  List<KtCallableReference> getCallableReferenceList();
+
+  @NotNull
+  List<KtDoWhileLoop> getDoWhileLoopList();
+
+  @NotNull
+  List<KtDotQualifiedExpression> getDotQualifiedExpressionList();
+
+  @NotNull
+  List<KtElvisAccessExpression> getElvisAccessExpressionList();
+
+  @NotNull
+  List<KtFieldIdentifierReference> getFieldIdentifierReferenceList();
+
+  @NotNull
+  List<KtForLoop> getForLoopList();
+
+  @NotNull
+  List<KtFunctionLiteralExpression> getFunctionLiteralExpressionList();
+
+  @NotNull
+  List<KtIfExpression> getIfExpressionList();
+
+  @NotNull
+  List<KtJumpBreak> getJumpBreakList();
+
+  @NotNull
+  List<KtJumpContinue> getJumpContinueList();
+
+  @NotNull
+  List<KtJumpReturn> getJumpReturnList();
+
+  @NotNull
+  List<KtJumpThrow> getJumpThrowList();
+
+  @NotNull
+  List<KtLabel> getLabelList();
+
+  @NotNull
+  List<KtLabelExpression> getLabelExpressionList();
+
+  @NotNull
+  List<KtMultiplicativeExpressionPlus> getMultiplicativeExpressionPlusList();
+
+  @NotNull
+  List<KtObjectLiteral> getObjectLiteralList();
+
+  @NotNull
+  List<KtParenthesizedExpression> getParenthesizedExpressionList();
+
+  @NotNull
+  List<KtPlusPlusAndOthersExpression> getPlusPlusAndOthersExpressionList();
+
+  @NotNull
+  List<KtPrefixOperationExpression> getPrefixOperationExpressionList();
+
+  @NotNull
+  List<KtReferenceExpression> getReferenceExpressionList();
+
+  @NotNull
+  List<KtSafeAccessExpression> getSafeAccessExpressionList();
+
+  @NotNull
+  List<KtStringTemplate> getStringTemplateList();
+
+  @NotNull
+  List<KtSuperExpression> getSuperExpressionList();
+
+  @NotNull
+  List<KtThisExpression> getThisExpressionList();
+
+  @NotNull
+  List<KtTryBlock> getTryBlockList();
+
+  @NotNull
+  List<KtTypeRHSPlus> getTypeRHSPlusList();
+
+  @NotNull
+  List<KtWhen> getWhenList();
+
+  @NotNull
+  List<KtWhileLoop> getWhileLoopList();
+
+}
--- a/_my/gen/generated/psi/KtAdditiveOperation.java
+++ b/_my/gen/generated/psi/KtAdditiveOperation.java
@@ -0,0 +1,10 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtAdditiveOperation extends PsiElement {
+
+}
--- a/_my/gen/generated/psi/KtAndOperation.java
+++ b/_my/gen/generated/psi/KtAndOperation.java
@@ -0,0 +1,10 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtAndOperation extends PsiElement {
+
+}
--- a/_my/gen/generated/psi/KtAnnotatedExpression.java
+++ b/_my/gen/generated/psi/KtAnnotatedExpression.java
@@ -0,0 +1,121 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtAnnotatedExpression extends PsiElement {
+
+  @Nullable
+  KtCharacterConstant getCharacterConstant();
+
+  @Nullable
+  KtFloatConstant getFloatConstant();
+
+  @Nullable
+  KtIntegerConstant getIntegerConstant();
+
+  @Nullable
+  KtNull getNull();
+
+  @Nullable
+  KtAnnotatedExpression getAnnotatedExpression();
+
+  @Nullable
+  KtAnnotationEntry getAnnotationEntry();
+
+  @Nullable
+  KtArrayAccess getArrayAccess();
+
+  @Nullable
+  KtAtomicPackage getAtomicPackage();
+
+  @Nullable
+  KtBinaryConstant getBinaryConstant();
+
+  @Nullable
+  KtCallSuffix getCallSuffix();
+
+  @Nullable
+  KtCallableReference getCallableReference();
+
+  @Nullable
+  KtDoWhileLoop getDoWhileLoop();
+
+  @Nullable
+  KtDotQualifiedExpression getDotQualifiedExpression();
+
+  @Nullable
+  KtElvisAccessExpression getElvisAccessExpression();
+
+  @Nullable
+  KtFieldIdentifierReference getFieldIdentifierReference();
+
+  @Nullable
+  KtForLoop getForLoop();
+
+  @Nullable
+  KtFunctionLiteralExpression getFunctionLiteralExpression();
+
+  @Nullable
+  KtIfExpression getIfExpression();
+
+  @Nullable
+  KtJumpBreak getJumpBreak();
+
+  @Nullable
+  KtJumpContinue getJumpContinue();
+
+  @Nullable
+  KtJumpReturn getJumpReturn();
+
+  @Nullable
+  KtJumpThrow getJumpThrow();
+
+  @Nullable
+  KtLabel getLabel();
+
+  @Nullable
+  KtLabelExpression getLabelExpression();
+
+  @Nullable
+  KtLongAnnotation getLongAnnotation();
+
+  @Nullable
+  KtObjectLiteral getObjectLiteral();
+
+  @Nullable
+  KtParenthesizedExpression getParenthesizedExpression();
+
+  @Nullable
+  KtPlusPlusAndOthersExpression getPlusPlusAndOthersExpression();
+
+  @Nullable
+  KtPrefixOperationExpression getPrefixOperationExpression();
+
+  @Nullable
+  KtReferenceExpression getReferenceExpression();
+
+  @Nullable
+  KtSafeAccessExpression getSafeAccessExpression();
+
+  @Nullable
+  KtStringTemplate getStringTemplate();
+
+  @Nullable
+  KtSuperExpression getSuperExpression();
+
+  @Nullable
+  KtThisExpression getThisExpression();
+
+  @Nullable
+  KtTryBlock getTryBlock();
+
+  @Nullable
+  KtWhen getWhen();
+
+  @Nullable
+  KtWhileLoop getWhileLoop();
+
+}
--- a/_my/gen/generated/psi/KtAnnotationEntry.java
+++ b/_my/gen/generated/psi/KtAnnotationEntry.java
@@ -0,0 +1,19 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtAnnotationEntry extends PsiElement {
+
+  @NotNull
+  KtConstructorCallee getConstructorCallee();
+
+  @Nullable
+  KtTypeArguments getTypeArguments();
+
+  @Nullable
+  KtValueArguments getValueArguments();
+
+}
--- a/_my/gen/generated/psi/KtAnnotations.java
+++ b/_my/gen/generated/psi/KtAnnotations.java
@@ -0,0 +1,16 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtAnnotations extends PsiElement {
+
+  @NotNull
+  List<KtAnnotationEntry> getAnnotationEntryList();
+
+  @NotNull
+  List<KtLongAnnotation> getLongAnnotationList();
+
+}
--- a/_my/gen/generated/psi/KtAnonymousInitializer.java
+++ b/_my/gen/generated/psi/KtAnonymousInitializer.java
@@ -0,0 +1,16 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtAnonymousInitializer extends PsiElement {
+
+  @NotNull
+  KtBlock getBlock();
+
+  @Nullable
+  KtModifierList getModifierList();
+
+}
--- a/_my/gen/generated/psi/KtArrayAccess.java
+++ b/_my/gen/generated/psi/KtArrayAccess.java
@@ -0,0 +1,106 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtArrayAccess extends PsiElement {
+
+  @Nullable
+  KtCharacterConstant getCharacterConstant();
+
+  @Nullable
+  KtFloatConstant getFloatConstant();
+
+  @Nullable
+  KtIntegerConstant getIntegerConstant();
+
+  @Nullable
+  KtNull getNull();
+
+  @Nullable
+  KtArrayAccess getArrayAccess();
+
+  @Nullable
+  KtAtomicPackage getAtomicPackage();
+
+  @Nullable
+  KtBinaryConstant getBinaryConstant();
+
+  @Nullable
+  KtCallSuffix getCallSuffix();
+
+  @Nullable
+  KtCallableReference getCallableReference();
+
+  @Nullable
+  KtDoWhileLoop getDoWhileLoop();
+
+  @Nullable
+  KtElvisAccessExpression getElvisAccessExpression();
+
+  @Nullable
+  KtFieldIdentifierReference getFieldIdentifierReference();
+
+  @Nullable
+  KtForLoop getForLoop();
+
+  @Nullable
+  KtFunctionLiteralExpression getFunctionLiteralExpression();
+
+  @Nullable
+  KtIfExpression getIfExpression();
+
+  @NotNull
+  KtIndices getIndices();
+
+  @Nullable
+  KtJumpBreak getJumpBreak();
+
+  @Nullable
+  KtJumpContinue getJumpContinue();
+
+  @Nullable
+  KtJumpReturn getJumpReturn();
+
+  @Nullable
+  KtJumpThrow getJumpThrow();
+
+  @Nullable
+  KtLabel getLabel();
+
+  @Nullable
+  KtObjectLiteral getObjectLiteral();
+
+  @Nullable
+  KtParenthesizedExpression getParenthesizedExpression();
+
+  @Nullable
+  KtPlusPlusAndOthersExpression getPlusPlusAndOthersExpression();
+
+  @Nullable
+  KtReferenceExpression getReferenceExpression();
+
+  @Nullable
+  KtSafeAccessExpression getSafeAccessExpression();
+
+  @Nullable
+  KtStringTemplate getStringTemplate();
+
+  @Nullable
+  KtSuperExpression getSuperExpression();
+
+  @Nullable
+  KtThisExpression getThisExpression();
+
+  @Nullable
+  KtTryBlock getTryBlock();
+
+  @Nullable
+  KtWhen getWhen();
+
+  @Nullable
+  KtWhileLoop getWhileLoop();
+
+}
--- a/_my/gen/generated/psi/KtAssignmentExpression.java
+++ b/_my/gen/generated/psi/KtAssignmentExpression.java
@@ -0,0 +1,151 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtAssignmentExpression extends PsiElement {
+
+  @NotNull
+  List<KtCharacterConstant> getCharacterConstantList();
+
+  @NotNull
+  List<KtFloatConstant> getFloatConstantList();
+
+  @NotNull
+  List<KtIntegerConstant> getIntegerConstantList();
+
+  @NotNull
+  List<KtNull> getNullList();
+
+  @NotNull
+  List<KtAdditiveExpressionPlus> getAdditiveExpressionPlusList();
+
+  @NotNull
+  List<KtAnnotatedExpression> getAnnotatedExpressionList();
+
+  @NotNull
+  List<KtArrayAccess> getArrayAccessList();
+
+  @NotNull
+  List<KtAssignmentOperator> getAssignmentOperatorList();
+
+  @NotNull
+  List<KtAtomicPackage> getAtomicPackageList();
+
+  @NotNull
+  List<KtBinaryConstant> getBinaryConstantList();
+
+  @NotNull
+  List<KtCallSuffix> getCallSuffixList();
+
+  @NotNull
+  List<KtCallableReference> getCallableReferenceList();
+
+  @NotNull
+  List<KtComparisonExpression> getComparisonExpressionList();
+
+  @NotNull
+  List<KtConjunctionPlus> getConjunctionPlusList();
+
+  @NotNull
+  List<KtDisjunctionPlus> getDisjunctionPlusList();
+
+  @NotNull
+  List<KtDoWhileLoop> getDoWhileLoopList();
+
+  @NotNull
+  List<KtDotQualifiedExpression> getDotQualifiedExpressionList();
+
+  @NotNull
+  List<KtElvisAccessExpression> getElvisAccessExpressionList();
+
+  @NotNull
+  List<KtEqualityComparisonExpression> getEqualityComparisonExpressionList();
+
+  @NotNull
+  List<KtFieldIdentifierReference> getFieldIdentifierReferenceList();
+
+  @NotNull
+  List<KtForLoop> getForLoopList();
+
+  @NotNull
+  List<KtFunctionLiteralExpression> getFunctionLiteralExpressionList();
+
+  @NotNull
+  List<KtIfExpression> getIfExpressionList();
+
+  @NotNull
+  List<KtInfixFunctionCallPlus> getInfixFunctionCallPlusList();
+
+  @NotNull
+  List<KtJumpBreak> getJumpBreakList();
+
+  @NotNull
+  List<KtJumpContinue> getJumpContinueList();
+
+  @NotNull
+  List<KtJumpReturn> getJumpReturnList();
+
+  @NotNull
+  List<KtJumpThrow> getJumpThrowList();
+
+  @NotNull
+  List<KtLabel> getLabelList();
+
+  @NotNull
+  List<KtLabelExpression> getLabelExpressionList();
+
+  @NotNull
+  List<KtMultiplicativeExpressionPlus> getMultiplicativeExpressionPlusList();
+
+  @NotNull
+  List<KtNamedInfixFirst> getNamedInfixFirstList();
+
+  @NotNull
+  List<KtNamedInfixPlus> getNamedInfixPlusList();
+
+  @NotNull
+  List<KtObjectLiteral> getObjectLiteralList();
+
+  @NotNull
+  List<KtParenthesizedExpression> getParenthesizedExpressionList();
+
+  @NotNull
+  List<KtPlusPlusAndOthersExpression> getPlusPlusAndOthersExpressionList();
+
+  @NotNull
+  List<KtPrefixOperationExpression> getPrefixOperationExpressionList();
+
+  @NotNull
+  List<KtRangeExpressionPlus> getRangeExpressionPlusList();
+
+  @NotNull
+  List<KtReferenceExpression> getReferenceExpressionList();
+
+  @NotNull
+  List<KtSafeAccessExpression> getSafeAccessExpressionList();
+
+  @NotNull
+  List<KtStringTemplate> getStringTemplateList();
+
+  @NotNull
+  List<KtSuperExpression> getSuperExpressionList();
+
+  @NotNull
+  List<KtThisExpression> getThisExpressionList();
+
+  @NotNull
+  List<KtTryBlock> getTryBlockList();
+
+  @NotNull
+  List<KtTypeRHSPlus> getTypeRHSPlusList();
+
+  @NotNull
+  List<KtWhen> getWhenList();
+
+  @NotNull
+  List<KtWhileLoop> getWhileLoopList();
+
+}
--- a/_my/gen/generated/psi/KtAssignmentOperator.java
+++ b/_my/gen/generated/psi/KtAssignmentOperator.java
@@ -0,0 +1,10 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtAssignmentOperator extends PsiElement {
+
+}
--- a/_my/gen/generated/psi/KtAsterisk.java
+++ b/_my/gen/generated/psi/KtAsterisk.java
@@ -0,0 +1,10 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtAsterisk extends PsiElement {
+
+}
--- a/_my/gen/generated/psi/KtAtomicPackage.java
+++ b/_my/gen/generated/psi/KtAtomicPackage.java
@@ -0,0 +1,10 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtAtomicPackage extends PsiElement {
+
+}
--- a/_my/gen/generated/psi/KtBinaryConstant.java
+++ b/_my/gen/generated/psi/KtBinaryConstant.java
@@ -0,0 +1,10 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtBinaryConstant extends PsiElement {
+
+}
--- a/_my/gen/generated/psi/KtBlock.java
+++ b/_my/gen/generated/psi/KtBlock.java
@@ -0,0 +1,166 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtBlock extends PsiElement {
+
+  @NotNull
+  List<KtCharacterConstant> getCharacterConstantList();
+
+  @NotNull
+  List<KtFloatConstant> getFloatConstantList();
+
+  @NotNull
+  List<KtIntegerConstant> getIntegerConstantList();
+
+  @NotNull
+  List<KtNull> getNullList();
+
+  @NotNull
+  List<KtAdditiveExpressionPlus> getAdditiveExpressionPlusList();
+
+  @NotNull
+  List<KtAnnotatedExpression> getAnnotatedExpressionList();
+
+  @NotNull
+  List<KtArrayAccess> getArrayAccessList();
+
+  @NotNull
+  List<KtAssignmentExpression> getAssignmentExpressionList();
+
+  @NotNull
+  List<KtAtomicPackage> getAtomicPackageList();
+
+  @NotNull
+  List<KtBinaryConstant> getBinaryConstantList();
+
+  @NotNull
+  List<KtCallSuffix> getCallSuffixList();
+
+  @NotNull
+  List<KtCallableReference> getCallableReferenceList();
+
+  @NotNull
+  List<KtClassDeclarationLocal> getClassDeclarationLocalList();
+
+  @NotNull
+  List<KtComparisonExpression> getComparisonExpressionList();
+
+  @NotNull
+  List<KtConjunctionPlus> getConjunctionPlusList();
+
+  @NotNull
+  List<KtDisjunctionPlus> getDisjunctionPlusList();
+
+  @NotNull
+  List<KtDoWhileLoop> getDoWhileLoopList();
+
+  @NotNull
+  List<KtDotQualifiedExpression> getDotQualifiedExpressionList();
+
+  @NotNull
+  List<KtElvisAccessExpression> getElvisAccessExpressionList();
+
+  @NotNull
+  List<KtEqualityComparisonExpression> getEqualityComparisonExpressionList();
+
+  @NotNull
+  List<KtFieldIdentifierReference> getFieldIdentifierReferenceList();
+
+  @NotNull
+  List<KtForLoop> getForLoopList();
+
+  @NotNull
+  List<KtFunction> getFunctionList();
+
+  @NotNull
+  List<KtFunctionLiteralExpression> getFunctionLiteralExpressionList();
+
+  @NotNull
+  List<KtIfExpression> getIfExpressionList();
+
+  @NotNull
+  List<KtInfixFunctionCallPlus> getInfixFunctionCallPlusList();
+
+  @NotNull
+  List<KtJumpBreak> getJumpBreakList();
+
+  @NotNull
+  List<KtJumpContinue> getJumpContinueList();
+
+  @NotNull
+  List<KtJumpReturn> getJumpReturnList();
+
+  @NotNull
+  List<KtJumpThrow> getJumpThrowList();
+
+  @NotNull
+  List<KtLabel> getLabelList();
+
+  @NotNull
+  List<KtLabelExpression> getLabelExpressionList();
+
+  @NotNull
+  List<KtMultiplicativeExpressionPlus> getMultiplicativeExpressionPlusList();
+
+  @NotNull
+  List<KtNamedInfixFirst> getNamedInfixFirstList();
+
+  @NotNull
+  List<KtNamedInfixPlus> getNamedInfixPlusList();
+
+  @NotNull
+  List<KtObject> getObjectList();
+
+  @NotNull
+  List<KtObjectLiteral> getObjectLiteralList();
+
+  @NotNull
+  List<KtParenthesizedExpression> getParenthesizedExpressionList();
+
+  @NotNull
+  List<KtPlusPlusAndOthersExpression> getPlusPlusAndOthersExpressionList();
+
+  @NotNull
+  List<KtPrefixOperationExpression> getPrefixOperationExpressionList();
+
+  @NotNull
+  List<KtPropertyLocal> getPropertyLocalList();
+
+  @NotNull
+  List<KtRangeExpressionPlus> getRangeExpressionPlusList();
+
+  @NotNull
+  List<KtReferenceExpression> getReferenceExpressionList();
+
+  @NotNull
+  List<KtSafeAccessExpression> getSafeAccessExpressionList();
+
+  @NotNull
+  List<KtStringTemplate> getStringTemplateList();
+
+  @NotNull
+  List<KtSuperExpression> getSuperExpressionList();
+
+  @NotNull
+  List<KtThisExpression> getThisExpressionList();
+
+  @NotNull
+  List<KtTryBlock> getTryBlockList();
+
+  @NotNull
+  List<KtTypeRHSPlus> getTypeRHSPlusList();
+
+  @NotNull
+  List<KtTypedef> getTypedefList();
+
+  @NotNull
+  List<KtWhen> getWhenList();
+
+  @NotNull
+  List<KtWhileLoop> getWhileLoopList();
+
+}
--- a/_my/gen/generated/psi/KtBody.java
+++ b/_my/gen/generated/psi/KtBody.java
@@ -0,0 +1,154 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtBody extends PsiElement {
+
+  @NotNull
+  List<KtCharacterConstant> getCharacterConstantList();
+
+  @NotNull
+  List<KtFloatConstant> getFloatConstantList();
+
+  @NotNull
+  List<KtIntegerConstant> getIntegerConstantList();
+
+  @NotNull
+  List<KtNull> getNullList();
+
+  @NotNull
+  List<KtAdditiveExpressionPlus> getAdditiveExpressionPlusList();
+
+  @NotNull
+  List<KtAnnotatedExpression> getAnnotatedExpressionList();
+
+  @NotNull
+  List<KtArrayAccess> getArrayAccessList();
+
+  @Nullable
+  KtAssignmentExpression getAssignmentExpression();
+
+  @NotNull
+  List<KtAtomicPackage> getAtomicPackageList();
+
+  @NotNull
+  List<KtBinaryConstant> getBinaryConstantList();
+
+  @Nullable
+  KtBlock getBlock();
+
+  @NotNull
+  List<KtCallSuffix> getCallSuffixList();
+
+  @NotNull
+  List<KtCallableReference> getCallableReferenceList();
+
+  @Nullable
+  KtComparisonExpression getComparisonExpression();
+
+  @Nullable
+  KtConjunctionPlus getConjunctionPlus();
+
+  @Nullable
+  KtDisjunctionPlus getDisjunctionPlus();
+
+  @NotNull
+  List<KtDoWhileLoop> getDoWhileLoopList();
+
+  @NotNull
+  List<KtDotQualifiedExpression> getDotQualifiedExpressionList();
+
+  @NotNull
+  List<KtElvisAccessExpression> getElvisAccessExpressionList();
+
+  @Nullable
+  KtEqualityComparisonExpression getEqualityComparisonExpression();
+
+  @NotNull
+  List<KtFieldIdentifierReference> getFieldIdentifierReferenceList();
+
+  @NotNull
+  List<KtForLoop> getForLoopList();
+
+  @NotNull
+  List<KtFunctionLiteralExpression> getFunctionLiteralExpressionList();
+
+  @NotNull
+  List<KtIfExpression> getIfExpressionList();
+
+  @NotNull
+  List<KtInfixFunctionCallPlus> getInfixFunctionCallPlusList();
+
+  @NotNull
+  List<KtJumpBreak> getJumpBreakList();
+
+  @NotNull
+  List<KtJumpContinue> getJumpContinueList();
+
+  @NotNull
+  List<KtJumpReturn> getJumpReturnList();
+
+  @NotNull
+  List<KtJumpThrow> getJumpThrowList();
+
+  @NotNull
+  List<KtLabel> getLabelList();
+
+  @NotNull
+  List<KtLabelExpression> getLabelExpressionList();
+
+  @NotNull
+  List<KtMultiplicativeExpressionPlus> getMultiplicativeExpressionPlusList();
+
+  @Nullable
+  KtNamedInfixFirst getNamedInfixFirst();
+
+  @Nullable
+  KtNamedInfixPlus getNamedInfixPlus();
+
+  @NotNull
+  List<KtObjectLiteral> getObjectLiteralList();
+
+  @NotNull
+  List<KtParenthesizedExpression> getParenthesizedExpressionList();
+
+  @NotNull
+  List<KtPlusPlusAndOthersExpression> getPlusPlusAndOthersExpressionList();
+
+  @NotNull
+  List<KtPrefixOperationExpression> getPrefixOperationExpressionList();
+
+  @NotNull
+  List<KtRangeExpressionPlus> getRangeExpressionPlusList();
+
+  @NotNull
+  List<KtReferenceExpression> getReferenceExpressionList();
+
+  @NotNull
+  List<KtSafeAccessExpression> getSafeAccessExpressionList();
+
+  @NotNull
+  List<KtStringTemplate> getStringTemplateList();
+
+  @NotNull
+  List<KtSuperExpression> getSuperExpressionList();
+
+  @NotNull
+  List<KtThisExpression> getThisExpressionList();
+
+  @NotNull
+  List<KtTryBlock> getTryBlockList();
+
+  @NotNull
+  List<KtTypeRHSPlus> getTypeRHSPlusList();
+
+  @NotNull
+  List<KtWhen> getWhenList();
+
+  @NotNull
+  List<KtWhileLoop> getWhileLoopList();
+
+}
--- a/_my/gen/generated/psi/KtCallSuffix.java
+++ b/_my/gen/generated/psi/KtCallSuffix.java
@@ -0,0 +1,112 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtCallSuffix extends PsiElement {
+
+  @Nullable
+  KtCharacterConstant getCharacterConstant();
+
+  @Nullable
+  KtFloatConstant getFloatConstant();
+
+  @Nullable
+  KtIntegerConstant getIntegerConstant();
+
+  @Nullable
+  KtNull getNull();
+
+  @Nullable
+  KtArrayAccess getArrayAccess();
+
+  @Nullable
+  KtAtomicPackage getAtomicPackage();
+
+  @Nullable
+  KtBinaryConstant getBinaryConstant();
+
+  @Nullable
+  KtCallSuffix getCallSuffix();
+
+  @Nullable
+  KtCallableReference getCallableReference();
+
+  @Nullable
+  KtDoWhileLoop getDoWhileLoop();
+
+  @Nullable
+  KtElvisAccessExpression getElvisAccessExpression();
+
+  @Nullable
+  KtFieldIdentifierReference getFieldIdentifierReference();
+
+  @Nullable
+  KtForLoop getForLoop();
+
+  @NotNull
+  List<KtFunctionLiteralArgument> getFunctionLiteralArgumentList();
+
+  @Nullable
+  KtFunctionLiteralExpression getFunctionLiteralExpression();
+
+  @Nullable
+  KtIfExpression getIfExpression();
+
+  @Nullable
+  KtJumpBreak getJumpBreak();
+
+  @Nullable
+  KtJumpContinue getJumpContinue();
+
+  @Nullable
+  KtJumpReturn getJumpReturn();
+
+  @Nullable
+  KtJumpThrow getJumpThrow();
+
+  @NotNull
+  List<KtLabel> getLabelList();
+
+  @Nullable
+  KtObjectLiteral getObjectLiteral();
+
+  @Nullable
+  KtParenthesizedExpression getParenthesizedExpression();
+
+  @Nullable
+  KtPlusPlusAndOthersExpression getPlusPlusAndOthersExpression();
+
+  @Nullable
+  KtReferenceExpression getReferenceExpression();
+
+  @Nullable
+  KtSafeAccessExpression getSafeAccessExpression();
+
+  @Nullable
+  KtStringTemplate getStringTemplate();
+
+  @Nullable
+  KtSuperExpression getSuperExpression();
+
+  @Nullable
+  KtThisExpression getThisExpression();
+
+  @Nullable
+  KtTryBlock getTryBlock();
+
+  @Nullable
+  KtTypeArgumentList getTypeArgumentList();
+
+  @Nullable
+  KtValueArguments getValueArguments();
+
+  @Nullable
+  KtWhen getWhen();
+
+  @Nullable
+  KtWhileLoop getWhileLoop();
+
+}
--- a/_my/gen/generated/psi/KtCallableReference.java
+++ b/_my/gen/generated/psi/KtCallableReference.java
@@ -0,0 +1,16 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtCallableReference extends PsiElement {
+
+  @Nullable
+  KtSimpleUserType getSimpleUserType();
+
+  @Nullable
+  KtSimpleUserTypeAdd getSimpleUserTypeAdd();
+
+}
--- a/_my/gen/generated/psi/KtCatchBlock.java
+++ b/_my/gen/generated/psi/KtCatchBlock.java
@@ -0,0 +1,16 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtCatchBlock extends PsiElement {
+
+  @NotNull
+  KtBlock getBlock();
+
+  @NotNull
+  KtSingleValueParameterListWithBrackets getSingleValueParameterListWithBrackets();
+
+}
--- a/_my/gen/generated/psi/KtCharacterConstant.java
+++ b/_my/gen/generated/psi/KtCharacterConstant.java
@@ -0,0 +1,10 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtCharacterConstant extends PsiElement {
+
+}
--- a/_my/gen/generated/psi/KtClassBody.java
+++ b/_my/gen/generated/psi/KtClassBody.java
@@ -0,0 +1,31 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtClassBody extends PsiElement {
+
+  @NotNull
+  List<KtAnonymousInitializer> getAnonymousInitializerList();
+
+  @NotNull
+  List<KtClassDeclaration> getClassDeclarationList();
+
+  @NotNull
+  List<KtClassObject> getClassObjectList();
+
+  @NotNull
+  List<KtFunction> getFunctionList();
+
+  @NotNull
+  List<KtObject> getObjectList();
+
+  @NotNull
+  List<KtProperty> getPropertyList();
+
+  @NotNull
+  List<KtTypedef> getTypedefList();
+
+}
--- a/_my/gen/generated/psi/KtClassDeclaration.java
+++ b/_my/gen/generated/psi/KtClassDeclaration.java
@@ -0,0 +1,40 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtClassDeclaration extends PsiElement {
+
+  @NotNull
+  List<KtAnnotationEntry> getAnnotationEntryList();
+
+  @Nullable
+  KtClassBody getClassBody();
+
+  @Nullable
+  KtDelegationSpecifierExt getDelegationSpecifierExt();
+
+  @Nullable
+  KtEnumClassBody getEnumClassBody();
+
+  @NotNull
+  List<KtLongAnnotation> getLongAnnotationList();
+
+  @Nullable
+  KtModifierList getModifierList();
+
+  @Nullable
+  KtPrimaryConstructorModifierList getPrimaryConstructorModifierList();
+
+  @Nullable
+  KtTypeConstraintExt getTypeConstraintExt();
+
+  @Nullable
+  KtTypeParameters getTypeParameters();
+
+  @Nullable
+  KtValueParameters getValueParameters();
+
+}
--- a/_my/gen/generated/psi/KtClassDeclarationLocal.java
+++ b/_my/gen/generated/psi/KtClassDeclarationLocal.java
@@ -0,0 +1,40 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtClassDeclarationLocal extends PsiElement {
+
+  @NotNull
+  List<KtAnnotationEntry> getAnnotationEntryList();
+
+  @Nullable
+  KtClassBody getClassBody();
+
+  @Nullable
+  KtDelegationSpecifierExt getDelegationSpecifierExt();
+
+  @Nullable
+  KtEnumClassBody getEnumClassBody();
+
+  @NotNull
+  List<KtLongAnnotation> getLongAnnotationList();
+
+  @Nullable
+  KtModifierList getModifierList();
+
+  @Nullable
+  KtPrimaryConstructorModifierList getPrimaryConstructorModifierList();
+
+  @Nullable
+  KtTypeConstraintExt getTypeConstraintExt();
+
+  @Nullable
+  KtTypeParameters getTypeParameters();
+
+  @Nullable
+  KtValueParameters getValueParameters();
+
+}
--- a/_my/gen/generated/psi/KtClassObject.java
+++ b/_my/gen/generated/psi/KtClassObject.java
@@ -0,0 +1,16 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtClassObject extends PsiElement {
+
+  @Nullable
+  KtModifierList getModifierList();
+
+  @NotNull
+  KtObjectUnnamed getObjectUnnamed();
+
+}
--- a/_my/gen/generated/psi/KtComparisonExpression.java
+++ b/_my/gen/generated/psi/KtComparisonExpression.java
@@ -0,0 +1,142 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtComparisonExpression extends PsiElement {
+
+  @NotNull
+  List<KtCharacterConstant> getCharacterConstantList();
+
+  @NotNull
+  List<KtFloatConstant> getFloatConstantList();
+
+  @NotNull
+  List<KtIntegerConstant> getIntegerConstantList();
+
+  @NotNull
+  List<KtNull> getNullList();
+
+  @NotNull
+  List<KtAdditiveExpressionPlus> getAdditiveExpressionPlusList();
+
+  @NotNull
+  List<KtAnnotatedExpression> getAnnotatedExpressionList();
+
+  @NotNull
+  List<KtArrayAccess> getArrayAccessList();
+
+  @NotNull
+  List<KtAtomicPackage> getAtomicPackageList();
+
+  @NotNull
+  List<KtBinaryConstant> getBinaryConstantList();
+
+  @NotNull
+  List<KtCallSuffix> getCallSuffixList();
+
+  @NotNull
+  List<KtCallableReference> getCallableReferenceList();
+
+  @Nullable
+  KtComparisonExpression getComparisonExpression();
+
+  @NotNull
+  KtComparisonOperation getComparisonOperation();
+
+  @NotNull
+  List<KtDoWhileLoop> getDoWhileLoopList();
+
+  @NotNull
+  List<KtDotQualifiedExpression> getDotQualifiedExpressionList();
+
+  @NotNull
+  List<KtElvisAccessExpression> getElvisAccessExpressionList();
+
+  @NotNull
+  List<KtFieldIdentifierReference> getFieldIdentifierReferenceList();
+
+  @NotNull
+  List<KtForLoop> getForLoopList();
+
+  @NotNull
+  List<KtFunctionLiteralExpression> getFunctionLiteralExpressionList();
+
+  @NotNull
+  List<KtIfExpression> getIfExpressionList();
+
+  @NotNull
+  List<KtInfixFunctionCallPlus> getInfixFunctionCallPlusList();
+
+  @NotNull
+  List<KtJumpBreak> getJumpBreakList();
+
+  @NotNull
+  List<KtJumpContinue> getJumpContinueList();
+
+  @NotNull
+  List<KtJumpReturn> getJumpReturnList();
+
+  @NotNull
+  List<KtJumpThrow> getJumpThrowList();
+
+  @NotNull
+  List<KtLabel> getLabelList();
+
+  @NotNull
+  List<KtLabelExpression> getLabelExpressionList();
+
+  @NotNull
+  List<KtMultiplicativeExpressionPlus> getMultiplicativeExpressionPlusList();
+
+  @NotNull
+  List<KtNamedInfixFirst> getNamedInfixFirstList();
+
+  @NotNull
+  List<KtNamedInfixPlus> getNamedInfixPlusList();
+
+  @NotNull
+  List<KtObjectLiteral> getObjectLiteralList();
+
+  @NotNull
+  List<KtParenthesizedExpression> getParenthesizedExpressionList();
+
+  @NotNull
+  List<KtPlusPlusAndOthersExpression> getPlusPlusAndOthersExpressionList();
+
+  @NotNull
+  List<KtPrefixOperationExpression> getPrefixOperationExpressionList();
+
+  @NotNull
+  List<KtRangeExpressionPlus> getRangeExpressionPlusList();
+
+  @NotNull
+  List<KtReferenceExpression> getReferenceExpressionList();
+
+  @NotNull
+  List<KtSafeAccessExpression> getSafeAccessExpressionList();
+
+  @NotNull
+  List<KtStringTemplate> getStringTemplateList();
+
+  @NotNull
+  List<KtSuperExpression> getSuperExpressionList();
+
+  @NotNull
+  List<KtThisExpression> getThisExpressionList();
+
+  @NotNull
+  List<KtTryBlock> getTryBlockList();
+
+  @NotNull
+  List<KtTypeRHSPlus> getTypeRHSPlusList();
+
+  @NotNull
+  List<KtWhen> getWhenList();
+
+  @NotNull
+  List<KtWhileLoop> getWhileLoopList();
+
+}
--- a/_my/gen/generated/psi/KtComparisonOperation.java
+++ b/_my/gen/generated/psi/KtComparisonOperation.java
@@ -0,0 +1,10 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtComparisonOperation extends PsiElement {
+
+}
--- a/_my/gen/generated/psi/KtCondition.java
+++ b/_my/gen/generated/psi/KtCondition.java
@@ -0,0 +1,151 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtCondition extends PsiElement {
+
+  @NotNull
+  List<KtCharacterConstant> getCharacterConstantList();
+
+  @NotNull
+  List<KtFloatConstant> getFloatConstantList();
+
+  @NotNull
+  List<KtIntegerConstant> getIntegerConstantList();
+
+  @NotNull
+  List<KtNull> getNullList();
+
+  @NotNull
+  List<KtAdditiveExpressionPlus> getAdditiveExpressionPlusList();
+
+  @NotNull
+  List<KtAnnotatedExpression> getAnnotatedExpressionList();
+
+  @NotNull
+  List<KtArrayAccess> getArrayAccessList();
+
+  @Nullable
+  KtAssignmentExpression getAssignmentExpression();
+
+  @NotNull
+  List<KtAtomicPackage> getAtomicPackageList();
+
+  @NotNull
+  List<KtBinaryConstant> getBinaryConstantList();
+
+  @NotNull
+  List<KtCallSuffix> getCallSuffixList();
+
+  @NotNull
+  List<KtCallableReference> getCallableReferenceList();
+
+  @Nullable
+  KtComparisonExpression getComparisonExpression();
+
+  @Nullable
+  KtConjunctionPlus getConjunctionPlus();
+
+  @Nullable
+  KtDisjunctionPlus getDisjunctionPlus();
+
+  @NotNull
+  List<KtDoWhileLoop> getDoWhileLoopList();
+
+  @NotNull
+  List<KtDotQualifiedExpression> getDotQualifiedExpressionList();
+
+  @NotNull
+  List<KtElvisAccessExpression> getElvisAccessExpressionList();
+
+  @Nullable
+  KtEqualityComparisonExpression getEqualityComparisonExpression();
+
+  @NotNull
+  List<KtFieldIdentifierReference> getFieldIdentifierReferenceList();
+
+  @NotNull
+  List<KtForLoop> getForLoopList();
+
+  @NotNull
+  List<KtFunctionLiteralExpression> getFunctionLiteralExpressionList();
+
+  @NotNull
+  List<KtIfExpression> getIfExpressionList();
+
+  @NotNull
+  List<KtInfixFunctionCallPlus> getInfixFunctionCallPlusList();
+
+  @NotNull
+  List<KtJumpBreak> getJumpBreakList();
+
+  @NotNull
+  List<KtJumpContinue> getJumpContinueList();
+
+  @NotNull
+  List<KtJumpReturn> getJumpReturnList();
+
+  @NotNull
+  List<KtJumpThrow> getJumpThrowList();
+
+  @NotNull
+  List<KtLabel> getLabelList();
+
+  @NotNull
+  List<KtLabelExpression> getLabelExpressionList();
+
+  @NotNull
+  List<KtMultiplicativeExpressionPlus> getMultiplicativeExpressionPlusList();
+
+  @Nullable
+  KtNamedInfixFirst getNamedInfixFirst();
+
+  @Nullable
+  KtNamedInfixPlus getNamedInfixPlus();
+
+  @NotNull
+  List<KtObjectLiteral> getObjectLiteralList();
+
+  @NotNull
+  List<KtParenthesizedExpression> getParenthesizedExpressionList();
+
+  @NotNull
+  List<KtPlusPlusAndOthersExpression> getPlusPlusAndOthersExpressionList();
+
+  @NotNull
+  List<KtPrefixOperationExpression> getPrefixOperationExpressionList();
+
+  @NotNull
+  List<KtRangeExpressionPlus> getRangeExpressionPlusList();
+
+  @NotNull
+  List<KtReferenceExpression> getReferenceExpressionList();
+
+  @NotNull
+  List<KtSafeAccessExpression> getSafeAccessExpressionList();
+
+  @NotNull
+  List<KtStringTemplate> getStringTemplateList();
+
+  @NotNull
+  List<KtSuperExpression> getSuperExpressionList();
+
+  @NotNull
+  List<KtThisExpression> getThisExpressionList();
+
+  @NotNull
+  List<KtTryBlock> getTryBlockList();
+
+  @NotNull
+  List<KtTypeRHSPlus> getTypeRHSPlusList();
+
+  @NotNull
+  List<KtWhen> getWhenList();
+
+  @NotNull
+  List<KtWhileLoop> getWhileLoopList();
+
+}
--- a/_my/gen/generated/psi/KtConjunctionPlus.java
+++ b/_my/gen/generated/psi/KtConjunctionPlus.java
@@ -0,0 +1,148 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtConjunctionPlus extends PsiElement {
+
+  @NotNull
+  KtAndOperation getAndOperation();
+
+  @NotNull
+  List<KtCharacterConstant> getCharacterConstantList();
+
+  @NotNull
+  List<KtFloatConstant> getFloatConstantList();
+
+  @NotNull
+  List<KtIntegerConstant> getIntegerConstantList();
+
+  @NotNull
+  List<KtNull> getNullList();
+
+  @NotNull
+  List<KtAdditiveExpressionPlus> getAdditiveExpressionPlusList();
+
+  @NotNull
+  List<KtAnnotatedExpression> getAnnotatedExpressionList();
+
+  @NotNull
+  List<KtArrayAccess> getArrayAccessList();
+
+  @NotNull
+  List<KtAtomicPackage> getAtomicPackageList();
+
+  @NotNull
+  List<KtBinaryConstant> getBinaryConstantList();
+
+  @NotNull
+  List<KtCallSuffix> getCallSuffixList();
+
+  @NotNull
+  List<KtCallableReference> getCallableReferenceList();
+
+  @NotNull
+  List<KtComparisonExpression> getComparisonExpressionList();
+
+  @Nullable
+  KtConjunctionPlus getConjunctionPlus();
+
+  @NotNull
+  List<KtDoWhileLoop> getDoWhileLoopList();
+
+  @NotNull
+  List<KtDotQualifiedExpression> getDotQualifiedExpressionList();
+
+  @NotNull
+  List<KtElvisAccessExpression> getElvisAccessExpressionList();
+
+  @NotNull
+  List<KtEqualityComparisonExpression> getEqualityComparisonExpressionList();
+
+  @NotNull
+  List<KtFieldIdentifierReference> getFieldIdentifierReferenceList();
+
+  @NotNull
+  List<KtForLoop> getForLoopList();
+
+  @NotNull
+  List<KtFunctionLiteralExpression> getFunctionLiteralExpressionList();
+
+  @NotNull
+  List<KtIfExpression> getIfExpressionList();
+
+  @NotNull
+  List<KtInfixFunctionCallPlus> getInfixFunctionCallPlusList();
+
+  @NotNull
+  List<KtJumpBreak> getJumpBreakList();
+
+  @NotNull
+  List<KtJumpContinue> getJumpContinueList();
+
+  @NotNull
+  List<KtJumpReturn> getJumpReturnList();
+
+  @NotNull
+  List<KtJumpThrow> getJumpThrowList();
+
+  @NotNull
+  List<KtLabel> getLabelList();
+
+  @NotNull
+  List<KtLabelExpression> getLabelExpressionList();
+
+  @NotNull
+  List<KtMultiplicativeExpressionPlus> getMultiplicativeExpressionPlusList();
+
+  @NotNull
+  List<KtNamedInfixFirst> getNamedInfixFirstList();
+
+  @NotNull
+  List<KtNamedInfixPlus> getNamedInfixPlusList();
+
+  @NotNull
+  List<KtObjectLiteral> getObjectLiteralList();
+
+  @NotNull
+  List<KtParenthesizedExpression> getParenthesizedExpressionList();
+
+  @NotNull
+  List<KtPlusPlusAndOthersExpression> getPlusPlusAndOthersExpressionList();
+
+  @NotNull
+  List<KtPrefixOperationExpression> getPrefixOperationExpressionList();
+
+  @NotNull
+  List<KtRangeExpressionPlus> getRangeExpressionPlusList();
+
+  @NotNull
+  List<KtReferenceExpression> getReferenceExpressionList();
+
+  @NotNull
+  List<KtSafeAccessExpression> getSafeAccessExpressionList();
+
+  @NotNull
+  List<KtStringTemplate> getStringTemplateList();
+
+  @NotNull
+  List<KtSuperExpression> getSuperExpressionList();
+
+  @NotNull
+  List<KtThisExpression> getThisExpressionList();
+
+  @NotNull
+  List<KtTryBlock> getTryBlockList();
+
+  @NotNull
+  List<KtTypeRHSPlus> getTypeRHSPlusList();
+
+  @NotNull
+  List<KtWhen> getWhenList();
+
+  @NotNull
+  List<KtWhileLoop> getWhileLoopList();
+
+}
--- a/_my/gen/generated/psi/KtConstructorCallee.java
+++ b/_my/gen/generated/psi/KtConstructorCallee.java
@@ -0,0 +1,13 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtConstructorCallee extends PsiElement {
+
+  @NotNull
+  KtUserTypeReference getUserTypeReference();
+
+}
--- a/_my/gen/generated/psi/KtDelegationSpecifierExt.java
+++ b/_my/gen/generated/psi/KtDelegationSpecifierExt.java
@@ -0,0 +1,19 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtDelegationSpecifierExt extends PsiElement {
+
+  @NotNull
+  List<KtDelegatorSuperCall> getDelegatorSuperCallList();
+
+  @NotNull
+  List<KtDelegatorSuperClass> getDelegatorSuperClassList();
+
+  @NotNull
+  List<KtExplicitDelegation> getExplicitDelegationList();
+
+}
--- a/_my/gen/generated/psi/KtDelegatorSuperCall.java
+++ b/_my/gen/generated/psi/KtDelegatorSuperCall.java
@@ -0,0 +1,25 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtDelegatorSuperCall extends PsiElement {
+
+  @NotNull
+  KtConstructorCallee getConstructorCallee();
+
+  @Nullable
+  KtFunctionLiteral getFunctionLiteral();
+
+  @Nullable
+  KtLabel getLabel();
+
+  @Nullable
+  KtTypeArguments getTypeArguments();
+
+  @Nullable
+  KtValueArguments getValueArguments();
+
+}
--- a/_my/gen/generated/psi/KtDelegatorSuperClass.java
+++ b/_my/gen/generated/psi/KtDelegatorSuperClass.java
@@ -0,0 +1,13 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtDelegatorSuperClass extends PsiElement {
+
+  @NotNull
+  KtUserTypeReference getUserTypeReference();
+
+}
--- a/_my/gen/generated/psi/KtDisjunctionPlus.java
+++ b/_my/gen/generated/psi/KtDisjunctionPlus.java
@@ -0,0 +1,151 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtDisjunctionPlus extends PsiElement {
+
+  @NotNull
+  List<KtCharacterConstant> getCharacterConstantList();
+
+  @NotNull
+  List<KtFloatConstant> getFloatConstantList();
+
+  @NotNull
+  List<KtIntegerConstant> getIntegerConstantList();
+
+  @NotNull
+  List<KtNull> getNullList();
+
+  @NotNull
+  KtOrOperation getOrOperation();
+
+  @NotNull
+  List<KtAdditiveExpressionPlus> getAdditiveExpressionPlusList();
+
+  @NotNull
+  List<KtAnnotatedExpression> getAnnotatedExpressionList();
+
+  @NotNull
+  List<KtArrayAccess> getArrayAccessList();
+
+  @NotNull
+  List<KtAtomicPackage> getAtomicPackageList();
+
+  @NotNull
+  List<KtBinaryConstant> getBinaryConstantList();
+
+  @NotNull
+  List<KtCallSuffix> getCallSuffixList();
+
+  @NotNull
+  List<KtCallableReference> getCallableReferenceList();
+
+  @NotNull
+  List<KtComparisonExpression> getComparisonExpressionList();
+
+  @NotNull
+  List<KtConjunctionPlus> getConjunctionPlusList();
+
+  @Nullable
+  KtDisjunctionPlus getDisjunctionPlus();
+
+  @NotNull
+  List<KtDoWhileLoop> getDoWhileLoopList();
+
+  @NotNull
+  List<KtDotQualifiedExpression> getDotQualifiedExpressionList();
+
+  @NotNull
+  List<KtElvisAccessExpression> getElvisAccessExpressionList();
+
+  @NotNull
+  List<KtEqualityComparisonExpression> getEqualityComparisonExpressionList();
+
+  @NotNull
+  List<KtFieldIdentifierReference> getFieldIdentifierReferenceList();
+
+  @NotNull
+  List<KtForLoop> getForLoopList();
+
+  @NotNull
+  List<KtFunctionLiteralExpression> getFunctionLiteralExpressionList();
+
+  @NotNull
+  List<KtIfExpression> getIfExpressionList();
+
+  @NotNull
+  List<KtInfixFunctionCallPlus> getInfixFunctionCallPlusList();
+
+  @NotNull
+  List<KtJumpBreak> getJumpBreakList();
+
+  @NotNull
+  List<KtJumpContinue> getJumpContinueList();
+
+  @NotNull
+  List<KtJumpReturn> getJumpReturnList();
+
+  @NotNull
+  List<KtJumpThrow> getJumpThrowList();
+
+  @NotNull
+  List<KtLabel> getLabelList();
+
+  @NotNull
+  List<KtLabelExpression> getLabelExpressionList();
+
+  @NotNull
+  List<KtMultiplicativeExpressionPlus> getMultiplicativeExpressionPlusList();
+
+  @NotNull
+  List<KtNamedInfixFirst> getNamedInfixFirstList();
+
+  @NotNull
+  List<KtNamedInfixPlus> getNamedInfixPlusList();
+
+  @NotNull
+  List<KtObjectLiteral> getObjectLiteralList();
+
+  @NotNull
+  List<KtParenthesizedExpression> getParenthesizedExpressionList();
+
+  @NotNull
+  List<KtPlusPlusAndOthersExpression> getPlusPlusAndOthersExpressionList();
+
+  @NotNull
+  List<KtPrefixOperationExpression> getPrefixOperationExpressionList();
+
+  @NotNull
+  List<KtRangeExpressionPlus> getRangeExpressionPlusList();
+
+  @NotNull
+  List<KtReferenceExpression> getReferenceExpressionList();
+
+  @NotNull
+  List<KtSafeAccessExpression> getSafeAccessExpressionList();
+
+  @NotNull
+  List<KtStringTemplate> getStringTemplateList();
+
+  @NotNull
+  List<KtSuperExpression> getSuperExpressionList();
+
+  @NotNull
+  List<KtThisExpression> getThisExpressionList();
+
+  @NotNull
+  List<KtTryBlock> getTryBlockList();
+
+  @NotNull
+  List<KtTypeRHSPlus> getTypeRHSPlusList();
+
+  @NotNull
+  List<KtWhen> getWhenList();
+
+  @NotNull
+  List<KtWhileLoop> getWhileLoopList();
+
+}
--- a/_my/gen/generated/psi/KtDoWhileLoop.java
+++ b/_my/gen/generated/psi/KtDoWhileLoop.java
@@ -0,0 +1,16 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtDoWhileLoop extends PsiElement {
+
+  @Nullable
+  KtBody getBody();
+
+  @NotNull
+  KtCondition getCondition();
+
+}
--- a/_my/gen/generated/psi/KtDotIdentifier.java
+++ b/_my/gen/generated/psi/KtDotIdentifier.java
@@ -0,0 +1,16 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtDotIdentifier extends PsiElement {
+
+  @Nullable
+  KtDotIdentifier getDotIdentifier();
+
+  @NotNull
+  List<KtReferenceExpression> getReferenceExpressionList();
+
+}
--- a/_my/gen/generated/psi/KtDotQualifiedExpression.java
+++ b/_my/gen/generated/psi/KtDotQualifiedExpression.java
@@ -0,0 +1,106 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtDotQualifiedExpression extends PsiElement {
+
+  @NotNull
+  List<KtCharacterConstant> getCharacterConstantList();
+
+  @NotNull
+  List<KtFloatConstant> getFloatConstantList();
+
+  @NotNull
+  List<KtIntegerConstant> getIntegerConstantList();
+
+  @NotNull
+  List<KtNull> getNullList();
+
+  @NotNull
+  List<KtArrayAccess> getArrayAccessList();
+
+  @NotNull
+  List<KtAtomicPackage> getAtomicPackageList();
+
+  @NotNull
+  List<KtBinaryConstant> getBinaryConstantList();
+
+  @NotNull
+  List<KtCallSuffix> getCallSuffixList();
+
+  @NotNull
+  List<KtCallableReference> getCallableReferenceList();
+
+  @NotNull
+  List<KtDoWhileLoop> getDoWhileLoopList();
+
+  @Nullable
+  KtDotQualifiedExpression getDotQualifiedExpression();
+
+  @NotNull
+  List<KtElvisAccessExpression> getElvisAccessExpressionList();
+
+  @NotNull
+  List<KtFieldIdentifierReference> getFieldIdentifierReferenceList();
+
+  @NotNull
+  List<KtForLoop> getForLoopList();
+
+  @NotNull
+  List<KtFunctionLiteralExpression> getFunctionLiteralExpressionList();
+
+  @NotNull
+  List<KtIfExpression> getIfExpressionList();
+
+  @NotNull
+  List<KtJumpBreak> getJumpBreakList();
+
+  @NotNull
+  List<KtJumpContinue> getJumpContinueList();
+
+  @NotNull
+  List<KtJumpReturn> getJumpReturnList();
+
+  @NotNull
+  List<KtJumpThrow> getJumpThrowList();
+
+  @NotNull
+  List<KtLabel> getLabelList();
+
+  @NotNull
+  List<KtObjectLiteral> getObjectLiteralList();
+
+  @NotNull
+  List<KtParenthesizedExpression> getParenthesizedExpressionList();
+
+  @NotNull
+  List<KtPlusPlusAndOthersExpression> getPlusPlusAndOthersExpressionList();
+
+  @NotNull
+  List<KtReferenceExpression> getReferenceExpressionList();
+
+  @NotNull
+  List<KtSafeAccessExpression> getSafeAccessExpressionList();
+
+  @NotNull
+  List<KtStringTemplate> getStringTemplateList();
+
+  @NotNull
+  List<KtSuperExpression> getSuperExpressionList();
+
+  @NotNull
+  List<KtThisExpression> getThisExpressionList();
+
+  @NotNull
+  List<KtTryBlock> getTryBlockList();
+
+  @NotNull
+  List<KtWhen> getWhenList();
+
+  @NotNull
+  List<KtWhileLoop> getWhileLoopList();
+
+}
--- a/_my/gen/generated/psi/KtElseExpression.java
+++ b/_my/gen/generated/psi/KtElseExpression.java
@@ -0,0 +1,154 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtElseExpression extends PsiElement {
+
+  @NotNull
+  List<KtCharacterConstant> getCharacterConstantList();
+
+  @NotNull
+  List<KtFloatConstant> getFloatConstantList();
+
+  @NotNull
+  List<KtIntegerConstant> getIntegerConstantList();
+
+  @NotNull
+  List<KtNull> getNullList();
+
+  @NotNull
+  List<KtAdditiveExpressionPlus> getAdditiveExpressionPlusList();
+
+  @NotNull
+  List<KtAnnotatedExpression> getAnnotatedExpressionList();
+
+  @NotNull
+  List<KtArrayAccess> getArrayAccessList();
+
+  @Nullable
+  KtAssignmentExpression getAssignmentExpression();
+
+  @NotNull
+  List<KtAtomicPackage> getAtomicPackageList();
+
+  @NotNull
+  List<KtBinaryConstant> getBinaryConstantList();
+
+  @Nullable
+  KtBlock getBlock();
+
+  @NotNull
+  List<KtCallSuffix> getCallSuffixList();
+
+  @NotNull
+  List<KtCallableReference> getCallableReferenceList();
+
+  @Nullable
+  KtComparisonExpression getComparisonExpression();
+
+  @Nullable
+  KtConjunctionPlus getConjunctionPlus();
+
+  @Nullable
+  KtDisjunctionPlus getDisjunctionPlus();
+
+  @NotNull
+  List<KtDoWhileLoop> getDoWhileLoopList();
+
+  @NotNull
+  List<KtDotQualifiedExpression> getDotQualifiedExpressionList();
+
+  @NotNull
+  List<KtElvisAccessExpression> getElvisAccessExpressionList();
+
+  @Nullable
+  KtEqualityComparisonExpression getEqualityComparisonExpression();
+
+  @NotNull
+  List<KtFieldIdentifierReference> getFieldIdentifierReferenceList();
+
+  @NotNull
+  List<KtForLoop> getForLoopList();
+
+  @NotNull
+  List<KtFunctionLiteralExpression> getFunctionLiteralExpressionList();
+
+  @NotNull
+  List<KtIfExpression> getIfExpressionList();
+
+  @NotNull
+  List<KtInfixFunctionCallPlus> getInfixFunctionCallPlusList();
+
+  @NotNull
+  List<KtJumpBreak> getJumpBreakList();
+
+  @NotNull
+  List<KtJumpContinue> getJumpContinueList();
+
+  @NotNull
+  List<KtJumpReturn> getJumpReturnList();
+
+  @NotNull
+  List<KtJumpThrow> getJumpThrowList();
+
+  @NotNull
+  List<KtLabel> getLabelList();
+
+  @NotNull
+  List<KtLabelExpression> getLabelExpressionList();
+
+  @NotNull
+  List<KtMultiplicativeExpressionPlus> getMultiplicativeExpressionPlusList();
+
+  @Nullable
+  KtNamedInfixFirst getNamedInfixFirst();
+
+  @Nullable
+  KtNamedInfixPlus getNamedInfixPlus();
+
+  @NotNull
+  List<KtObjectLiteral> getObjectLiteralList();
+
+  @NotNull
+  List<KtParenthesizedExpression> getParenthesizedExpressionList();
+
+  @NotNull
+  List<KtPlusPlusAndOthersExpression> getPlusPlusAndOthersExpressionList();
+
+  @NotNull
+  List<KtPrefixOperationExpression> getPrefixOperationExpressionList();
+
+  @NotNull
+  List<KtRangeExpressionPlus> getRangeExpressionPlusList();
+
+  @NotNull
+  List<KtReferenceExpression> getReferenceExpressionList();
+
+  @NotNull
+  List<KtSafeAccessExpression> getSafeAccessExpressionList();
+
+  @NotNull
+  List<KtStringTemplate> getStringTemplateList();
+
+  @NotNull
+  List<KtSuperExpression> getSuperExpressionList();
+
+  @NotNull
+  List<KtThisExpression> getThisExpressionList();
+
+  @NotNull
+  List<KtTryBlock> getTryBlockList();
+
+  @NotNull
+  List<KtTypeRHSPlus> getTypeRHSPlusList();
+
+  @NotNull
+  List<KtWhen> getWhenList();
+
+  @NotNull
+  List<KtWhileLoop> getWhileLoopList();
+
+}
--- a/_my/gen/generated/psi/KtElvisAccessExpression.java
+++ b/_my/gen/generated/psi/KtElvisAccessExpression.java
@@ -0,0 +1,106 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtElvisAccessExpression extends PsiElement {
+
+  @NotNull
+  List<KtCharacterConstant> getCharacterConstantList();
+
+  @NotNull
+  List<KtFloatConstant> getFloatConstantList();
+
+  @NotNull
+  List<KtIntegerConstant> getIntegerConstantList();
+
+  @NotNull
+  List<KtNull> getNullList();
+
+  @Nullable
+  KtArrayAccess getArrayAccess();
+
+  @NotNull
+  List<KtAtomicPackage> getAtomicPackageList();
+
+  @NotNull
+  List<KtBinaryConstant> getBinaryConstantList();
+
+  @Nullable
+  KtCallSuffix getCallSuffix();
+
+  @NotNull
+  List<KtCallableReference> getCallableReferenceList();
+
+  @NotNull
+  List<KtDoWhileLoop> getDoWhileLoopList();
+
+  @Nullable
+  KtElvisAccessExpression getElvisAccessExpression();
+
+  @NotNull
+  KtElvisOperation getElvisOperation();
+
+  @NotNull
+  List<KtFieldIdentifierReference> getFieldIdentifierReferenceList();
+
+  @NotNull
+  List<KtForLoop> getForLoopList();
+
+  @NotNull
+  List<KtFunctionLiteralExpression> getFunctionLiteralExpressionList();
+
+  @NotNull
+  List<KtIfExpression> getIfExpressionList();
+
+  @NotNull
+  List<KtJumpBreak> getJumpBreakList();
+
+  @NotNull
+  List<KtJumpContinue> getJumpContinueList();
+
+  @NotNull
+  List<KtJumpReturn> getJumpReturnList();
+
+  @NotNull
+  List<KtJumpThrow> getJumpThrowList();
+
+  @NotNull
+  List<KtLabel> getLabelList();
+
+  @NotNull
+  List<KtObjectLiteral> getObjectLiteralList();
+
+  @NotNull
+  List<KtParenthesizedExpression> getParenthesizedExpressionList();
+
+  @Nullable
+  KtPlusPlusAndOthersExpression getPlusPlusAndOthersExpression();
+
+  @NotNull
+  List<KtReferenceExpression> getReferenceExpressionList();
+
+  @Nullable
+  KtSafeAccessExpression getSafeAccessExpression();
+
+  @NotNull
+  List<KtStringTemplate> getStringTemplateList();
+
+  @NotNull
+  List<KtSuperExpression> getSuperExpressionList();
+
+  @NotNull
+  List<KtThisExpression> getThisExpressionList();
+
+  @NotNull
+  List<KtTryBlock> getTryBlockList();
+
+  @NotNull
+  List<KtWhen> getWhenList();
+
+  @NotNull
+  List<KtWhileLoop> getWhileLoopList();
+
+}
--- a/_my/gen/generated/psi/KtElvisOperation.java
+++ b/_my/gen/generated/psi/KtElvisOperation.java
@@ -0,0 +1,10 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtElvisOperation extends PsiElement {
+
+}
--- a/_my/gen/generated/psi/KtEnumClassBody.java
+++ b/_my/gen/generated/psi/KtEnumClassBody.java
@@ -0,0 +1,34 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtEnumClassBody extends PsiElement {
+
+  @NotNull
+  List<KtAnonymousInitializer> getAnonymousInitializerList();
+
+  @NotNull
+  List<KtClassDeclaration> getClassDeclarationList();
+
+  @NotNull
+  List<KtClassObject> getClassObjectList();
+
+  @NotNull
+  List<KtEnumEntry> getEnumEntryList();
+
+  @NotNull
+  List<KtFunction> getFunctionList();
+
+  @NotNull
+  List<KtObject> getObjectList();
+
+  @NotNull
+  List<KtProperty> getPropertyList();
+
+  @NotNull
+  List<KtTypedef> getTypedefList();
+
+}
--- a/_my/gen/generated/psi/KtEnumEntry.java
+++ b/_my/gen/generated/psi/KtEnumEntry.java
@@ -0,0 +1,22 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtEnumEntry extends PsiElement {
+
+  @Nullable
+  KtClassBody getClassBody();
+
+  @Nullable
+  KtInitializerExt getInitializerExt();
+
+  @Nullable
+  KtModifierList getModifierList();
+
+  @NotNull
+  KtObjectDeclarationName getObjectDeclarationName();
+
+}
--- a/_my/gen/generated/psi/KtEqualityComparisonExpression.java
+++ b/_my/gen/generated/psi/KtEqualityComparisonExpression.java
@@ -0,0 +1,145 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtEqualityComparisonExpression extends PsiElement {
+
+  @NotNull
+  List<KtCharacterConstant> getCharacterConstantList();
+
+  @NotNull
+  List<KtFloatConstant> getFloatConstantList();
+
+  @NotNull
+  List<KtIntegerConstant> getIntegerConstantList();
+
+  @NotNull
+  List<KtNull> getNullList();
+
+  @NotNull
+  List<KtAdditiveExpressionPlus> getAdditiveExpressionPlusList();
+
+  @NotNull
+  List<KtAnnotatedExpression> getAnnotatedExpressionList();
+
+  @NotNull
+  List<KtArrayAccess> getArrayAccessList();
+
+  @NotNull
+  List<KtAtomicPackage> getAtomicPackageList();
+
+  @NotNull
+  List<KtBinaryConstant> getBinaryConstantList();
+
+  @NotNull
+  List<KtCallSuffix> getCallSuffixList();
+
+  @NotNull
+  List<KtCallableReference> getCallableReferenceList();
+
+  @NotNull
+  List<KtComparisonExpression> getComparisonExpressionList();
+
+  @NotNull
+  List<KtDoWhileLoop> getDoWhileLoopList();
+
+  @NotNull
+  List<KtDotQualifiedExpression> getDotQualifiedExpressionList();
+
+  @NotNull
+  List<KtElvisAccessExpression> getElvisAccessExpressionList();
+
+  @Nullable
+  KtEqualityComparisonExpression getEqualityComparisonExpression();
+
+  @NotNull
+  KtEqualityOperation getEqualityOperation();
+
+  @NotNull
+  List<KtFieldIdentifierReference> getFieldIdentifierReferenceList();
+
+  @NotNull
+  List<KtForLoop> getForLoopList();
+
+  @NotNull
+  List<KtFunctionLiteralExpression> getFunctionLiteralExpressionList();
+
+  @NotNull
+  List<KtIfExpression> getIfExpressionList();
+
+  @NotNull
+  List<KtInfixFunctionCallPlus> getInfixFunctionCallPlusList();
+
+  @NotNull
+  List<KtJumpBreak> getJumpBreakList();
+
+  @NotNull
+  List<KtJumpContinue> getJumpContinueList();
+
+  @NotNull
+  List<KtJumpReturn> getJumpReturnList();
+
+  @NotNull
+  List<KtJumpThrow> getJumpThrowList();
+
+  @NotNull
+  List<KtLabel> getLabelList();
+
+  @NotNull
+  List<KtLabelExpression> getLabelExpressionList();
+
+  @NotNull
+  List<KtMultiplicativeExpressionPlus> getMultiplicativeExpressionPlusList();
+
+  @NotNull
+  List<KtNamedInfixFirst> getNamedInfixFirstList();
+
+  @NotNull
+  List<KtNamedInfixPlus> getNamedInfixPlusList();
+
+  @NotNull
+  List<KtObjectLiteral> getObjectLiteralList();
+
+  @NotNull
+  List<KtParenthesizedExpression> getParenthesizedExpressionList();
+
+  @NotNull
+  List<KtPlusPlusAndOthersExpression> getPlusPlusAndOthersExpressionList();
+
+  @NotNull
+  List<KtPrefixOperationExpression> getPrefixOperationExpressionList();
+
+  @NotNull
+  List<KtRangeExpressionPlus> getRangeExpressionPlusList();
+
+  @NotNull
+  List<KtReferenceExpression> getReferenceExpressionList();
+
+  @NotNull
+  List<KtSafeAccessExpression> getSafeAccessExpressionList();
+
+  @NotNull
+  List<KtStringTemplate> getStringTemplateList();
+
+  @NotNull
+  List<KtSuperExpression> getSuperExpressionList();
+
+  @NotNull
+  List<KtThisExpression> getThisExpressionList();
+
+  @NotNull
+  List<KtTryBlock> getTryBlockList();
+
+  @NotNull
+  List<KtTypeRHSPlus> getTypeRHSPlusList();
+
+  @NotNull
+  List<KtWhen> getWhenList();
+
+  @NotNull
+  List<KtWhileLoop> getWhileLoopList();
+
+}
--- a/_my/gen/generated/psi/KtEqualityOperation.java
+++ b/_my/gen/generated/psi/KtEqualityOperation.java
@@ -0,0 +1,10 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtEqualityOperation extends PsiElement {
+
+}
--- a/_my/gen/generated/psi/KtExplicitDelegation.java
+++ b/_my/gen/generated/psi/KtExplicitDelegation.java
@@ -0,0 +1,154 @@
+// This is a generated file. Not intended for manual editing.
+package generated.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface KtExplicitDelegation extends PsiElement {
+
+  @NotNull
+  List<KtCharacterConstant> getCharacterConstantList();
+
+  @NotNull
+  List<KtFloatConstant> getFloatConstantList();
+
+  @NotNull
+  List<KtIntegerConstant> getIntegerConstantList();
+
+  @NotNull
+  List<KtNull> getNullList();
+
+  @NotNull
+  List<KtAdditiveExpressionPlus> getAdditiveExpressionPlusList();
+
+  @NotNull
+  List<KtAnnotatedExpression> getAnnotatedExpressionList();
+
+  @NotNull
+  List<KtArrayAccess> getArrayAccessList();
+
+  @Nullable
+  KtAssignmentExpression getAssignmentExpression();
+
+  @NotNull
+  List<KtAtomicPackage> getAtomicPackageList();
+
+  @NotNull
+  List<KtBinaryConstant> getBinaryConstantList();
+
+  @NotNull
+  List<KtCallSuffix> getCallSuffixList();
+
+  @NotNull
+  List<KtCallableReference> getCallableReferenceList();
+
+  @Nullable
+  KtComparisonExpression getComparisonExpression();
+
+  @Nullable
+  KtConjunctionPlus getConjunctionPlus();
+
+  @Nullable
+  KtDisjunctionPlus getDisjunctionPlus();
+
+  @NotNull
+  List<KtDoWhileLoop> getDoWhileLoopList();
+
+  @NotNull
+  List<KtDotQualifiedExpression> getDotQualifiedExpressionList();
+
+  @NotNull
+  List<KtElvisAccessExpression> getElvisAccessExpressionList();
+
+  @Nullable
+  KtEqualityComparisonExpression getEqualityComparisonExpression();
+
+  @NotNull
+  List<KtFieldIdentifierReference> getFieldIdentifierReferenceList();
+
+  @NotNull
+  List<KtForLoop> getForLoopList();
+
+  @NotNull
+  List<KtFunctionLiteralExpression> getFunctionLiteralExpressionList();
+
+  @NotNull
+  List<KtIfExpression> getIfExpressionList();
+
+  @NotNull
+  List<KtInfixFunctionCallPlus> getInfixFunctionCallPlusList();
+
+  @NotNull
+  List<KtJumpBreak> getJumpBreakList();
+
+  @NotNull
+  List<KtJumpContinue> getJumpContinueList();
+
+  @NotNull
+  List<KtJumpReturn> getJumpReturnList();
+
+  @NotNull
+  List<KtJumpThrow> getJumpThrowList();
+
+  @NotNull
+  List<KtLabel> getLabelList();
+
+  @NotNull
+  List<KtLabelExpression> getLabelExpressionList();
+
+  @NotNull
+  List<KtMultiplicativeExpressionPlus> getMultiplicativeExpressionPlusList();
+
+  @Nullable
+  KtNamedInfixFirst getNamedInfixFirst();
+
+  @Nullable
+  KtNamedInfixPlus getNamedInfixPlus();
+
+  @NotNull
+  List<KtObjectLiteral> getObjectLiteralList();
+
+  @NotNull
+  List<KtParenthesizedExpression> getParenthesizedExpressionList();
+
+  @NotNull
+  List<KtPlusPlusAndOthersExpression> getPlusPlusAndOthersExpressionList();
+
+  @NotNull
+  List<KtPrefixOperationExpression> getPrefixOperationExpressionList();
+
+  @NotNull
+  List<KtRangeExpressionPlus> getRangeExpressionPlusList();
+
+  @NotNull
+  List<KtReferenceExpression> getReferenceExpressionList();
+
+  @NotNull
+  List<KtSafeAccessExpression> getSafeAccessExpressionList();
+
+  @NotNull
+  List<KtStringTemplate> getStringTemplateList();
+
+  @NotNull
+  List<KtSuperExpression> getSuperExpressionList();
+
+  @NotNull
+  List<KtThisExpression> getThisExpressionList();
+
+  @NotNull
+  List<KtTryBlock> getTryBlockList();
+
+  @NotNull
+  List<KtTypeRHSPlus> getTypeRHSPlusList();
+
+  @NotNull
+  KtUserTypeReference getUserTypeReference();
+
+  @NotNull
+  List<KtWhen> getWhenList();
+
+  @NotNull
+  List<KtWhileLoop> getWhileLoopList();
+
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alexander Udalov	39e72e5073	Parse as .kt file by default	2014-09-26 18:18:28 +04:00
Alexander Udalov	e98565e30e	Add missing generated files	2014-09-26 18:18:17 +04:00
vsmykalov	5acb28a7e9	final	2014-09-26 17:37:53 +04:00
vsmykalov	d4879e9f7b	all works; 135	2014-09-25 20:55:14 +04:00
vsmykalov	b7e37740d7	50 ;)	2014-09-24 19:38:51 +04:00
vsmykalov	f09a36a466	48!!!!	2014-09-24 17:50:29 +04:00
vsmykalov	3660c53af4	40!!	2014-09-23 16:47:42 +04:00
vsmykalov	670ac0e879	35	2014-09-23 15:27:49 +04:00
vsmykalov	9e87e54a9c	before adding truncated	2014-09-19 13:02:49 +04:00
vsmykalov	fcc466bd53	works with markers (31)	2014-09-19 12:52:26 +04:00
vsmykalov	78940baf51	no err	2014-09-18 16:29:47 +04:00
vsmykalov	2b17d08cbc	initial	2014-09-18 16:02:04 +04:00
vsmykalov	6a39425e38	initial version	2014-09-18 15:59:05 +04:00