From b71d8bb16d16781b40bd60fe4458c66078bc1760 Mon Sep 17 00:00:00 2001
From: Denis Zhdanov <Denis.Zhdanov@jetbrains.com>
Date: Thu, 31 Mar 2011 14:48:10 +0400
Subject: [PATCH] IDEA-66610 interpret carriage return (\r) in console only as
 carriage return and not as new line (\n)

Don't keep '\r' as is under Mac now
---
 .../util/src/com/intellij/openapi/util/text/StringUtil.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
index 618b2769094a..271a0ecdd9f9 100644
--- a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
@@ -19,6 +19,7 @@ import com.google.common.collect.Lists;
 import com.intellij.CommonBundle;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.util.*;
 import com.intellij.util.text.CharArrayCharSequence;
@@ -299,7 +300,7 @@ public class StringUtil {
       }
       else if (c == '\r') {
         boolean followedByLineFeed = i < text.length() - 1 && text.charAt(i + 1) == '\n';
-        if (!followedByLineFeed && keepCarriageReturn) {
+        if (!followedByLineFeed && keepCarriageReturn && !SystemInfo.isMac) {
           if (buffer == null) {
             intactLength++;
           }