MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "execution: Escape newline chars on Windows"

Browse Source 
This reverts commit c174314
This commit is contained in:
Alexander Doroshko
2017-09-01 20:50:01 +03:00
parent 9d3a0b9abe
commit 8eb653ea0f
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-tests/testSrc/com/intellij/execution/GeneralCommandLineTest.java
-2
View File
@@ -66,8 +66,6 @@ public class GeneralCommandLineTest {
"\"quoted-slash\\\"",
"\"quoted-two-slashes\\\\\"",
"some\ttab",
"new\nline",
"\nnew\nline\n",
"^% % %%% %\"%%",
//"%PATH%",
"^",
platform/util/src/com/intellij/execution/CommandLineUtil.java
+7 -3
View File
@@ -34,7 +34,7 @@ public class CommandLineUtil {
private static final Pattern WIN_BACKSLASHES_PRECEDING_QUOTE = Pattern.compile("(\\\\+)(?=\"|$)");
private static final Pattern WIN_CARET_SPECIAL = Pattern.compile("[&<>()@^|!%]");
private static final Pattern WIN_QUOTE_SPECIAL = Pattern.compile("[ \t\\r\\n\"*?\\[{}~()\']"); // + glob [*?] + Cygwin glob [*?\[{}~] + [()']
private static final Pattern WIN_QUOTE_SPECIAL = Pattern.compile("[ \t\"*?\\[{}~()\']"); // + glob [*?] + Cygwin glob [*?\[{}~] + [()']
private static final Pattern WIN_QUIET_COMMAND = Pattern.compile("((?:@\\s*)++)(.*)", Pattern.CASE_INSENSITIVE);
private static final char Q = '\"';
@@ -464,8 +464,12 @@ public class CommandLineUtil {
@NotNull
@Contract(pure = true)
public static String escapeParameterOnWindows(@NotNull String parameter, boolean isWinShell) {
if (parameter.isEmpty()) return QQ;
return isWinShell ? escapeParameter(parameter, new QuoteFlag(false), 1, true) : backslashEscapeQuotes(parameter);
String s = convertLineSeparators(parameter, "");
if (s.isEmpty()) return QQ;
boolean hadLineBreaks = !s.equals(parameter);
String result = isWinShell ? escapeParameter(s, new QuoteFlag(hadLineBreaks), 1, true) : backslashEscapeQuotes(s);
if (hadLineBreaks) result = quote(result, Q);
return result;
}
@NotNull