util: findStartingLineSeparator -> getLineSeparatorAt (following IDEA-CR-13452)

diff --git a/platform/platform-api/src/com/intellij/execution/process/AnsiEscapeDecoder.java b/platform/platform-api/src/com/intellij/execution/process/AnsiEscapeDecoder.java
index d6d288023625c639e8cbc3f934c6dcb93524a3f1..1547d15f0c3ff9642e4d39d84e2a28e9155efa63 100644 (file)
--- a/platform/platform-api/src/com/intellij/execution/process/AnsiEscapeDecoder.java
+++ b/platform/platform-api/src/com/intellij/execution/process/AnsiEscapeDecoder.java
@@ -91,7 +91,7 @@ public class AnsiEscapeDecoder {
     int guardIndex = 0;
     boolean removalFromPrevTextAttempted = false;
     while (i < text.length()) {
-      LineSeparator lineSeparator = StringUtil.findStartingLineSeparator(text, i);
+      LineSeparator lineSeparator = StringUtil.getLineSeparatorAt(text, i);
       if (lineSeparator != null) {
         i += lineSeparator.getSeparatorString().length();
         result.append(lineSeparator.getSeparatorString());

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 ba678c929ff9728ae3f45771a16b2b19e1dfafac..69bbc537cc0a0a564c1463277d3e5a6e9e113977 100644 (file)
--- a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
@@ -3147,7 +3147,7 @@ public class StringUtil extends StringUtilRt {
   public static LineSeparator detectSeparators(@NotNull CharSequence text) {
     int index = indexOfAny(text, "\n\r");
     if (index == -1) return null;
-    LineSeparator lineSeparator = findStartingLineSeparator(text, index);
+    LineSeparator lineSeparator = getLineSeparatorAt(text, index);
     if (lineSeparator == null) {
       throw new AssertionError();
     }
@@ -3155,7 +3155,7 @@ public class StringUtil extends StringUtilRt {
   }
 
   @Nullable
-  public static LineSeparator findStartingLineSeparator(@NotNull CharSequence text, int startIndex) {
+  public static LineSeparator getLineSeparatorAt(@NotNull CharSequence text, int startIndex) {
     if (startIndex < 0 || startIndex >= text.length()) {
       return null;
     }

diff --git a/platform/util/testSrc/com/intellij/util/text/StringUtilTest.java b/platform/util/testSrc/com/intellij/util/text/StringUtilTest.java
index b8791aea3bf85714155bcbd8852f5d6507162aae..5c10e1184e362521e2114ab6e513459d37d94d14 100644 (file)
--- a/platform/util/testSrc/com/intellij/util/text/StringUtilTest.java
+++ b/platform/util/testSrc/com/intellij/util/text/StringUtilTest.java
@@ -375,24 +375,24 @@ public class StringUtilTest {
 
   @Test
   public void testFindStartingLineSeparator() {
-    assertEquals(null, StringUtil.findStartingLineSeparator("", -1));
-    assertEquals(null, StringUtil.findStartingLineSeparator("", 0));
-    assertEquals(null, StringUtil.findStartingLineSeparator("", 1));
-    assertEquals(null, StringUtil.findStartingLineSeparator("\nHello", -1));
-    assertEquals(null, StringUtil.findStartingLineSeparator("\nHello", 1));
-    assertEquals(null, StringUtil.findStartingLineSeparator("\nH\rel\nlo", 6));
-
-    assertEquals(LineSeparator.LF, StringUtil.findStartingLineSeparator("\nHello", 0));
-    assertEquals(LineSeparator.LF, StringUtil.findStartingLineSeparator("\nH\rel\nlo", 5));
-    assertEquals(LineSeparator.LF, StringUtil.findStartingLineSeparator("Hello\n", 5));
-
-    assertEquals(LineSeparator.CR, StringUtil.findStartingLineSeparator("\rH\r\nello", 0));
-    assertEquals(LineSeparator.CR, StringUtil.findStartingLineSeparator("Hello\r", 5));
-    assertEquals(LineSeparator.CR, StringUtil.findStartingLineSeparator("Hello\b\r", 6));
-
-    assertEquals(LineSeparator.CRLF, StringUtil.findStartingLineSeparator("\rH\r\nello", 2));
-    assertEquals(LineSeparator.CRLF, StringUtil.findStartingLineSeparator("\r\nH\r\nello", 0));
-    assertEquals(LineSeparator.CRLF, StringUtil.findStartingLineSeparator("\r\nH\r\nello\r\n", 9));
+    assertEquals(null, StringUtil.getLineSeparatorAt("", -1));
+    assertEquals(null, StringUtil.getLineSeparatorAt("", 0));
+    assertEquals(null, StringUtil.getLineSeparatorAt("", 1));
+    assertEquals(null, StringUtil.getLineSeparatorAt("\nHello", -1));
+    assertEquals(null, StringUtil.getLineSeparatorAt("\nHello", 1));
+    assertEquals(null, StringUtil.getLineSeparatorAt("\nH\rel\nlo", 6));
+
+    assertEquals(LineSeparator.LF, StringUtil.getLineSeparatorAt("\nHello", 0));
+    assertEquals(LineSeparator.LF, StringUtil.getLineSeparatorAt("\nH\rel\nlo", 5));
+    assertEquals(LineSeparator.LF, StringUtil.getLineSeparatorAt("Hello\n", 5));
+
+    assertEquals(LineSeparator.CR, StringUtil.getLineSeparatorAt("\rH\r\nello", 0));
+    assertEquals(LineSeparator.CR, StringUtil.getLineSeparatorAt("Hello\r", 5));
+    assertEquals(LineSeparator.CR, StringUtil.getLineSeparatorAt("Hello\b\r", 6));
+
+    assertEquals(LineSeparator.CRLF, StringUtil.getLineSeparatorAt("\rH\r\nello", 2));
+    assertEquals(LineSeparator.CRLF, StringUtil.getLineSeparatorAt("\r\nH\r\nello", 0));
+    assertEquals(LineSeparator.CRLF, StringUtil.getLineSeparatorAt("\r\nH\r\nello\r\n", 9));
   }
 
   @Test