From 027b83a252da3f6da7064f86c347f98b672bb44e Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Fri, 14 Apr 2017 21:08:33 +0300
Subject: [PATCH] Minor, pass coroutines state explicitly in maven plugin

---
 .../jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt   | 9 ++++++---
 .../jetbrains/kotlin/maven/KotlinCompileMojoBase.java    | 5 +----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt
index f50307ec116..deabee78265 100644
--- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt
+++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt
@@ -38,7 +38,10 @@ import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
 import org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments
 import org.jetbrains.kotlin.cli.common.arguments.parseArguments
 import org.jetbrains.kotlin.compilerRunner.ArgumentUtils
-import org.jetbrains.kotlin.config.*
+import org.jetbrains.kotlin.config.JvmTarget
+import org.jetbrains.kotlin.config.LanguageFeature
+import org.jetbrains.kotlin.config.LanguageVersion
+import org.jetbrains.kotlin.config.TargetPlatformKind
 import org.jetbrains.kotlin.extensions.ProjectExtensionDescriptor
 import org.jetbrains.kotlin.idea.facet.*
 import org.jetbrains.kotlin.idea.maven.configuration.KotlinMavenConfigurator
@@ -116,8 +119,8 @@ class KotlinMavenImporter : MavenImporter(KOTLIN_PLUGIN_GROUP_ID, KOTLIN_PLUGIN_
         arguments.multiPlatform = configuration.getChild("multiPlatform")?.text?.trim()?.toBoolean() ?: false
         arguments.suppressWarnings = configuration.getChild("nowarn")?.text?.trim()?.toBoolean() ?: false
 
-        configuration.getChild("experimentalCoroutines")?.text?.trim()?.let { coroutines ->
-            parseArguments(arrayOf("-Xcoroutines=$coroutines"), arguments, false)
+        configuration.getChild("experimentalCoroutines")?.text?.trim()?.let {
+            arguments.coroutinesState = it
         }
 
         when (arguments) {
diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java
index 05e3ed907a8..49cde0ff5cf 100644
--- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java
+++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java
@@ -452,12 +452,9 @@ public abstract class KotlinCompileMojoBase<A extends CommonCompilerArguments> e
         arguments.suppressWarnings = nowarn;
         arguments.languageVersion = languageVersion;
         arguments.apiVersion = apiVersion;
+        arguments.coroutinesState = experimentalCoroutines;
         arguments.multiPlatform = multiPlatform;
 
-        if (experimentalCoroutines != null) {
-            compiler.parseArguments(new String[] { "-Xcoroutines=" + experimentalCoroutines }, arguments);
-        }
-
         configureSpecificCompilerArguments(arguments);
 
         try {