Merge pull request #2961 from paulp/pr/whitespace

Cull extraneous whitespace.

5 files changed, 26 insertions, 21 deletions

diff --git a/src/reflect/scala/reflect/internal/Flags.scala b/src/reflect/scala/reflect/internal/Flags.scala
index b8e3407824..c286ea53c6 100644
--- a/src/reflect/scala/reflect/internal/Flags.scala
+++ b/src/reflect/scala/reflect/internal/Flags.scala
@@ -118,7 +118,7 @@ class ModifierFlags {
   final val PRESUPER      = 1L << 37      // value is evaluated before super call
   final val DEFAULTINIT   = 1L << 41      // symbol is initialized to the default value: used by -Xcheckinit
   final val ARTIFACT      = 1L << 46      // symbol should be ignored when typechecking; will be marked ACC_SYNTHETIC in bytecode
-  final val DEFAULTMETHOD = 1L << 47      // symbol is a java default method  
+  final val DEFAULTMETHOD = 1L << 47      // symbol is a java default method
 
   /** Symbols which are marked ARTIFACT. (Expand this list?)
    *
@@ -440,7 +440,7 @@ class Flags extends ModifierFlags {
     case        TRIEDCOOKING => "<triedcooking>"                      // (1L << 44)
     case        SYNCHRONIZED => "<synchronized>"                      // (1L << 45)
     case            ARTIFACT => "<artifact>"                          // (1L << 46)
-    case       DEFAULTMETHOD => "<defaultmethod>"                     // (1L << 47)      
+    case       DEFAULTMETHOD => "<defaultmethod>"                     // (1L << 47)
     case    0x1000000000000L => ""                                    // (1L << 48)
     case    0x2000000000000L => ""                                    // (1L << 49)
     case    0x4000000000000L => ""                                    // (1L << 50)
diff --git a/src/reflect/scala/reflect/internal/Scopes.scala b/src/reflect/scala/reflect/internal/Scopes.scala
index 8d20c8e546..485d4d5ddd 100644
--- a/src/reflect/scala/reflect/internal/Scopes.scala
+++ b/src/reflect/scala/reflect/internal/Scopes.scala
@@ -460,6 +460,4 @@ trait Scopes extends api.Scopes { self: SymbolTable =>
   class ErrorScope(owner: Symbol) extends Scope
 
   private final val maxRecursions = 1000
-
 }
-
diff --git a/src/reflect/scala/reflect/internal/pickling/ByteCodecs.scala b/src/reflect/scala/reflect/internal/pickling/ByteCodecs.scala
index eb266e8125..8615e34fad 100644
--- a/src/reflect/scala/reflect/internal/pickling/ByteCodecs.scala
+++ b/src/reflect/scala/reflect/internal/pickling/ByteCodecs.scala
@@ -212,11 +212,3 @@ object ByteCodecs {
     decode7to8(xs, len)
   }
 }
-
-
-
-
-
-
-
-
diff --git a/src/reflect/scala/reflect/internal/util/Set.scala b/src/reflect/scala/reflect/internal/util/Set.scala
index 75dcfaa59b..635bfb05e4 100644
--- a/src/reflect/scala/reflect/internal/util/Set.scala
+++ b/src/reflect/scala/reflect/internal/util/Set.scala
@@ -23,5 +23,4 @@ abstract class Set[T <: AnyRef] {
     findEntry(x) ne null
 
   def toList = iterator.toList
-
 }
diff --git a/src/reflect/scala/reflect/internal/util/StringOps.scala b/src/reflect/scala/reflect/internal/util/StringOps.scala
index 4d98a344d8..14f349f502 100644
--- a/src/reflect/scala/reflect/internal/util/StringOps.scala
+++ b/src/reflect/scala/reflect/internal/util/StringOps.scala
@@ -7,7 +7,11 @@
 \*                                                                      */
 
 package scala
-package reflect.internal.util
+package reflect
+package internal
+package util
+
+import scala.compat.Platform.EOL
 
 /** This object provides utility methods to extract elements
  *  from Strings.
@@ -18,14 +22,26 @@ package reflect.internal.util
 trait StringOps {
   def oempty(xs: String*)        = xs filterNot (x => x == null || x == "")
   def ojoin(xs: String*): String = oempty(xs: _*) mkString " "
-  def longestCommonPrefix(xs: List[String]): String = {
-    if (xs.isEmpty || xs.contains("")) ""
-    else xs.head.head match {
-      case ch =>
-        if (xs.tail forall (_.head == ch)) "" + ch + longestCommonPrefix(xs map (_.tail))
-        else ""
-    }
+  def longestCommonPrefix(xs: List[String]): String = xs match {
+    case Nil                  => ""
+    case xs if xs contains "" => ""
+    case x :: xs             =>
+      val ch = x charAt 0
+      if (xs exists (_.head != ch)) ""
+      else "" + ch + longestCommonPrefix(xs map (_ substring 1))
+  }
+  /** Like String#trim, but trailing whitespace only.
+   */
+  def trimTrailingSpace(s: String): String = {
+    var end = s.length
+    while (end > 0 && s.charAt(end - 1).isWhitespace)
+      end -= 1
+
+    if (end == s.length) s
+    else s.substring(0, end)
   }
+  /** Breaks the string into lines and strips each line before reassembling. */
+  def trimAllTrailingSpace(s: String): String = s.lines map trimTrailingSpace mkString EOL
 
   def decompose(str: String, sep: Char): List[String] = {
     def ws(start: Int): List[String] =