Merge pull request #6232 from jecisc/simplify-ifNil-conditions

simplify-ifNil-conditions

src/Athens-Morphic/Morph.extension.st

@@ -2,10 +2,7 @@ Extension { #name : #Morph }
 
 { #category : #'*Athens-Morphic' }
 Morph >> athensSurface [
-
-	^ owner 
-		ifNil: [  nil ]
-		ifNotNil: [ owner athensSurface  ]
+	^ owner ifNotNil: [ owner athensSurface ]
 ]
 
 { #category : #'*Athens-Morphic' }

src/Collections-Unordered/KeyedTree.class.st

@@ -121,13 +121,15 @@ KeyedTree >> postCopy [
 		original and the copy.
 	Copy any subtrees too!"
 
-	array := array collect: [:assoc |
-			assoc ifNil: [nil]
-				ifNotNil: [Association
-							key: assoc key
-							value: ((assoc value isKindOf: KeyedTree)
-									ifTrue: [assoc value copy]
-									ifFalse: [assoc value])]]
+	array := array
+		collect: [ :assoc | 
+			assoc
+				ifNotNil: [ Association
+						key: assoc key
+						value:
+							((assoc value isKindOf: KeyedTree)
+								ifTrue: [ assoc value copy ]
+								ifFalse: [ assoc value ]) ] ]
 ]
 
 { #category : #printing }

src/Collections-Weak/WeakKeyDictionary.class.st

@@ -242,13 +242,12 @@ WeakKeyDictionary >> postCopy [
 	"Must copy the associations, or later store will affect both the
 original and the copy"
 
-	array := array collect: [:assoc |
-				assoc 
-					ifNil: [nil]
-					ifNotNil: [
-						assoc expired 
-							ifTrue: [ WeakKeyAssociation expired]
-							ifFalse: [WeakKeyAssociation key: assoc key value: assoc value]]]
+	array := array
+		collect: [ :assoc | 
+			assoc
+				ifNotNil: [ assoc expired
+						ifTrue: [ WeakKeyAssociation expired ]
+						ifFalse: [ WeakKeyAssociation key: assoc key value: assoc value ] ] ]
 ]
 
 { #category : #private }

src/DeprecatedFileStream/FileStream.class.st

@@ -239,10 +239,10 @@ FileStream class >> convertCRtoLF: fileName [
 
 { #category : #'instance creation' }
 FileStream class >> detectFile: aBlock do: anotherBlock [
-
-	^aBlock value
-		ifNil: [nil]
-      	ifNotNil: [:file| [anotherBlock value: file] ensure: [file close]]
+	^ aBlock value
+		ifNotNil: [ :file | 
+			[ anotherBlock value: file ]
+				ensure: [ file close ] ]
 ]
 
 { #category : #'file reader services' }

src/DeprecatedFileStream/RWBinaryOrTextStream.class.st

@@ -55,13 +55,11 @@ RWBinaryOrTextStream >> isBinary [
 
 { #category : #accessing }
 RWBinaryOrTextStream >> next [
-
 	| byte |
-	^ isBinary 
-			ifTrue: [byte := super next.
-				 byte ifNil: [nil] ifNotNil: [byte asciiValue]]
-			ifFalse: [super next].
-
+	^ isBinary
+		ifTrue: [ byte := super next.
+			byte ifNotNil: [ byte asciiValue ] ]
+		ifFalse: [ super next ]
 ]
 
 { #category : #accessing }

src/GT-InspectorExtensions-Core/CharacterSetComplement.extension.st

@@ -2,7 +2,6 @@ Extension { #name : #CharacterSetComplement }
 
 { #category : #'*GT-InspectorExtensions-Core' }
 CharacterSetComplement >> gtInspectorItemsIn: composite [
-
 	"The default set is huge, inspect the Absent list, which is typically a manageable size"
 
 	^ composite fastList
@@ -15,10 +14,7 @@ CharacterSetComplement >> gtInspectorItemsIn: composite [
 		showOnly: 50;
 		helpMessage: 'Quick selection field. Given your INPUT, it executes: self select: [:each | INPUT ]'."
 			result
-				ifNil: [ nil ]
 				ifNotNil: [ result size = 1
 						ifTrue: [ result anyOne ]
-						ifFalse: [ self species withAll: result ]
-					]
-			]
+						ifFalse: [ self species withAll: result ] ] ]
 ]

src/GT-InspectorExtensions-Core/Collection.extension.st

@@ -24,7 +24,6 @@ Collection >> gtDisplayOn: stream [
 
 { #category : #'*GT-InspectorExtensions-Core' }
 Collection >> gtInspectorItemsIn: composite [
-
 	<gtInspectorPresentationOrder: 0>
 	^ composite fastList
 		title: 'Items';
@@ -39,10 +38,7 @@ Collection >> gtInspectorItemsIn: composite [
 		showOnly: 50;
 		helpMessage: 'Quick selection field. Given your INPUT, it executes: self select: [:each | INPUT ]'."
 			result
-				ifNil: [ nil ]
 				ifNotNil: [ result size = 1
 						ifTrue: [ result anyOne ]
-						ifFalse: [ self species withAll: result ]
-					]
-			]
+						ifFalse: [ self species withAll: result ] ] ]
 ]

src/GT-InspectorExtensions-Core/Dictionary.extension.st

@@ -2,7 +2,6 @@ Extension { #name : #Dictionary }
 
 { #category : #'*GT-InspectorExtensions-Core' }
 Dictionary >> gtInspectorItemsIn: composite [
-
 	^ composite fastTable
 		title: 'Items';
 		display: [ self associations ];
@@ -16,24 +15,18 @@ Dictionary >> gtInspectorItemsIn: composite [
 		column: 'Value' evaluated: [ :each | GTObjectPrinter asTruncatedTextFrom: each value ];
 		selectionAct: [ :table | 
 			table rawSelection do: [ :assoc | self removeKey: assoc key ].
-			table update
-			]
+			table update ]
 			entitled: 'Remove item(s)';
-		selectionPopulate: #selection
-			entitled: 'Open key'
-			with: [ :table | ( table rawSelection collect: #key ) gtInspectorInterestingObject ];
+		selectionPopulate: #selection entitled: 'Open key' with: [ :table | (table rawSelection collect: #key) gtInspectorInterestingObject ];
 		beMultiple;
 		send: [ :selection | 
 			"withSmalltalkSearch;
 		showOnly: 50;
 		helpMessage: 'Quick selection field. Given your INPUT, it executes: self select: [:each | INPUT ]'"
 			selection
-				ifNil: [ nil ]
 				ifNotNil: [ selection size = 1
 						ifTrue: [ selection anyOne value ]
-						ifFalse: [ selection collect: #value ]
-					]
-			]
+						ifFalse: [ selection collect: #value ] ] ]
 ]
 
 { #category : #'*GT-InspectorExtensions-Core' }

src/GT-InspectorExtensions-Core/OrderedDictionary.extension.st

@@ -2,7 +2,6 @@ Extension { #name : #OrderedDictionary }
 
 { #category : #'*GT-InspectorExtensions-Core' }
 OrderedDictionary >> gtInspectorItemsIn: composite [
-
 	^ composite fastTable
 		title: 'Items';
 		display: [ self associations ];
@@ -16,22 +15,16 @@ OrderedDictionary >> gtInspectorItemsIn: composite [
 		column: 'Value' evaluated: [ :each | GTObjectPrinter asTruncatedTextFrom: each value ];
 		selectionAct: [ :table | 
 			table rawSelection do: [ :assoc | self removeKey: assoc key ].
-			table update
-			]
+			table update ]
 			entitled: 'Remove item(s)';
-		selectionPopulate: #selection
-			entitled: 'Open key'
-			with: [ :table | ( table rawSelection collect: #key ) gtInspectorInterestingObject ];
+		selectionPopulate: #selection entitled: 'Open key' with: [ :table | (table rawSelection collect: #key) gtInspectorInterestingObject ];
 		beMultiple;
 		send: [ :selection | 
 			"withSmalltalkSearch;
 		showOnly: 50;
 		helpMessage: 'Quick selection field. Given your INPUT, it executes: self select: [:each | INPUT ]'"
 			selection
-				ifNil: [ nil ]
 				ifNotNil: [ selection size = 1
 						ifTrue: [ selection anyOne value ]
-						ifFalse: [ selection collect: #value ]
-					]
-			]
+						ifFalse: [ selection collect: #value ] ] ]
 ]

src/GT-InspectorExtensions-Core/SequenceableCollection.extension.st

@@ -2,7 +2,6 @@ Extension { #name : #SequenceableCollection }
 
 { #category : #'*GT-InspectorExtensions-Core' }
 SequenceableCollection >> gtInspectorItemsIn: composite [
-
 	^ composite fastTable
 		title: 'Items';
 		display: [ self ];
@@ -16,10 +15,7 @@ SequenceableCollection >> gtInspectorItemsIn: composite [
 		showOnly: 50;
 		helpMessage: 'Quick selection field. Given your INPUT, it executes: self select: [:each | INPUT ]'."
 			result
-				ifNil: [ nil ]
 				ifNotNil: [ result size = 1
 						ifTrue: [ result anyOne ]
-						ifFalse: [ self species withAll: result ]
-					]
-			]
+						ifFalse: [ self species withAll: result ] ] ]
 ]

src/GT-InspectorExtensions-Core/SmallDictionary.extension.st

@@ -2,7 +2,6 @@ Extension { #name : #SmallDictionary }
 
 { #category : #'*GT-InspectorExtensions-Core' }
 SmallDictionary >> gtInspectorItemsIn: composite [
-
 	^ composite fastTable
 		title: 'Items';
 		display: [ self associations ];
@@ -16,22 +15,16 @@ SmallDictionary >> gtInspectorItemsIn: composite [
 		column: 'Value' evaluated: [ :each | GTObjectPrinter asTruncatedTextFrom: each value ];
 		selectionAct: [ :table | 
 			table rawSelection do: [ :assoc | self removeKey: assoc key ].
-			table update
-			]
+			table update ]
 			entitled: 'Remove item(s)';
-		selectionPopulate: #selection
-			entitled: 'Open key'
-			with: [ :table | ( table rawSelection collect: #key ) gtInspectorInterestingObject ];
+		selectionPopulate: #selection entitled: 'Open key' with: [ :table | (table rawSelection collect: #key) gtInspectorInterestingObject ];
 		beMultiple;
 		send: [ :selection | 
 			"withSmalltalkSearch;
 		showOnly: 50;
 		helpMessage: 'Quick selection field. Given your INPUT, it executes: self select: [:each | INPUT ]'"
 			selection
-				ifNil: [ nil ]
 				ifNotNil: [ selection size = 1
 						ifTrue: [ selection anyOne value ]
-						ifFalse: [ selection collect: #value ]
-					]
-			]
+						ifFalse: [ selection collect: #value ] ] ]
 ]

src/GT-Spotter-Processors/SptTransformation.class.st

@@ -11,8 +11,7 @@ Class {
 
 { #category : #accessing }
 SptTransformation >> next [
-
-	^ inner next ifNil: [ nil ] ifNotNil:[ :aValue | self transform: aValue]
+	^ inner next ifNotNil: [ :aValue | self transform: aValue ]
 ]
 
 { #category : #tranforming }

src/GT-Spotter/GTSpotterCandidatesList.class.st

@@ -215,24 +215,23 @@ GTSpotterCandidatesList >> previousProcessorLinkOf: aProcessorLink [
 { #category : #private }
 GTSpotterCandidatesList >> privateAddCandidate: aCandidateLink inEmpty: aProcessorLink [
 	| head current |
-
 	current := aProcessorLink.	"not nil"
-	head := nil.						"nil"
-	[ head isNil and: [ current isNotNil ]] whileTrue: [	
-		current := current nextLink.	"next category"
-		"head of next category if not nil break loop"
-		current ifNotNil: [ head := current headLink ] ifNil: [ nil ] ].
-	
+	head := nil.	"nil"
+	[ head isNil and: [ current isNotNil ] ]
+		whileTrue: [ current := current nextLink.	"next category"
+			"head of next category if not nil break loop"
+			current ifNotNil: [ head := current headLink ] ].
+
 	"means all next categories are empty, just add to the end"
 	current
 		ifNil: [ self candidates addLast: aCandidateLink ]
 		ifNotNil: [ self candidates add: aCandidateLink beforeLink: head ].
-		aProcessorLink
-			headLink: aCandidateLink;
-			tailLink: aCandidateLink.
-			
-		aProcessorLink incrementSize.
-		
+	aProcessorLink
+		headLink: aCandidateLink;
+		tailLink: aCandidateLink.
+
+	aProcessorLink incrementSize.
+
 	^ aCandidateLink
 ]
 

src/Glamour-Core/GLMPresentation.class.st

@@ -1040,11 +1040,7 @@ GLMPresentation >> title: aStringOrBlock [
 
 { #category : #accessing }
 GLMPresentation >> titleAction [
-
-	^ self titleActionBlock 
-		ifNil: [ nil ]
-		ifNotNil: [ :aBlock |
-			aBlock glamourValue: self ]
+	^ self titleActionBlock ifNotNil: [ :aBlock | aBlock glamourValue: self ]
 ]
 
 { #category : #'scripting actions' }

src/Glamour-Morphic-Renderer/GLMMorphicWidgetRenderer.class.st

@@ -51,35 +51,27 @@ GLMMorphicWidgetRenderer >> installKeystrokeActionsOnMorph: aMorph fromPresentat
 
 { #category : #private }
 GLMMorphicWidgetRenderer >> labelActionBrickFor: aPresentation [
-
-	 ^ aPresentation titleAction 
-		ifNil: [ nil ]
-		ifNotNil: [ :labelAction |
+	^ aPresentation titleAction
+		ifNotNil: [ :labelAction | 
 			((labelAction isAvailableOn: aPresentation) and: [ labelAction hasIcon ])
-				ifTrue: [
-					GLMActionButtonBrick new
+				ifTrue: [ GLMActionButtonBrick new
 						icon: labelAction icon;
 						setBalloonText: labelAction title;
 						action: [ labelAction actOn: aPresentation ] ]
 				ifFalse: [ nil ] ]
-
 ]
 
 { #category : #private }
 GLMMorphicWidgetRenderer >> labelActionMorphFor: aPresentation [
-
-	 ^ aPresentation titleAction 
-		ifNil: [ nil ]
-		ifNotNil: [ :labelAction |
+	^ aPresentation titleAction
+		ifNotNil: [ :labelAction | 
 			((labelAction isAvailableOn: aPresentation) and: [ labelAction hasIcon ])
-				ifTrue: [ 
-					MultistateButtonMorph new
+				ifTrue: [ MultistateButtonMorph new
 						extent: labelAction icon extent;
 						activeEnabledOverUpFillStyle: (ImageFillStyle form: labelAction icon);
 						setBalloonText: labelAction title;
 						addUpAction: [ labelAction actOn: aPresentation ] ]
 				ifFalse: [ nil ] ]
-
 ]
 
 { #category : #private }

src/Glamour-Morphic-Widgets/GLMRubricSmalltalkTextModel.class.st

@@ -94,8 +94,7 @@ GLMRubricSmalltalkTextModel >> selectedClassOrMetaClass [
 
 { #category : #accessing }
 GLMRubricSmalltalkTextModel >> selectedMethod [
-
-	^ self doItContext ifNil: [ nil ] ifNotNil: [ :aContext | aContext method ]
+	^ self doItContext ifNotNil: [ :aContext | aContext method ]
 ]
 
 { #category : #shout }

src/Glamour-Morphic-Widgets/GLMTreeMorphModel.class.st

@@ -331,10 +331,7 @@ GLMTreeMorphModel >> selection: aSelection [
 
 { #category : #accessing }
 GLMTreeMorphModel >> selectionPathItems [
-
-	^ self selectedNodePath
-		ifNil: [ nil ]
-		ifNotNil: [ self selectedNodePath collect: [ :each | each item ] ]
+	^ self selectedNodePath ifNotNil: [ self selectedNodePath collect: [ :each | each item ] ]
 ]
 
 { #category : #stepping }

src/Glamour-Presentations/GLMSmalltalkCodePresentation.class.st

@@ -101,10 +101,7 @@ GLMSmalltalkCodePresentation >> evaluateSelectionAndDo: aBlock [
 
 { #category : #accessing }
 GLMSmalltalkCodePresentation >> highlightSmalltalkContext [
-
-	^ highlightSmalltalkContext
-		ifNil: [ nil ]
-		ifNotNil: [ highlightSmalltalkContext glamourValue: self entity ]
+	^ highlightSmalltalkContext ifNotNil: [ highlightSmalltalkContext glamourValue: self entity ]
 ]
 
 { #category : #rendering }

src/Glamour-Presentations/GLMTextPresentation.class.st

@@ -37,10 +37,7 @@ GLMTextPresentation >> highlightSmalltalk [
 
 { #category : #accessing }
 GLMTextPresentation >> highlightSmalltalkContext [
-
-	^ highlightSmalltalkContext
-		ifNil: [ nil ]
-		ifNotNil: [ highlightSmalltalkContext glamourValue: self entity ]
+	^ highlightSmalltalkContext ifNotNil: [ highlightSmalltalkContext glamourValue: self entity ]
 ]
 
 { #category : #rendering }