Make lineRangesToCharRanges public

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=122772680
google · May 21, 2016 · 5c027f1 · 5c027f1
1 parent ef2c2da
commit 5c027f1
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 33 deletions.
diff --git a/core/src/main/java/com/google/googlejavaformat/java/FormatFileCallable.java b/core/src/main/java/com/google/googlejavaformat/java/FormatFileCallable.java
@@ -14,16 +14,13 @@
 
 package com.google.googlejavaformat.java;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.CharMatcher;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableRangeSet;
 import com.google.common.collect.Range;
 import com.google.common.collect.RangeSet;
 import com.google.common.collect.TreeRangeSet;
 import com.google.googlejavaformat.java.JavaFormatterOptions.SortImports;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
 
@@ -70,8 +67,6 @@ public String call() throws FormatterException {
         .formatSource(inputString, characterRanges(inputString).asRanges());
   }
 
-  static final CharMatcher NEWLINE = CharMatcher.is('\n');
-
   private RangeSet<Integer> characterRanges(String input) {
     final RangeSet<Integer> characterRanges = TreeRangeSet.create();
 
@@ -80,36 +75,12 @@ private RangeSet<Integer> characterRanges(String input) {
       return characterRanges;
     }
 
-    characterRanges.addAll(lineRangesToCharRanges(input, lineRanges));
+    characterRanges.addAll(Formatter.lineRangesToCharRanges(input, lineRanges));
 
     for (int i = 0; i < offsets.size(); i++) {
       characterRanges.add(Range.closedOpen(offsets.get(i), offsets.get(i) + lengths.get(i)));
     }
 
     return characterRanges;
   }
-
-  @VisibleForTesting
-  static RangeSet<Integer> lineRangesToCharRanges(String input, RangeSet<Integer> lineRanges) {
-    List<Integer> lines = new ArrayList<>();
-    lines.add(0);
-    int idx = NEWLINE.indexIn(input);
-    while (idx >= 0) {
-      lines.add(idx + 1);
-      idx = NEWLINE.indexIn(input, idx + 1);
-    }
-    lines.add(input.length() + 1);
-
-    final RangeSet<Integer> characterRanges = TreeRangeSet.create();
-    for (Range<Integer> lineRange :
-        lineRanges.subRangeSet(Range.closedOpen(0, lines.size() - 1)).asRanges()) {
-      int lineStart = lines.get(lineRange.lowerEndpoint());
-      // Exclude the trailing newline. This isn't strictly necessary, but handling blank lines
-      // as empty ranges is convenient.
-      int lineEnd = lines.get(lineRange.upperEndpoint()) - 1;
-      Range<Integer> range = Range.closedOpen(lineStart, lineEnd);
-      characterRanges.add(range);
-    }
-    return characterRanges;
-  }
 }
diff --git a/core/src/main/java/com/google/googlejavaformat/java/Formatter.java b/core/src/main/java/com/google/googlejavaformat/java/Formatter.java
@@ -14,9 +14,11 @@
 
 package com.google.googlejavaformat.java;
 
+import com.google.common.base.CharMatcher;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Range;
 import com.google.common.collect.RangeSet;
+import com.google.common.collect.TreeRangeSet;
 import com.google.common.io.CharSink;
 import com.google.common.io.CharSource;
 import com.google.errorprone.annotations.Immutable;
@@ -203,4 +205,34 @@ public ImmutableList<Replacement> getFormatReplacements(
     RangeSet<Integer> tokenRangeSet = javaInput.characterRangesToTokenRanges(characterRanges);
     return javaOutput.getFormatReplacements(tokenRangeSet);
   }
+
+  static final CharMatcher NEWLINE = CharMatcher.is('\n');
+
+  /**
+   * Converts zero-indexed, [closed, open) line ranges in the given source file to character
+   * ranges.
+   */
+  public static RangeSet<Integer> lineRangesToCharRanges(
+      String input, RangeSet<Integer> lineRanges) {
+    List<Integer> lines = new ArrayList<>();
+    lines.add(0);
+    int idx = NEWLINE.indexIn(input);
+    while (idx >= 0) {
+      lines.add(idx + 1);
+      idx = NEWLINE.indexIn(input, idx + 1);
+    }
+    lines.add(input.length() + 1);
+
+    final RangeSet<Integer> characterRanges = TreeRangeSet.create();
+    for (Range<Integer> lineRange :
+        lineRanges.subRangeSet(Range.closedOpen(0, lines.size() - 1)).asRanges()) {
+      int lineStart = lines.get(lineRange.lowerEndpoint());
+      // Exclude the trailing newline. This isn't strictly necessary, but handling blank lines
+      // as empty ranges is convenient.
+      int lineEnd = lines.get(lineRange.upperEndpoint()) - 1;
+      Range<Integer> range = Range.closedOpen(lineStart, lineEnd);
+      characterRanges.add(range);
+    }
+    return characterRanges;
+  }
 }
diff --git a/...vaformat/java/FormatFileCallableTest.java → ...rmat/java/LineRangesToCharRangesTest.java b/...vaformat/java/FormatFileCallableTest.java → ...rmat/java/LineRangesToCharRangesTest.java
@@ -26,17 +26,17 @@
 
 import java.util.Set;
 
-/** {@link FormatFileCallable}Test */
+/** Tests for {@link Formatter#lineRangesToCharRanges} */
 @RunWith(JUnit4.class)
-public class FormatFileCallableTest {
+public class LineRangesToCharRangesTest {
 
   @SafeVarargs
   final Set<Range<Integer>> getCharRanges(String input, Range<Integer>... ranges) {
     RangeSet<Integer> rangeSet = TreeRangeSet.create();
     for (Range<Integer> range : ranges) {
       rangeSet.add(range);
     }
-    return FormatFileCallable.lineRangesToCharRanges(input, rangeSet).asRanges();
+    return Formatter.lineRangesToCharRanges(input, rangeSet).asRanges();
   }
 
   @Test