50642

17811 { film . FILM } is formatted as { film . FILM . } 
	https://pharo.fogbugz.com/f/cases/17811

17807 WorldMorph settings should be able to set both background image and color from the settings
	https://pharo.fogbugz.com/f/cases/17807

http://files.pharo.org/image/50/50642.zip

AST-Core.package/BISimpleFormatter.class/instance/private-formatting/formatArray_.st

@@ -1,6 +1,7 @@
 formatArray: anArrayNode
 	anArrayNode statements
 		do: [ :each | 
-				self visitNode: each. 
-				codeStream nextPut: $..
+				self visitNode: each ]
+		separatedBy: 
+				[ codeStream nextPutAll: ' . ' .
 				self newLine ]

AST-Tests-Core.package/RBFormatterTest.class/instance/testing/testLiteralDynamicArray.st

@@ -0,0 +1,5 @@
+testLiteralDynamicArray
+	| source tree1 |
+	source := 'foo ^ { ''film'' . ''FILM''} '.
+	tree1 := RBParser parseMethod: source.
+	self assert: ((self formatterClass new format: tree1) occurrencesOf: $.) = 1

BlueInk-Core.package/BIConfigurableFormatter.class/instance/private-formatting/formatArray_.st

@@ -1,12 +1,15 @@
 formatArray: anArrayNode
+	| current | 
 	(anArrayNode statements reject: [ :each | each className = 'RBLiteralValueNode' ])
 		ifEmpty: [ 
 			anArrayNode statements
 				do: [ :each | 
-					self visitNode: each.
-					(self isLineTooLong: each value asString)
+					current := each. 
+					self visitNode: each ]
+				separatedBy: [  
+					(self isLineTooLong: current value asString)
 						ifTrue: [ 
 							codeStream nextPut: $..
 							self newLine ]
-						ifFalse: [ codeStream nextPutAll: '. ' ] ] ]
+						ifFalse: [ codeStream nextPutAll: ' . ' ] ] ]
 		ifNotEmpty: [ self formatSequenceNodeStatementsFor: anArrayNode ]

ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/script50641.st → ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/script50642.st

@@ -1,8 +1,8 @@
-script50641
+script50642
 
-	^ 'AST-Core-TheIntegrator.409.mcz
+	^ 'AST-Core-TheIntegrator.411.mcz
 AST-FFI-Pharo50Compatibility-EstebanLorenzano.1.mcz
-AST-Tests-Core-TheIntegrator.93.mcz
+AST-Tests-Core-TheIntegrator.95.mcz
 Alien-EstebanLorenzano.31.mcz
 Announcements-Core-EstebanLorenzano.65.mcz
 Announcements-Help-TheIntegrator.12.mcz
@@ -20,7 +20,7 @@ BaselineOfFileTree-ThierryGoubier.15.mcz
 BaselineOfMetacello-EstebanLorenzano.89.mcz
 BaselineOfQualityAssistant-YuriyTymchuk.45.mcz
 BaselineOfRenraku-YuriyTymchuk.5.mcz
-BlueInk-Core-TheIntegrator.14.mcz
+BlueInk-Core-TheIntegrator.18.mcz
 BlueInk-Extras-TheIntegrator.8.mcz
 BlueInk-Tests-TheIntegrator.8.mcz
 Chroma-CubeHelix-TheIntegrator.2.mcz
@@ -277,7 +277,7 @@ SUnit-UI-EstebanLorenzano.138.mcz
 SUnit-UITesting-TheIntegrator.32.mcz
 ScriptLoader-Tests-TheIntegrator.4.mcz
 Settings-Graphics-StephaneDucasse.28.mcz
-Settings-Polymorph-TheIntegrator.85.mcz
+Settings-Polymorph-TheIntegrator.88.mcz
 Settings-System-TheIntegrator.40.mcz
 ShoreLine-Report-Core-TommasoDalSasso.11.mcz
 ShoreLine-Report-Settings-TommasoDalSasso.2.mcz

ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50642.st

@@ -0,0 +1,9 @@
+update50642
+	"self new update50642"
+	self withUpdateLog: '17811 { film . FILM } is formatted as { film . FILM . } 
+	https://pharo.fogbugz.com/f/cases/17811
+
+17807 WorldMorph settings should be able to set both background image and color from the settings
+	https://pharo.fogbugz.com/f/cases/17807'.
+	self loadTogether: self script50642 merge: false.
+	self flushCaches.

ScriptLoader50.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st

@@ -1,5 +1,6 @@
 commentForCurrentUpdate
- ^ '17793 Get coherent diff for metacello packages
-	https://pharo.fogbugz.com/f/cases/17793
+ ^ '17811 { film . FILM } is formatted as { film . FILM . } 
+	https://pharo.fogbugz.com/f/cases/17811
 
-'
+17807 WorldMorph settings should be able to set both background image and color from the settings
+	https://pharo.fogbugz.com/f/cases/17807'

Settings-Polymorph.package/PolymorphSystemSettings.class/class/desktop/desktopBackgroundChanged.st

@@ -1,10 +1,13 @@
 desktopBackgroundChanged
 	| fill |
+
 	self desktopImageFileName
 		ifEmpty: [UIManager default currentWorld world backgroundMorph: nil]
-		ifNotEmpty: [^ [World backgroundImage: (Form fromFileNamed: self desktopImageFileName) layout: self desktopImageLayout ]
-				on: Error
-				do: []].
+		ifNotEmpty: [ [
+				World backgroundImage: (Form fromFileNamed: self desktopImageFileName) layout: self desktopImageLayout 
+			] on: Error	do: []
+		].
+
 	self useDesktopGradientFill
 		ifTrue: [World fillStyle isGradientFill
 				ifTrue: [fill := World fillStyle]
@@ -29,4 +32,5 @@ desktopBackgroundChanged
 							fill normal: 0 @ World height]].
 			World fillStyle: fill]
 		ifFalse: [World color: self desktopColor].
+
 		World changed