From a30b4140dec40eafa8bd87cc867373be8d21325f Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Thu, 31 Mar 2016 18:46:23 +0300
Subject: [PATCH] [RESTORED] Misc: Configure IDEA Ultimate dependencies

---
 .idea/artifacts/KotlinPlugin.xml              |  1 +
 .idea/modules.xml                             |  1 +
 .../IDEA__No_ProcessCanceledException_.xml    |  2 +-
 ReadMe.md                                     |  8 ++++
 .../kotlin/cfg/AbstractPseudocodeTest.java    |  4 --
 generators/generators.iml                     |  1 +
 .../kotlin/generators/tests/GenerateTests.kt  |  4 ++
 idea/idea-ultimate/idea-ultimate.iml          | 46 +++++++++++++++++++
 .../idea/refactoring/InplaceRenameTest.kt     |  4 --
 update_dependencies.xml                       |  2 +-
 10 files changed, 63 insertions(+), 10 deletions(-)
 create mode 100644 idea/idea-ultimate/idea-ultimate.iml

diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index 05f464d6ccd..c37a9990918 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -48,6 +48,7 @@
           <element id="module-output" name="idea-live-templates" />
           <element id="module-output" name="resolution" />
           <element id="module-output" name="plugin-api" />
+          <element id="module-output" name="idea-ultimate" />
         </element>
         <element id="library" level="project" name="javax.inject" />
         <element id="directory" name="jps">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 17f006235b0..3539b0a8f88 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -47,6 +47,7 @@
       <module fileurl="file://$PROJECT_DIR$/idea/idea-repl/idea-repl.iml" filepath="$PROJECT_DIR$/idea/idea-repl/idea-repl.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$/idea/idea-ultimate/idea-ultimate.iml" filepath="$PROJECT_DIR$/idea/idea-ultimate/idea-ultimate.iml" group="ide" />
       <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$/jps-plugin/jps-plugin.iml" filepath="$PROJECT_DIR$/jps-plugin/jps-plugin.iml" group="ide/jps" />
diff --git a/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml b/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml
index 40e1105bdf8..fb248ee4e4b 100644
--- 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" singleton="true">
     <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 -Didea.ProcessCanceledException=disabled -Dkotlin.internal.mode.enabled=true -Didea.additional.classpath=../idea-kotlin-runtime/kotlin-runtime.jar,../idea-kotlin-runtime/kotlin-reflect.jar" />
+    <option name="VM_PARAMETERS" value="-Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=400m -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 -Didea.ProcessCanceledException=disabled -Dkotlin.internal.mode.enabled=true -Didea.additional.classpath=../idea-kotlin-runtime/kotlin-runtime.jar,../idea-kotlin-runtime/kotlin-reflect.jar" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/ideaSDK/bin" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
diff --git a/ReadMe.md b/ReadMe.md
index b15bf23a922..437b5fa924e 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -34,6 +34,11 @@ which will setup the dependencies on
 
 * intellij-core: is a part of command line compiler and contains only necessary APIs.
 * idea-full: is a full blown IntelliJ IDEA Community Edition to be used in former plugin module.
+* idea-ultimate-full: is a full blown IntelliJ IDEA Ultimate Edition to be used in former plugin module.
+
+If you are not dealing with IDEA Ultimate-specific features, you may want to disable corresponding project dependency.
+(that will also relieve you from necessity to download the IDEA Ultimate distribution during dependency update process)
+To do so change "use.ultimate.by.default" property to false (update_dependencies.xml) before running dependency update
 
 Then, you need to run
 
@@ -67,6 +72,9 @@ plugin [see this document](http://devnet.jetbrains.net/docs/DOC-181) which descr
 
 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
 
+If you've decided to disable IDEA Ultimate configuration during dependency update, you also need to locally disable the compilation of its dependent code.
+To do so you can either delete idea-ultimate module using IDEA action in the Project View, or remove corresponding line in .idea/modules.xml
+
 * VCS -> Git -> Pull
 * Run IntelliJ IDEA
 * a child IntelliJ IDEA with the Kotlin plugin will then startup
diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java
index ad6592be1ec..2fa2428bbbf 100644
--- a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java
@@ -44,10 +44,6 @@ import java.util.List;
 import java.util.Set;
 
 public abstract class AbstractPseudocodeTest extends KotlinTestWithEnvironment {
-    static {
-        System.setProperty("idea.platform.prefix", "Idea");
-    }
-
     @Override
     protected KotlinCoreEnvironment createEnvironment() {
         return createEnvironmentWithMockJdk(ConfigurationKind.JDK_ONLY);
diff --git a/generators/generators.iml b/generators/generators.iml
index c1adce0e190..2b0b9a476c2 100644
--- a/generators/generators.iml
+++ b/generators/generators.iml
@@ -38,5 +38,6 @@
     <orderEntry type="module" module-name="plugins-tests" scope="TEST" />
     <orderEntry type="module" module-name="idea-android" scope="TEST" />
     <orderEntry type="module" module-name="uast-kotlin" scope="TEST" />
+    <orderEntry type="module" module-name="idea-ultimate" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 5e0e608cf1b..61f11003fc2 100644
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -791,6 +791,10 @@ fun main(args: Array<String>) {
         }
     }
 
+    testGroup("idea/idea-ultimate/tests", "idea/testData") {
+
+    }
+
     testGroup("idea/tests", "compiler/testData") {
         testClass<AbstractResolveByStubTest>() {
             model("loadJava/compiledKotlin")
diff --git a/idea/idea-ultimate/idea-ultimate.iml b/idea/idea-ultimate/idea-ultimate.iml
new file mode 100644
index 00000000000..95a0f19be85
--- /dev/null
+++ b/idea/idea-ultimate/idea-ultimate.iml
@@ -0,0 +1,46 @@
+<?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$/tests" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="backend" />
+    <orderEntry type="module" module-name="frontend" />
+    <orderEntry type="module" module-name="frontend.java" />
+    <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
+    <orderEntry type="module" module-name="light-classes" />
+    <orderEntry type="module" module-name="cli-common" />
+    <orderEntry type="library" name="idea-full" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="intellilang-plugin" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="junit-plugin" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="testng-plugin" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="copyright-plugin" level="project" />
+    <orderEntry type="module" module-name="j2k" />
+    <orderEntry type="module" module-name="cli" scope="TEST" />
+    <orderEntry type="module" module-name="idea-jps-common" />
+    <orderEntry type="library" scope="PROVIDED" name="properties" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="java-i18n" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="maven" level="project" />
+    <orderEntry type="module" module-name="eval4j" />
+    <orderEntry type="module" module-name="idea-core" />
+    <orderEntry type="module" module-name="idea-analysis" exported="" />
+    <orderEntry type="module" module-name="js.frontend" />
+    <orderEntry type="library" scope="PROVIDED" name="coverage-plugin" level="project" />
+    <orderEntry type="module" module-name="util" />
+    <orderEntry type="library" name="markdown" level="project" />
+    <orderEntry type="module" module-name="idea-completion" />
+    <orderEntry type="module" module-name="idea-test-framework" scope="TEST" />
+    <orderEntry type="module" module-name="js.serializer" />
+    <orderEntry type="module" module-name="daemon-client" />
+    <orderEntry type="module" module-name="idea-repl" scope="TEST" />
+    <orderEntry type="module" module-name="idea-live-templates" exported="" scope="RUNTIME" />
+    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
+    <orderEntry type="module" module-name="idea" />
+    <orderEntry type="module" module-name="generators" scope="TEST" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt
index 6479e7dbb1c..fa1f2e3193b 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt
@@ -30,10 +30,6 @@ import com.intellij.codeInsight.template.TemplateManager
 import com.intellij.openapi.command.WriteCommandAction
 
 class InplaceRenameTest : LightPlatformCodeInsightTestCase() {
-    init {
-        System.setProperty("idea.platform.prefix", "Idea")
-    }
-
     override fun isRunInWriteAction(): Boolean = false
     override fun getTestDataPath(): String = PluginTestCaseBase.getTestDataPathBase() + "/refactoring/rename/inplace/"
 
diff --git a/update_dependencies.xml b/update_dependencies.xml
index e9d927a5ee2..9e325ad7d48 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -14,7 +14,7 @@
 
     <property name="bootstrap.build.no.tests" value="false"/>
 
-    <!--<property name="use.ultimate.by.default" value="true"/>-->
+    <property name="use.ultimate.by.default" value="true"/>
 
     <property name="sdk.version.prefix" value="IU" if:set="use.ultimate.by.default"/>
     <property name="sdk.version.prefix" value="IC" unless:set="use.ultimate.by.default"/>