feat(IdeaRun): Propagate arguments to IDEA run configuration

Author: osipxd

src/main/kotlin/server/DevServerPlugin.kt

@@ -157,6 +157,8 @@ public class DevServerPlugin : Plugin<Project> {
         tasks.register<CreateIdeaJarRunConfiguration>("buildIdeaRun") {
             configurationName.set("${project.name}: Run server")
             beforeRunTask.set("prepareServer")
+            vmParameters.set(serverConfiguration.buildJvmArgs(debug = false))
+            programParameters.set(serverConfiguration.bukkitArgs)
             configurationsDir.set(project.rootProject.layout.projectDirectory.dir(".idea/runConfigurations"))
             jarPath.set(serverDir.map { it.file(ServerConstants.FILE_CORE).asFile })
         }

src/main/kotlin/server/extension/ServerConfiguration.kt

@@ -12,5 +12,5 @@ public interface ServerConfiguration {
     public val coreType: CoreType
 
     /** Returns arguments for JVM. */
-    public fun buildJvmArgs(): List<String>
+    public fun buildJvmArgs(debug: Boolean = this.debug): List<String>
 }

src/main/kotlin/server/extension/ServerConfigurationImpl.kt

@@ -48,7 +48,7 @@ public class ServerConfigurationImpl : ServerConfiguration {
         bukkitArgs = bukkitArgs + args.toList()
     }
 
-    override fun buildJvmArgs(): List<String> {
+    override fun buildJvmArgs(debug: Boolean): List<String> {
         return listOfNotNull(DEBUG_ARGS.takeIf { debug }, "-Dfile.encoding=$encoding") + javaArgs
     }
 

src/main/kotlin/server/task/CreateIdeaJarRunConfiguration.kt

@@ -4,12 +4,14 @@ import groovy.xml.MarkupBuilder
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.RegularFile
+import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
+import org.gradle.kotlin.dsl.listProperty
 import org.gradle.kotlin.dsl.property
 import org.gradle.kotlin.dsl.withGroovyBuilder
 import ru.endlesscode.bukkitgradle.TASKS_GROUP_BUKKIT
@@ -23,10 +25,10 @@ public open class CreateIdeaJarRunConfiguration : DefaultTask() {
     public val configurationName: Property<String> = project.objects.property()
 
     @Input
-    public val vmParameters: Property<String> = project.objects.property()
+    public val vmParameters: ListProperty<String> = project.objects.listProperty()
 
     @Input
-    public val programParameters: Property<String> = project.objects.property()
+    public val programParameters: ListProperty<String> = project.objects.listProperty()
 
     @Input
     public val beforeRunTask: Property<String> = project.objects.property()
@@ -46,8 +48,8 @@ public open class CreateIdeaJarRunConfiguration : DefaultTask() {
         group = TASKS_GROUP_BUKKIT
         description = "Configure server run configuration for IDEA"
 
-        vmParameters.convention("")
-        programParameters.convention("")
+        vmParameters.convention(emptyList())
+        programParameters.convention(emptyList())
 
         onlyIf { Idea.isActive() }
     }
@@ -68,8 +70,8 @@ public open class CreateIdeaJarRunConfiguration : DefaultTask() {
                     "singleton" to true
                 ) {
                     "option"("name" to "JAR_PATH", "value" to jarPath.get())
-                    "option"("name" to "VM_PARAMETERS", "value" to vmParameters.get())
-                    "option"("name" to "PROGRAM_PARAMETERS", "value" to programParameters.get())
+                    "option"("name" to "VM_PARAMETERS", "value" to vmParameters.get().joinToString(" "))
+                    "option"("name" to "PROGRAM_PARAMETERS", "value" to programParameters.get().joinToString(" "))
                     "option"("name" to "WORKING_DIRECTORY", "value" to jarPath.get().parentFile)
                     "method"("v" to 2) {
                         "option"(

src/test/groovy/ru/endlesscode/bukkitgradle/server/extension/ServerConfigurationSpec.groovy

@@ -13,18 +13,15 @@ class ServerConfigurationSpec extends Specification {
 
     void 'when build args - should return args with debug flags'() {
         when:
-        def args = serverConfiguration.buildJvmArgs()
+        def args = serverConfiguration.buildJvmArgs(true)
 
         then:
         ["-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005", "-Dfile.encoding=UTF-8", "-Xmx1G"] == args
     }
 
     void 'when build args - and debug disabled - should return args without debug flags'() {
-        given:
-        serverConfiguration.debug = false
-
         when:
-        def args = serverConfiguration.buildJvmArgs()
+        def args = serverConfiguration.buildJvmArgs(false)
 
         then:
         ["-Dfile.encoding=UTF-8", "-Xmx1G"] == args

src/test/groovy/ru/endlesscode/bukkitgradle/server/task/CreateIdeaJarRunConfigurationSpec.groovy

@@ -42,8 +42,8 @@ class CreateIdeaJarRunConfigurationSpec extends PluginSpecification {
             <component name='ProjectRunConfigurationManager'>
               <configuration default='false' name='test-plugin: Run server' type='JarApplication' singleton='true'>
                 <option name='JAR_PATH' value='${serverDir}/core.jar' />
-                <option name='VM_PARAMETERS' value='' />
-                <option name='PROGRAM_PARAMETERS' value='' />
+                <option name='VM_PARAMETERS' value='-Dfile.encoding=UTF-8 -Xmx1G' />
+                <option name='PROGRAM_PARAMETERS' value='nogui' />
                 <option name='WORKING_DIRECTORY' value='${serverDir}' />
                 <method v='2'>
                   <option name='Gradle.BeforeRunTask' enabled='true' tasks='prepareServer' externalProjectPath='\$PROJECT_DIR\$' />