azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle whitespaces in argfiles correctly

Browse Source 
#KT-27218 Fixed
This commit is contained in:
Alexander Udalov
2018-09-28 12:07:25 +02:00
parent ab05f17d1d
commit 16dd6ebe61
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/preprocessCommandLineArguments.kt
+4 -5
View File
@@ -16,8 +16,6 @@ private const val EXPERIMENTAL_ARGFILE_ARGUMENT = "-Xargfile="
private const val SINGLE_QUOTE = '\''
private const val DOUBLE_QUOTE = '"'
private const val BACKSLASH = '\\'
private const val WHITESPACE = ' '
private const val NEWLINE = '\n'
/**
* Performs initial preprocessing of arguments, passed to the compiler.
@@ -56,13 +54,14 @@ private fun Reader.parseNextArgument(): String? {
val sb = StringBuilder()
var r = nextChar()
while (r != null && (r == WHITESPACE || r == NEWLINE)) {
while (r != null && r.isWhitespace()) {
r = nextChar()
}
loop@ while (r != null) {
while (r != null) {
if (r.isWhitespace()) break
when (r) {
WHITESPACE, NEWLINE -> break@loop
DOUBLE_QUOTE, SINGLE_QUOTE -> consumeRestOfEscapedSequence(sb, r)
BACKSLASH -> nextChar()?.apply(sb::append)
else -> sb.append(r)