From 66005d9c3b8b45e3017024a4e9a6f85196cb216a Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Tue, 12 Oct 2021 19:23:06 +0900
Subject: [PATCH] Pill: Remove Android Studio support

---
 .../resources/runConfigurations/Pill_IDEA.xml             | 2 +-
 .../Pill_IDEA_No_ProcessCancelledException.xml            | 2 +-
 .../resources/runConfigurations/Pill_IDEA_Ultimate.xml    | 2 +-
 .../pill/pill-importer/src/JpsCompatiblePluginTasks.kt    | 8 +-------
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/plugins/pill/pill-importer/resources/runConfigurations/Pill_IDEA.xml b/plugins/pill/pill-importer/resources/runConfigurations/Pill_IDEA.xml
index 6275e84ee3b..b886c19df01 100644
--- a/plugins/pill/pill-importer/resources/runConfigurations/Pill_IDEA.xml
+++ b/plugins/pill/pill-importer/resources/runConfigurations/Pill_IDEA.xml
@@ -3,7 +3,7 @@
     <log_file alias="idea.log" path="$PROJECT_DIR$/ideaSDK/system-idea/log/idea.log" />
     <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
     <module name="idea-runner.main" />
-    <option name="VM_PARAMETERS" value="-Xmx1250m -XX:ReservedCodeCacheSize=240m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.platform.prefix=Idea -Didea.debug.mode=true -Didea.system.path=$PROJECT_DIR$/local/ideaSandbox -Didea.config.path=$PROJECT_DIR$/local/ideaSandbox/config -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin $ADDITIONAL_IDEA_ARGS$" />
+    <option name="VM_PARAMETERS" value="-Xmx1250m -XX:ReservedCodeCacheSize=240m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.platform.prefix=Idea -Didea.debug.mode=true -Didea.system.path=$PROJECT_DIR$/local/ideaSandbox -Didea.config.path=$PROJECT_DIR$/local/ideaSandbox/config -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin" />
     <option name="WORKING_DIRECTORY" value="file://$IDEA_HOME_PATH$" />
     <RunnerSettings RunnerId="Debug">
       <option name="DEBUG_PORT" value="" />
diff --git a/plugins/pill/pill-importer/resources/runConfigurations/Pill_IDEA_No_ProcessCancelledException.xml b/plugins/pill/pill-importer/resources/runConfigurations/Pill_IDEA_No_ProcessCancelledException.xml
index c6f4cfa81a7..c8f83c2e9fa 100644
--- a/plugins/pill/pill-importer/resources/runConfigurations/Pill_IDEA_No_ProcessCancelledException.xml
+++ b/plugins/pill/pill-importer/resources/runConfigurations/Pill_IDEA_No_ProcessCancelledException.xml
@@ -3,7 +3,7 @@
     <log_file alias="idea.log" path="$PROJECT_DIR$/ideaSDK/system-idea/log/idea.log" />
     <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
     <module name="idea-runner.main" />
-    <option name="VM_PARAMETERS" value="-Xmx1250m -XX:ReservedCodeCacheSize=240m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.platform.prefix=Idea -Didea.debug.mode=true -Didea.system.path=$PROJECT_DIR$/local/ideaSandbox -Didea.config.path=$PROJECT_DIR$/local/ideaSandbox/config -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin -Didea.ProcessCanceledException=disabled $ADDITIONAL_IDEA_ARGS$" />
+    <option name="VM_PARAMETERS" value="-Xmx1250m -XX:ReservedCodeCacheSize=240m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.platform.prefix=Idea -Didea.debug.mode=true -Didea.system.path=$PROJECT_DIR$/local/ideaSandbox -Didea.config.path=$PROJECT_DIR$/local/ideaSandbox/config -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin -Didea.ProcessCanceledException=disabled" />
     <option name="WORKING_DIRECTORY" value="file://$IDEA_HOME_PATH$" />
     <RunnerSettings RunnerId="Debug">
       <option name="DEBUG_PORT" value="" />
diff --git a/plugins/pill/pill-importer/resources/runConfigurations/Pill_IDEA_Ultimate.xml b/plugins/pill/pill-importer/resources/runConfigurations/Pill_IDEA_Ultimate.xml
index 8ea4b84ff2e..0cdaaf708f6 100644
--- a/plugins/pill/pill-importer/resources/runConfigurations/Pill_IDEA_Ultimate.xml
+++ b/plugins/pill/pill-importer/resources/runConfigurations/Pill_IDEA_Ultimate.xml
@@ -3,7 +3,7 @@
     <log_file alias="idea.log" path="$PROJECT_DIR$/ideaSDK/system-idea/log/idea.log" />
     <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
     <module name="kotlin-ultimate.ultimate.ultimate-runner.main" />
-    <option name="VM_PARAMETERS" value="-Xmx1250m -XX:ReservedCodeCacheSize=240m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=$PROJECT_DIR$/local/ideaSandbox -Didea.config.path=$PROJECT_DIR$/local/ideaSandbox/config -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin $ADDITIONAL_IDEA_ARGS$" />
+    <option name="VM_PARAMETERS" value="-Xmx1250m -XX:ReservedCodeCacheSize=240m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=$PROJECT_DIR$/local/ideaSandbox -Didea.config.path=$PROJECT_DIR$/local/ideaSandbox/config -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin" />
     <option name="WORKING_DIRECTORY" value="file://$IDEA_HOME_PATH$" />
     <RunnerSettings RunnerId="Debug">
       <option name="DEBUG_PORT" value="" />
diff --git a/plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt b/plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt
index 0843e62c425..a5540de34c4 100644
--- a/plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt
+++ b/plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt
@@ -73,7 +73,6 @@ class JpsCompatiblePluginTasks(private val rootProject: Project, private val pla
     private lateinit var platformVersion: String
     private lateinit var platformBaseNumber: String
     private lateinit var intellijCoreDir: File
-    private var isAndroidStudioPlatform: Boolean = false
 
     private fun initEnvironment(project: Project) {
         projectDir = project.projectDir
@@ -82,7 +81,6 @@ class JpsCompatiblePluginTasks(private val rootProject: Project, private val pla
             ?: platformVersion.substringBefore("-", "").takeIf { it.isNotEmpty() }
                     ?: error("Invalid platform version: $platformVersion")
         intellijCoreDir = File(platformDir.parentFile.parentFile.parentFile, "intellij-core")
-        isAndroidStudioPlatform = project.extensions.extraProperties.has("versions.androidStudioRelease")
     }
 
     fun pill() {
@@ -173,14 +171,11 @@ class JpsCompatiblePluginTasks(private val rootProject: Project, private val pla
         val runConfigurationsDir = File(resourcesDir, "runConfigurations")
         val targetDir = File(projectDir, ".idea/runConfigurations")
         val platformDirProjectRelative = "\$PROJECT_DIR\$/" + platformDir.toRelativeString(projectDir)
-        val additionalIdeaArgs = if (isAndroidStudioPlatform) "-Didea.platform.prefix=AndroidStudio" else ""
 
         targetDir.mkdirs()
 
         fun substitute(text: String): String {
-            return text
-                .replace("\$IDEA_HOME_PATH\$", platformDirProjectRelative)
-                .replace("\$ADDITIONAL_IDEA_ARGS\$", additionalIdeaArgs)
+            return text.replace("\$IDEA_HOME_PATH\$", platformDirProjectRelative)
         }
 
         (runConfigurationsDir.listFiles() ?: emptyArray())
@@ -255,7 +250,6 @@ class JpsCompatiblePluginTasks(private val rootProject: Project, private val pla
                 }
 
                 addOrReplaceOptionValue("idea.home.path", platformDirProjectRelative)
-                addOrReplaceOptionValue("ideaSdk.androidPlugin.path", "$platformDirProjectRelative/plugins/android/lib")
                 addOrReplaceOptionValue("use.jps", "true")
                 addOrReplaceOptionValue("kotlinVersion", project.rootProject.extra["kotlinVersion"].toString())