Merge pull request #4594 from kasperosterbye/2845-Error-in-Collection…

…flatCollect-b-as-String

2845-Error-in-CollectionflatCollect-b-as-String

src/Collections-Abstract/Collection.class.st

@@ -695,11 +695,11 @@ Collection >> flatCollect: aBlock as: aCollectionClass [
 	"Evaluate aBlock for each of the receiver's elements and answer the
 	list of all resulting values flatten one level. Assumes that aBlock returns some kind
 	of collection for each element. Equivalent to the lisp's mapcan"
+
 	| col |
-	col := aCollectionClass new: self size. 	
-	self do: [ :each |
-		col addAll: (aBlock value: each) ].
-	^col
+	col := OrderedCollection new: self size.
+	self do: [ :each | col addAll: (aBlock value: each) ].
+	^ aCollectionClass withAll: col 
 ]
 
 { #category : #enumerating }

src/Collections-Tests/TEnumeratingTest.trait.st

@@ -49,7 +49,13 @@ TEnumeratingTest >> testFlatCollectAs [
 
 	self 
 		assert: (self simpleCollection flatCollect: [ :x | { x }, { x } ] as: IdentitySet) 
-		equals: self simpleCollection asIdentitySet
+		equals: self simpleCollection asIdentitySet.
+	self
+		assert: (#(foo bar baz) flatCollect: #yourself as: String)
+		equals: 'foobarbaz'.
+	self 
+		assert: (#(#(1 2) #(4 3)) flatCollect: #yourself as: Array)
+		equals: #(1 2 4 3)
 ]
 
 { #category : #'tests - enumerating' }