Selaa lähdekoodia

Merge pull request #76 from Mick235711/proper-split-argument

Do proper splitting of command-line arguments
ruki 2 kuukautta sitten
vanhempi
sitoutus
8df55526f7

+ 2 - 3
src/main/kotlin/io/xmake/run/XMakeRunConfiguration.kt

@@ -9,6 +9,7 @@ import com.intellij.execution.runners.ExecutionEnvironment
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.options.SettingsEditor
 import com.intellij.openapi.project.Project
+import com.intellij.util.execution.ParametersListUtil
 import com.intellij.util.xmlb.XmlSerializer
 import com.intellij.util.xmlb.annotations.OptionTag
 import com.intellij.util.xmlb.annotations.Transient
@@ -81,9 +82,7 @@ class XMakeRunConfiguration(
                 parameters.add(runTarget)
             }
             if (runArguments != "") {
-                runArguments.split(" ").forEach {
-                    parameters.add(it)
-                }
+                parameters.addAll(ParametersListUtil.parse(runArguments))
             }
 
             // make command line

+ 2 - 0
src/main/kotlin/io/xmake/run/XMakeRunConfigurationEditor.kt

@@ -105,6 +105,7 @@ class XMakeRunConfigurationEditor(
         androidNDKDirectoryBrowser.text = configuration.androidNDKDirectory
 
         enableVerbose = configuration.enableVerbose
+        enableVerboseCheckBox.setSelected(enableVerbose)
 
         additionalConfiguration.text = configuration.additionalConfiguration
     }
@@ -134,6 +135,7 @@ class XMakeRunConfigurationEditor(
 
         configuration.androidNDKDirectory = androidNDKDirectoryBrowser.text
 
+        enableVerbose = enableVerboseCheckBox.isSelected()
         configuration.enableVerbose = enableVerbose
 
         configuration.additionalConfiguration = additionalConfiguration.text

+ 2 - 1
src/main/kotlin/io/xmake/shared/XMakeConfiguration.kt

@@ -6,6 +6,7 @@ import com.intellij.execution.configurations.GeneralCommandLine
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.project.Project
+import com.intellij.util.execution.ParametersListUtil
 import io.xmake.project.toolkit.activatedToolkit
 import io.xmake.run.XMakeRunConfiguration
 import io.xmake.utils.exception.XMakeRunConfigurationNotSetException
@@ -111,7 +112,7 @@ class XMakeConfiguration(val project: Project) {
                 parameters.add(configuration.buildDirectory)
             }
             if (configuration.additionalConfiguration != "") {
-                parameters.add(configuration.additionalConfiguration)
+                parameters.addAll(ParametersListUtil.parse(configuration.additionalConfiguration))
             }
 
             // make command line