Merge pull request #2053 from Hannah-Sten/quoted-custom-arguments

Quoted custom arguments
Hannah-Sten · Aug 30, 2021 · caf5fa0 · caf5fa0
2 parents e5c3e5e + 3e03ba5
commit caf5fa0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -24,7 +24,7 @@ plugins {
 }
 
 group = "nl.hannahsten"
-version = "0.7.9"
+version = "0.7.10-alpha.2"
 
 repositories {
     mavenCentral()

diff --git a/src/nl/hannahsten/texifyidea/run/compiler/BiberCompiler.kt b/src/nl/hannahsten/texifyidea/run/compiler/BiberCompiler.kt
@@ -1,6 +1,7 @@
 package nl.hannahsten.texifyidea.run.compiler
 
 import com.intellij.openapi.project.Project
+import com.intellij.util.execution.ParametersListUtil
 import nl.hannahsten.texifyidea.run.bibtex.BibtexRunConfiguration
 
 /**
@@ -19,7 +20,7 @@ internal object BiberCompiler : Compiler<BibtexRunConfiguration> {
         // The extra directory added is the directory from which the path to the .bib resource file is searched as specified in the .bcf file.
         add("--input-directory=${runConfig.mainFile?.parent?.path ?: ""}")
 
-        runConfig.compilerArguments?.let { addAll(it.split("""\s+""".toRegex())) }
+        runConfig.compilerArguments?.let { addAll(ParametersListUtil.parse(it)) }
 
         add(runConfig.mainFile?.nameWithoutExtension ?: return null)
     }

diff --git a/src/nl/hannahsten/texifyidea/run/compiler/BibtexCompiler.kt b/src/nl/hannahsten/texifyidea/run/compiler/BibtexCompiler.kt
@@ -2,6 +2,7 @@ package nl.hannahsten.texifyidea.run.compiler
 
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.ProjectRootManager
+import com.intellij.util.execution.ParametersListUtil
 import nl.hannahsten.texifyidea.run.bibtex.BibtexRunConfiguration
 import nl.hannahsten.texifyidea.settings.sdk.LatexSdkUtil
 
@@ -21,7 +22,7 @@ internal object BibtexCompiler : Compiler<BibtexRunConfiguration> {
         command.apply {
             add(runConfig.compilerPath ?: executableName)
 
-            runConfig.compilerArguments?.let { addAll(it.split("""\s+""".toRegex())) }
+            runConfig.compilerArguments?.let { addAll(ParametersListUtil.parse(it)) }
 
             // Include files from auxiliary directory on Windows
             if (LatexSdkUtil.isMiktexAvailable) {

diff --git a/src/nl/hannahsten/texifyidea/run/compiler/LatexCompiler.kt b/src/nl/hannahsten/texifyidea/run/compiler/LatexCompiler.kt
@@ -4,12 +4,12 @@ import com.intellij.execution.configurations.GeneralCommandLine
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.ProjectRootManager
 import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.util.execution.ParametersListUtil
 import nl.hannahsten.texifyidea.run.latex.LatexDistributionType
 import nl.hannahsten.texifyidea.run.latex.LatexRunConfiguration
 import nl.hannahsten.texifyidea.settings.sdk.LatexSdkUtil
 import nl.hannahsten.texifyidea.util.LatexmkRcFileFinder
 import nl.hannahsten.texifyidea.util.runCommand
-import nl.hannahsten.texifyidea.util.splitWhitespace
 
 /**
  * @author Hannah Schellekens, Sten Wessel
@@ -285,8 +285,7 @@ enum class LatexCompiler(private val displayName: String, val executableName: St
 
         // Custom compiler arguments specified by the user
         runConfig.compilerArguments?.let { arguments ->
-            arguments.splitWhitespace()
-                .dropLastWhile { it.isEmpty() }
+            ParametersListUtil.parse(arguments)
                 .forEach { command.add(it) }
         }