tim Rowledge uploaded a new version of Monticello to project The Trunk:
http://source.squeak.org/trunk/Monticello-tpr.787.mcz

==================== Summary ====================

Name: Monticello-tpr.787
Author: tpr
Time: 15 January 2023, 4:42:50.007245 pm
UUID: b343ba07-4b43-4eae-9293-e18d885d0d06
Ancestors: Monticello-eem.786

Remove some variable shadowing

=============== Diff against Monticello-eem.786 ===============

Item was changed:
  ----- Method: MCClassDefinition>>createClass (in category 'installing') -----
  createClass
  	| environment superClass class composition |
  	environment := Environment current.
  	superClass := superclassName == #nil ifFalse:
  					[environment valueOf: superclassName
  						ifAbsent: [(KeyNotFound key: superclassName) signal]].
  	[class := (ClassBuilder new)
  			name: name 
  			inEnvironment: environment
  			subclassOf: superClass
  			type: type 
  			instanceVariableNames: self instanceVariablesString 
  			classVariableNames: self classVariablesString 
  			poolDictionaries: self sharedPoolsString
+ 			category: category]
+ 		on: Warning, DuplicateVariableError
+ 		do:[:ex| ex resume].
- 			category: category.
- 	] on: Warning, DuplicateVariableError do:[:ex| ex resume].
  
  	"The following is written to support traits unloading"
+ 	composition := self traitComposition ifNil: [Array empty] ifNotNil: [:traitComp | Compiler evaluate: traitComp].
+ 	(composition isCollection and:[composition isEmpty and:[class traitComposition isEmpty]]) ifFalse:
+ 		[class setTraitComposition: composition asTraitComposition].
- 	composition := self traitComposition ifNil: [Array empty] ifNotNil: [:traitComposition | Compiler evaluate: traitComposition].
- 	(composition isCollection and:[composition isEmpty and:[class traitComposition isEmpty]]) ifFalse:[
- 		class setTraitComposition: composition asTraitComposition.
- 	].
  
+ 	composition := self classTraitComposition
+ 						ifNil: [Array new]
+ 						ifNotNil: [:traitComp | Compiler evaluate: traitComp].
+ 	(composition isCollection and:[composition isEmpty and:[class class traitComposition isEmpty]]) ifFalse:
+ 		[class class setTraitComposition: composition asTraitComposition].
- 	composition := self classTraitComposition ifNil: [Array new] ifNotNil: [:traitComposition | Compiler evaluate: traitComposition].
- 	(composition isCollection and:[composition isEmpty and:[class class traitComposition isEmpty]]) ifFalse:[
- 		class class setTraitComposition: composition asTraitComposition.
- 	].
  
  	^class!

Item was changed:
  ----- Method: MCMethodDefinition>>printAnnotations:on: (in category 'annotations') -----
  printAnnotations: requests on: aStream
  	"Add a string for an annotation pane, trying to fulfill the annotation requests.
  	These might include anything that
  		Preferences defaultAnnotationRequests 
  	might return. Which includes anything in
  		Preferences annotationInfo
  	To edit these, use:"
  	"Preferences editAnnotations"
  
  	| annotationSeparator annotations |
  	annotationSeparator := ' · '. "Same as in CodeHolder"
  	annotations := requests
  		collect: [:request | request
  			caseOf: {
  				[#timeStamp] -> [self timeStamp].
  				[#author] -> [
  					| initials |
+ 					initials := self timeStamp findTokens ifNotEmpty: [:tokens | tokens first].
- 					initials := self timeStamp ifNotNil: [:timeStamp |
- 						timeStamp findTokens ifNotEmpty: [:tokens | tokens first]].
  					SystemNavigation authorsInverted
  						at: initials
  						ifPresent: [:fullNames | fullNames anyOne]
  						ifAbsent: ['unknown author' translated]].
  				[#messageCategory] -> [self category].
  				[#requirements] -> [self requirements joinSeparatedBy: Character space] }
  			otherwise: []]
  		thenSelect: [:annotation | annotation isEmptyOrNil not].
  	
  	annotations 
  		do: [:annotation | aStream nextPutAll: annotation]
  		separatedBy: [aStream nextPutAll: annotationSeparator].!