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 @@
+
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 @@
+
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 @@
-
+
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 @@
+
\ 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) {
}
}
+ testGroup("idea/idea-ultimate/tests", "idea/testData") {
+
+ }
+
testGroup("idea/tests", "compiler/testData") {
testClass() {
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
-
+