From 909ff3a7ec94b78b77f062cb651bf5faa878deb3 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Tue, 15 May 2018 15:41:02 +0300
Subject: [PATCH] Misc: Migrate to IDEA 181.3

---
 compiler/compiler.pro                               |  3 +++
 .../test/testFramework/KtParsingTestCase.java       |  6 +-----
 .../codeInsight/gradle/GradleFacetImportTest.kt     | 13 +++++++++++++
 .../gradle/GradleUpdateConfigurationQuickFixTest.kt |  2 +-
 idea/src/META-INF/plugin.xml                        |  2 +-
 versions.gradle.kts                                 |  2 +-
 6 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/compiler/compiler.pro b/compiler/compiler.pro
index 500fc1503d6..75c8728ead5 100644
--- a/compiler/compiler.pro
+++ b/compiler/compiler.pro
@@ -51,6 +51,9 @@ messages/**)
 -dontwarn org.jetbrains.annotations.Mutable
 -dontwarn com.intellij.util.io.TarUtil
 
+# Depends on apache batik which has lots of dependencies
+-dontwarn com.intellij.util.SVGLoader*
+
 #-libraryjars '<rtjar>'
 #-libraryjars '<jssejar>'
 #-libraryjars '<bootstrap.runtime>'
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java
index bd4eddb1898..8f3c83f41c7 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java
@@ -42,13 +42,9 @@ import com.intellij.pom.PomModel;
 import com.intellij.pom.core.impl.PomModelImpl;
 import com.intellij.pom.tree.TreeAspect;
 import com.intellij.psi.*;
-import com.intellij.psi.impl.DebugUtil;
-import com.intellij.psi.impl.PsiCachedValuesFactory;
-import com.intellij.psi.impl.PsiFileFactoryImpl;
+import com.intellij.psi.impl.*;
 import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry;
 import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistryImpl;
-import com.intellij.psi.impl.source.text.BlockSupportImpl;
-import com.intellij.psi.impl.source.text.DiffLog;
 import com.intellij.psi.util.CachedValuesManager;
 import com.intellij.testFramework.LightVirtualFile;
 import com.intellij.testFramework.TestDataFile;
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt
index 8bb9190f17d..5b64b6d1dc3 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt
@@ -62,6 +62,19 @@ internal fun GradleImportingTestCase.getSourceRootInfos(moduleName: String): Lis
 }
 
 class GradleFacetImportTest : GradleImportingTestCase() {
+    private var isCreateEmptyContentRootDirectories = true
+
+    override fun setUp() {
+        super.setUp()
+        isCreateEmptyContentRootDirectories = currentExternalProjectSettings.isCreateEmptyContentRootDirectories
+        currentExternalProjectSettings.isCreateEmptyContentRootDirectories = true
+    }
+
+    override fun tearDown() {
+        currentExternalProjectSettings.isCreateEmptyContentRootDirectories = isCreateEmptyContentRootDirectories
+        super.tearDown()
+    }
+
     @Test
     fun testJvmImport() {
         createProjectSubFile(
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleUpdateConfigurationQuickFixTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleUpdateConfigurationQuickFixTest.kt
index 3865f020c2e..6eea2598666 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleUpdateConfigurationQuickFixTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleUpdateConfigurationQuickFixTest.kt
@@ -73,9 +73,9 @@ class GradleUpdateConfigurationQuickFixTest : GradleImportingTestCase() {
 
     private fun doTest(intentionName: String) {
         val buildGradleVFile = createProjectSubFile("build.gradle", File(getTestDataPath(), "build.gradle").readText())
+        val sourceVFile = createProjectSubFile("src/main/kotlin/src.kt", File(getTestDataPath(), "src.kt").readText())
         importProject()
         runInEdtAndWait {
-            val sourceVFile = createProjectSubFile("src/main/kotlin/src.kt", File(getTestDataPath(), "src.kt").readText())
             codeInsightTestFixture.configureFromExistingVirtualFile(sourceVFile)
             codeInsightTestFixture.launchAction(codeInsightTestFixture.findSingleIntention(intentionName))
             FileDocumentManager.getInstance().saveAllDocuments()
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 339cb78fb39..5fc120c0b36 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -6,7 +6,7 @@
   <version>@snapshot@</version>
   <vendor url="http://www.jetbrains.com">JetBrains</vendor>
 
-  <idea-version since-build="181.1" until-build="181.*"/>
+  <idea-version since-build="181.3" until-build="181.*"/>
 
   <depends>com.intellij.modules.platform</depends>
   <depends>com.intellij.modules.remoteServers</depends>
diff --git a/versions.gradle.kts b/versions.gradle.kts
index b0719e7f3c6..3c698b2a791 100644
--- a/versions.gradle.kts
+++ b/versions.gradle.kts
@@ -1,5 +1,5 @@
 
-extra["versions.intellijSdk"] = "181.4203.6"
+extra["versions.intellijSdk"] = "181.4892.42"
 extra["versions.androidBuildTools"] = "r23.0.1"
 extra["versions.idea.NodeJS"] = "181.3494.12"
 //extra["versions.androidStudioRelease"] = "3.1.0.5"