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

Do not use backslash for escaping outside of string literals in argfiles

Browse Source 
This fixes CLI tests testArgfileWithEscaping and
testApiVersionLessThanLanguageUsingArgfile on Windows

 #KT-28180 Fixed
This commit is contained in:
Alexander Udalov
2018-11-13 16:28:36 +01:00
parent 607b11e6b9
commit 9b07bbdf56
1 changed files with 5 additions and 8 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
+5 -8
View File
@@ -61,22 +61,19 @@ private fun Reader.parseNextArgument(): String? {
while (r != null) { while (r != null) {
if (r.isWhitespace()) break if (r.isWhitespace()) break
when (r) { if (r == DOUBLE_QUOTE || r == SINGLE_QUOTE) {
DOUBLE_QUOTE, SINGLE_QUOTE -> { consumeRestOfQuotedSequence(sb, r)
consumeRestOfEscapedSequence(sb, r) return sb.toString()
return sb.toString()
}
BACKSLASH -> nextChar()?.apply(sb::append)
else -> sb.append(r)
} }
sb.append(r)
r = nextChar() r = nextChar()
} }
return sb.toString().takeIf { it.isNotEmpty() } return sb.toString().takeIf { it.isNotEmpty() }
} }
private fun Reader.consumeRestOfEscapedSequence(sb: StringBuilder, quote: Char) { private fun Reader.consumeRestOfQuotedSequence(sb: StringBuilder, quote: Char) {
var ch = nextChar() var ch = nextChar()
while (ch != null && ch != quote) { while (ch != null && ch != quote) {
if (ch == BACKSLASH) nextChar()?.apply(sb::append) else sb.append(ch) if (ch == BACKSLASH) nextChar()?.apply(sb::append) else sb.append(ch)