Merge pull request #1262 from jsuereth/fix/SI-6271

Fixes SI-6271 - Missing isEmpty override for views.

2 files changed, 33 insertions, 0 deletions

diff --git a/src/library/scala/collection/GenIterableViewLike.scala b/src/library/scala/collection/GenIterableViewLike.scala
index 9e3927eaf4..142561df20 100644
--- a/src/library/scala/collection/GenIterableViewLike.scala
+++ b/src/library/scala/collection/GenIterableViewLike.scala
@@ -25,6 +25,7 @@ self =>
     def iterator: Iterator[B]
     override def foreach[U](f: B => U): Unit = iterator foreach f
     override def toString = viewToString
+    override def isEmpty = !iterator.hasNext
   }
 
   trait EmptyView extends Transformed[Nothing] with super.EmptyView {
diff --git a/test/files/run/t6271.scala b/test/files/run/t6271.scala
new file mode 100644
index 0000000000..8ebf7ad8b5
--- /dev/null
+++ b/test/files/run/t6271.scala
@@ -0,0 +1,32 @@
+object Test extends App {
+  def filterIssue = {
+    val viewed : Iterable[Iterable[Int]] = List(List(0).view).view
+    val filtered = viewed flatMap { x => List( x filter (_ > 0) ) }
+    filtered.iterator.toIterable.flatten
+  }
+  def takenIssue = {
+    val viewed : Iterable[Iterable[Int]] = List(List(0).view).view
+    val filtered = viewed flatMap { x => List( x take 0 ) }
+    filtered.iterator.toIterable.flatten
+  }
+  def droppedIssue = {
+    val viewed : Iterable[Iterable[Int]] = List(List(0).view).view
+    val filtered = viewed flatMap { x => List( x drop 1 ) }
+    filtered.iterator.toIterable.flatten
+  }
+  def flatMappedIssue = {
+    val viewed : Iterable[Iterable[Int]] = List(List(0).view).view
+    val filtered = viewed flatMap { x => List( x flatMap (_ => List()) ) }
+    filtered.iterator.toIterable.flatten
+  }
+  def slicedIssue = {
+    val viewed : Iterable[Iterable[Int]] = List(List(0).view).view
+    val filtered = viewed flatMap { x => List( x slice (2,3) ) }
+    filtered.iterator.toIterable.flatten
+  }
+  filterIssue
+  takenIssue
+  droppedIssue
+  flatMappedIssue
+  slicedIssue
+}