hg/stx-libtool: comparison ChangesBrowser.st

equal deleted inserted replaced

-:019abbda4196
+:819f12f70f46
 	privateIn:ChangesBrowser
 !
 Object subclass:#ChangeInfo
 	instanceVariableNames:'position chunk className selector headerLine timestamp
-		isFollowupChange'
+		isFollowupChange categoryIfCategoryChange'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:ChangesBrowser
 !
 written jan 90 by claus
 This is a very old leftover class (it was one of the very first apps in ST/X
 and the Merovingian has not yet detected this one ;-)
-It will be completely replaced by the ChangeSetBrowser class in the near future.
+At the time this was originally written, I had a 2Mb machine, and every memory byte was a very valuable.
+Therefore, the original did not keep any infos in memory, but instead kept a list of change-chunk file offsets,
+and parsed the chunks over and over (eg. when searching for classname/selector etc.)
+Later, when bigger memories became available, more and more infos where cached in additional arrays (classname,
+selector, etc.) and those where finally condensed into a single changeInfo object.
+However, now that really enough memory is avail, this is really no longer useful, and we should keep
+changeSet entries instead (which hold the same info plus more).
+The ChangeSetBrowser does exactly this, but does not support all of the fancy compress/delete etc.
+operations of the ChangesBrowser, to which we got used so much.
+Thus, this one kept on living its zombie life and gets occasional features added (sigh)...
+(Well, like many workhorses, they become ugly when aged, but still do their duty)
+It MUST eventually be completely replaced by the ChangeSetBrowser class in the near future.
 [Class variables:]
 CompressSnapshotInfo            if true (the default), snapshot entries
 are also compressed in the compress function.
 isVisible: notEditingClassSource
 )
 (MenuItem
 label: 'Compare and Compress'
 itemValue: doCompareAndCompress
+isVisible: notEditingClassSource
+)
+(MenuItem
+label: '-'
+isVisible: notEditingClassSource
+)
+(MenuItem
+label: 'Cleanup'
+itemValue: doCleanup
 isVisible: notEditingClassSource
 )
 (MenuItem
 label: '-'
 isVisible: notEditingClassSource
 !
 postRealize
 self setupTabSpec.
 self readChangesFileInBackground:true.
-self setChangeList.
+self updateChangeList.
 changeListView action:[:lineNrOrCollection | self changeSelection:lineNrOrCollection].
 Processor addTimedBlock:checkBlock afterSeconds:5.
 "Created: 24.7.1997 / 18:06:12 / cg"
 !
 ask the user if all operations should be aborted..."
 multipleApply := (lastNr - changeNr) > 1.
 changeNr to:lastNr do:[:changeNr |
 | cls sel |
 changeListView setSelection:changeNr.
 ((cls := self classOfChange:changeNr ifAbsent:[:className| nil]) notNil
 and:[(sel := self selectorOfMethodChange:changeNr) notNil])
 ifTrue:[
 checkinInfo := SourceCodeManagerUtilities default
 getCheckinInfoFor:logTitle
 initialAnswer:nil.
 checkinInfo isNil ifTrue:[^ self ].
-changeListView setSelection:nil.
+self unselect.
 classes do:[:eachClass |
 (SourceCodeManagerUtilities default checkinClass:eachClass withInfo:checkinInfo)
 ifTrue:[
 self silentDeleteChangesForClassAndPrivateClasses:eachClass name
 from:1 to:(self numberOfChanges).
 ]
 ].
-self setChangeList.
+self updateChangeList.
 ]
 "Modified: / 6.9.1995 / 17:11:16 / claus"
 "Modified: / 17.11.2001 / 14:21:13 / cg"
+!
+doCleanup
+"cleanup the changefile/changeset.
+actions done:
+- from the end, find changes which are equal to the current version
+and not in the current changeset (i.e. represent the current version as built).
+Then delete it incl. previous versions of it."
+|numChanges nextChangeNr changeNr changeSelector changeClass numDeleted|
+numChanges := self numberOfChanges.
+self unselect.
+self withWaitCursorDo:[
+"/ find the last method change which is equal
+changeNr := numChanges.
+[changeNr > 0] whileTrue:[
+nextChangeNr := changeNr - 1.
+(changeClass := self classOfChange:changeNr ifAbsent:nil) notNil ifTrue:[
+(changeInfoList at:changeNr) isMethodCategoryChange ifTrue:[
+(self compareChange:changeNr showResult:false) == true ifTrue:[
+(changeSelector := self selectorOfMethodCategoryChange:changeNr) notNil ifTrue:[
+(ChangeSet current includesChangeForClass:changeClass selector:changeSelector) ifFalse:[
+infoHolder value:('Deleting category changes for %1 >> %2' bindWith:changeClass name with:changeSelector).
+self windowGroup repairDamage.
+numDeleted := self
+silentDeleteMethodCategoryChangesFor:changeClass name selector:changeSelector
+from:1 to:changeNr.
+"/ self selectChange:changeNr.
+"/ self doDeleteClassSelectorOlder.
+nextChangeNr := (changeNr - numDeleted + 1) min:self numberOfChanges.
+].
+].
+].
+] ifFalse:[
+(changeSelector := self selectorOfMethodChange:changeNr) notNil ifTrue:[
+(self compareChange:changeNr showResult:false) == true ifTrue:[
+"/ found a method change, which is the same as the current version
+"/ if in the current changeSet, then do not delete (needs checkin first)
+(ChangeSet current includesChangeForClass:changeClass selector:changeSelector) ifFalse:[
+infoHolder value:('Deleting changes for %1 >> %2' bindWith:changeClass name with:changeSelector).
+self windowGroup repairDamage.
+numDeleted := self
+silentDeleteChangesFor:changeClass name selector:changeSelector
+from:1 to:changeNr.
+"/ self selectChange:changeNr.
+"/ self doDeleteClassSelectorOlder.
+nextChangeNr := (changeNr - numDeleted + 1) min:self numberOfChanges.
+].
+].
+].
+].
+].
+changeNr := nextChangeNr.
+].
+].
+self updateChangeList.
 !
 doCompare
 "compare change with current system version"
 ].
 toDelete reverseDo:[:changeNr |
 self silentDeleteChange:changeNr.
 ].
-self setChangeList.
+self updateChangeList.
 "
 scroll back a bit, if we are left way behind the list
 "
 changeListView firstLineShown > self numberOfChanges ifTrue:[
 changeListView makeLineVisible:self numberOfChanges
 lastChangeNr := lastChangeNr max:changeNr.
 ].
 namespacesToDelete isEmpty ifTrue:[^ self].
 overAllNumDeletedBefore := 0.
-changeListView setSelection:nil.
+self unselect.
 self withExecuteCursorDo:[
 namespacesToDelete do:[:namespaceToDelete |
 |numDeletedBefore|
 lastChangeNr := lastChangeNr - numDeletedBefore.
 overAllNumDeletedBefore := overAllNumDeletedBefore + numDeletedBefore.
 ].
 ].
-self setChangeList.
+self updateChangeList.
 self autoSelectOrEnd:lastChangeNr.
 !
 doDeleteAndSelectPrevious
 "delete currently selected change(s)"
 ].
 lastChangeNr := lastChangeNr max:changeNr.
 ].
 overAllNumDeletedBefore := 0.
-changeListView setSelection:nil.
+self unselect.
 self withExecuteCursorDo:[
 classNamesToDelete do:[:classNameToDelete |
 |numDeletedBefore|
 lastChangeNr := lastChangeNr - numDeletedBefore.
 overAllNumDeletedBefore := overAllNumDeletedBefore + numDeletedBefore.
 ].
 ].
-self setChangeList.
+self updateChangeList.
 self autoSelectOrEnd:lastChangeNr.
 "Created: / 13.12.1995 / 16:07:14 / cg"
 "Modified: / 28.1.1998 / 20:42:14 / cg"
 !
 ].
 lastChangeNr := lastChangeNr max:changeNr.
 ].
 overAllNumDeletedBefore := 0.
-changeListView setSelection:nil.
+self unselect.
 self withExecuteCursorDo:[
 classNamesToDelete do:[:classNameToDelete |
 | changeNr numDeletedBefore|
 lastChangeNr := lastChangeNr - numDeletedBefore.
 overAllNumDeletedBefore := overAllNumDeletedBefore + numDeletedBefore.
 ]
 ]
 ].
-self setChangeList.
+self updateChangeList.
 self autoSelectOrEnd:lastChangeNr.
 "Created: / 13.12.1995 / 16:07:14 / cg"
 "Modified: / 28.1.1998 / 20:42:14 / cg"
 !
 "delete changes with same class as currently selected change from the beginning
 up to the selected change.
 Useful to get rid of obsolete changes before a fileout or checkin entry."
 self withSingleSelectedChangeDo:[:changeNr |
-	|classNameToDelete prevSelection numDeleted|
+|classNameToDelete prevSelection numDeleted|
-	classNameToDelete := self classNameOfChange:changeNr.
+classNameToDelete := self classNameOfChange:changeNr.
-	classNameToDelete notNil ifTrue:[
+classNameToDelete notNil ifTrue:[
-	    prevSelection := changeNr.
+prevSelection := changeNr.
-	    changeListView setSelection:nil.
+self unselect.
-	    numDeleted := self
+numDeleted := self
-				silentDeleteChangesFor:classNameToDelete
+silentDeleteChangesFor:classNameToDelete
-				from:1
+from:1
-				to:changeNr.
+to:changeNr.
-	    self setChangeList.
+self updateChangeList.
-	    self autoSelectOrEnd:(changeNr + 1 - numDeleted)
+self autoSelectOrEnd:(changeNr + 1 - numDeleted)
-	]
+]
 ].
 "Created: 13.12.1995 / 15:41:58 / cg"
 "Modified: 25.5.1996 / 12:26:34 / cg"
 !
 doDeleteClassRest
 "delete rest of changes with same class as currently selected change"
 self withSingleSelectedChangeDo:[:changeNr |
-	| classNameToDelete |
+| classNameToDelete |
-	classNameToDelete := self classNameOfChange:changeNr.
+classNameToDelete := self classNameOfChange:changeNr.
-	classNameToDelete notNil ifTrue:[
+classNameToDelete notNil ifTrue:[
-	    changeListView setSelection:nil.
+self unselect.
-	    self silentDeleteChangesFor:classNameToDelete
+self silentDeleteChangesFor:classNameToDelete
-				   from:changeNr
+from:changeNr
-				     to:(self numberOfChanges).
+to:(self numberOfChanges).
-	    self setChangeList.
+self updateChangeList.
-	    self autoSelectOrEnd:changeNr
+self autoSelectOrEnd:changeNr
-	]
+]
 ]
 "Modified: / 18.5.1998 / 14:25:07 / cg"
 !
 ].
 lastChangeNr := lastChangeNr max:changeNr.
 ].
 overAllNumDeletedBefore := 0.
-changeListView setSelection:nil.
+self unselect.
 self withExecuteCursorDo:[
 classNameSelectorPairsToDelete do:[:pair |
 |numDeletedBefore className selector|
 lastChangeNr := lastChangeNr - numDeletedBefore.
 overAllNumDeletedBefore := overAllNumDeletedBefore + numDeletedBefore.
 ].
 ].
-self setChangeList.
+self updateChangeList.
 self autoSelectOrEnd:lastChangeNr
 "Created: / 13.12.1995 / 16:07:14 / cg"
 "Modified: / 28.1.1998 / 20:42:14 / cg"
 !
 doDeleteClassSelectorOlder
-"delete older changes with same class and selector as currently selected change(s)"
+"delete this and older changes with same class and selector as currently selected change(s)"
 |classNameSelectorPairsToDelete upToPerClassAndSelector lastChangeNr overAllNumDeletedBefore|
 lastChangeNr := -1.
 classNameSelectorPairsToDelete := Set new.
 ].
 lastChangeNr := lastChangeNr max:changeNr.
 ].
 overAllNumDeletedBefore := 0.
-changeListView setSelection:nil.
+self unselect.
 self withExecuteCursorDo:[
 classNameSelectorPairsToDelete do:[:pair |
 |numDeletedBefore className selector lastToDelete|
 lastChangeNr := lastChangeNr - numDeletedBefore.
 overAllNumDeletedBefore := overAllNumDeletedBefore + numDeletedBefore.
 ].
 ].
-self setChangeList.
+self updateChangeList.
 self autoSelectOrEnd:lastChangeNr
 "Modified: / 25-07-2017 / 10:57:31 / cg"
 !
 "reread the changes-file"
 self readChangesFileInBackground:true.
 self newLabel:''.
 realized ifTrue:[
-	self setChangeList.
+self updateChangeList.
 ]
 !
 doWriteBack
 "write back the list onto the changes file"
 anyChanges ifTrue:[
 (self writeBackChanges) ifTrue:[
 realized ifTrue:[
 self readChangesFile.
 realized ifTrue:[
-self setChangeList
+self updateChangeList
 ]
 ]
 ]
 ]
 findNextForWhich:aBlock startingAt:changeNrToStartSearch
 "helper: select the next change for which aBlock evaluates to true"
 ^ self
 findNextOrPrevious:#next
-forWhich:aBlock startingAt:changeNrToStartSearch
+forWhich:aBlock
+startingAt:changeNrToStartSearch
 "Created: / 20-11-2006 / 16:34:06 / cg"
 !
 findNextOrPrevious:direction forWhich:aBlock startingAt:changeNrToStartSearch
 nr := changeNrToStartSearch.
 [ (direction == #previous and:[nr >= 1])
 or:[ direction == #next and:[ nr <= lastNr]]
 ] whileTrue:[
 (aBlock value:nr) ifTrue:[
-changeListView setSelection:nr.
+self selectChange:nr.
-self changeSelection:nr.
 ^ nr
 ].
 nr := nr + increment.
 ].
 ]
 findPreviousForWhich:aBlock startingAt:changeNrToStartSearch
 "helper: select the previous change for which aBlock evaluates to true"
 ^ self
 findNextOrPrevious:#previous
-forWhich:aBlock startingAt:changeNrToStartSearch
+forWhich:aBlock
+startingAt:changeNrToStartSearch
 "Created: / 06-10-2006 / 11:01:09 / cg"
 !
 findPreviousSnapshot
 autoSelect:changeNr
 "select a change"
 self class autoSelectNext ifTrue:[
-	(changeNr <= self numberOfChanges) ifTrue:[
+(changeNr <= self numberOfChanges) ifTrue:[
-	    changeListView setSelection:changeNr.
+self selectChange:changeNr.
-	    self changeSelection:changeNr.
+^ self
-	    ^ self
+]
-	]
 ].
 self clearCodeView.
-changeListView setSelection:nil.
+self unselect.
 "Modified: / 18.5.1998 / 14:26:43 / cg"
 !
 autoSelectLast
 |last|
 last := self numberOfChanges.
 changeNr < last ifTrue:[
-	self autoSelect:changeNr
+self autoSelect:changeNr
 ] ifFalse:[
-	last == 0 ifTrue:[
+last == 0 ifTrue:[
-	    last := nil
+last := nil
-	].
+].
-	changeListView setSelection:last .
+self selectChange:last.
-	self changeSelection:last.
 ]
 "Modified: / 13.11.2001 / 13:00:45 / cg"
 !
 "Created: / 08-09-1995 / 19:32:04 / claus"
 "Modified: / 12-11-2006 / 16:23:53 / cg"
 !
 parseExpression:chunk
+"parse an expression; return a parseTree"
 ^ self parseExpression:chunk inNameSpace:(self nameSpaceForApply).
 !
 parseExpression:text inNameSpace:nameSpace
-|parser p|
+"parse an expression; return a parseTree"
+|parser parseTree|
 "/ old:
 "/ does not care for VW qualified names
 "/ ^ Parser parseExpression:text inNameSpace:nameSpace.
 self halt:'should no longer happen'
 ].
 "/ new:
 parser := Parser for:(ReadStream on:text).
-parser parserFlags allowQualifiedNames:true.
+parser parserFlags
-parser parserFlags allowDollarInIdentifier:true.
+allowQualifiedNames:true;
-parser parserFlags allowParagraphInIdentifier:true.
+allowDollarInIdentifier:true;
+allowParagraphInIdentifier:true.
 Error handle:[:ex |
 ^ nil
 ] do:[
-p := parser
+parseTree := parser
 parseExpressionWithSelf:nil
 notifying:nil
 ignoreErrors:true
 ignoreWarnings:true
 inNameSpace:nameSpace.
 ].
-^ p
+^ parseTree
 "Modified: / 21-11-2016 / 23:25:48 / cg"
 !
 queryCloseText
 "made this a method for easy redefinition in subclasses"
 ^ 'Quit without updating changeFile ?'
+!
+selectChange:changeNr
+changeListView setSelection:changeNr.
+self changeSelection:changeNr.
 !
 selectedClassNames
 |classes|
 "Created: / 19.11.2001 / 21:54:59 / cg"
 !
 setChangeList
+<resource: #obsolete>
+"update the selection-list;
+called after the changeList has been modified"
+self updateChangeList
+!
+setSingleSelection:changeNr
+changeListView multipleSelectOk ifFalse:[
+	changeListView setSelection:changeNr.
+] ifTrue:[
+	changeListView setSelection:(Array with:changeNr).
+].
+!
+showNumberOfChanges
+infoHolder value:(resources string:'%1 changes.' with:changeInfoList size).
+!
+sourceOfChange:changeNr
+|aStream sawExcla chunk|
+aStream := self streamForChange:changeNr.
+aStream isNil ifTrue:[
+	^ nil
+].
+sawExcla := aStream peekFor:(aStream class chunkSeparator).
+chunk := aStream nextChunk.
+sawExcla ifTrue:[
+	chunk := aStream nextChunk
+].
+aStream close.
+^ chunk
+!
+timeStampPrintStringOf:ts
+^ ts printString
+"
+self basicNew timeStampPrintStringOf:(Timestamp now)
+"
+"Modified (format): / 05-12-2017 / 15:08:48 / cg"
+!
+unselect
+"common unselect"
+changeListView setSelection:nil.
+"Modified: 25.5.1996 / 13:02:49 / cg"
+!
+updateChangeList
 "update the selection-list;
 called after the changeList has been modified"
 |headerList|
 self showNumberOfChanges.
 "/ changeListView deselect.
 "Modified: / 01-05-2016 / 19:27:35 / cg"
-!
-setSingleSelection:changeNr
-changeListView multipleSelectOk ifFalse:[
-	changeListView setSelection:changeNr.
-] ifTrue:[
-	changeListView setSelection:(Array with:changeNr).
-].
-!
-showNumberOfChanges
-infoHolder value:(resources string:'%1 changes.' with:changeInfoList size).
-!
-sourceOfChange:changeNr
-|aStream sawExcla chunk|
-aStream := self streamForChange:changeNr.
-aStream isNil ifTrue:[
-	^ nil
-].
-sawExcla := aStream peekFor:(aStream class chunkSeparator).
-chunk := aStream nextChunk.
-sawExcla ifTrue:[
-	chunk := aStream nextChunk
-].
-aStream close.
-^ chunk
-!
-timeStampPrintStringOf:ts
-^ ts printString
-"
-self basicNew timeStampPrintStringOf:(Timestamp now)
-"
-"Modified (format): / 05-12-2017 / 15:08:48 / cg"
-!
-unselect
-"common unselect"
-changeListView setSelection:nil.
-"Modified: 25.5.1996 / 13:02:49 / cg"
 !
 withSelectedChangesDo:aBlock
 "just a helper, check for a selected change and evaluate aBlock
 with busy cursor"
 "Created: / 05-11-2001 / 18:09:46 / cg"
 "Modified: / 01-05-2016 / 19:24:53 / cg"
 !
+selectorOfMethodCategoryChange:changeNr
+"return a methodCategory-change's selector,
+or nil if it's not a methodCategoryChange"
+(changeInfoList at:changeNr) isMethodCategoryChange ifFalse:[^ nil].
+^ (changeInfoList at:changeNr) selector.
+"Modified: / 01-05-2016 / 19:26:21 / cg"
+!
 selectorOfMethodChange:changeNr
-"return a method-changes selector,
+"return a method-change's selector,
 or nil if it's not a methodChange"
 |sel |
 changeInfoList size >= changeNr ifTrue:[
+(changeInfoList at:changeNr) isMethodCategoryChange ifTrue:[^ nil].
 sel := (changeInfoList at:changeNr) selector.
 sel notNil ifTrue:[ ^ sel ].
 ].
 sel := self extractSelectorOfMethodChange:changeNr.
 sel notNil ifTrue:[
+self assert:(changeInfoList at:changeNr) isMethodCategoryChange not.
 (changeInfoList at:changeNr) selector:sel.
 ].
 ^ sel
 "Modified: / 01-05-2016 / 19:26:21 / cg"
 ].
 ^ nil -> 'Unhandled receiver'
 !
 compareChange:changeNr
-"compare a change with the current (in-image) version; show the result of the compare (as dialog)"
+"compare a change with the current (in-image) version;
+show the result of the compare (as dialog)"
 ^ self compareChange:changeNr showResult:true
 !
 compareChange:changeNr showResult:doShowResult
 "compare a change with current version.
-Return the result of the compare (same -> true, different -> false, uncomparable -> nil).
+Return the result of the compare
+same -> true,
+different -> false,
+uncomparable -> nil.
 If doShowResult is true, the outcome is shown in a dialog/diffViewer."
 |aStream chunk sawExcla parseTree thisClass cat oldSource newSource outcome showDiff d selector isLoaded beep superClass thisClassSym varsHere varsInChange addedVars removedVars
 isSame ownerClass superClassHere superClassInChange sameAndOutcome|
 ].
 "finally delete what has been found"
 (deleteSet size > 0) ifTrue:[
-changeListView setSelection:nil.
+self unselect.
 index := deleteSet size.
 [index > 0] whileTrue:[
 self silentDeleteChange:(deleteSet at:index).
 index := index - 1
 ].
-self setChangeList.
+self updateChangeList.
 "
 scroll back a bit, if we are left way behind the list
 "
 changeListView firstLineShown > self numberOfChanges ifTrue:[
 changeListView makeLineVisible:self numberOfChanges
 !
 deleteChangesFrom:start to:stop
 "delete a range of changes"
-changeListView setSelection:nil.
+self unselect.
 stop to:start by:-1 do:[:changeNr |
-	self silentDeleteInternalChange:changeNr.
+self silentDeleteInternalChange:changeNr.
 ].
 changeListView removeFromIndex:start toIndex:stop.
 "/    changeListView contentsChanged.
 "/    changeListView redrawFromLine:start.
 "/    changeIsFollowupMethodChange size >= changeNr ifTrue:[changeIsFollowupMethodChange removeIndex:changeNr].
 "Created: / 07-03-1997 / 16:28:32 / cg"
 "Modified: / 26-02-1998 / 18:20:48 / stefan"
 "Modified: / 01-05-2016 / 19:20:59 / cg"
+!
+silentDeleteMethodCategoryChangesFor:aClassName selector:selector from:start to:stop
+"delete method category changes for given class/selector in a range.
+Return the number of deleted changes."
+|thisClassName index numDeleted|
+numDeleted := 0.
+index := stop.
+[index >= start] whileTrue:[
+thisClassName := self realClassNameOfChange:index.
+thisClassName = aClassName ifTrue:[
+(self selectorOfMethodCategoryChange:index) == selector ifTrue:[
+self silentDeleteChange:index.
+numDeleted := numDeleted + 1.
+]
+].
+index := index - 1
+].
+^ numDeleted
+!
+silentDeleteMethodChangesFor:aClassName selector:selector from:start to:stop
+"delete method changes for given class/selector in a range.
+Return the number of deleted changes."
+|thisClassName index numDeleted|
+numDeleted := 0.
+index := stop.
+[index >= start] whileTrue:[
+thisClassName := self realClassNameOfChange:index.
+thisClassName = aClassName ifTrue:[
+(self selectorOfMethodChange:index) == selector ifTrue:[
+self silentDeleteChange:index.
+numDeleted := numDeleted + 1.
+]
+].
+index := index - 1
+].
+^ numDeleted
 !
 updateDiffView
 self withSelectedChangesDo:[:changeNr |
 	self updateDiffViewFor:changeNr.
 nil
 ]
 !
 classOfChange:changeNr ifAbsent:exceptionBlock
-"answer the class that is subject to the chamge at changeNr.
+"answer the class that is subject to the change at changeNr.
 The classes owning class may be autoloaded, if autoloadAsRequired is true."
 |className cls isMeta nameSpaceForApply path ownerName owner|
 className := self realClassNameOfChange:changeNr.
 className isNil ifTrue:[
-^ exceptionBlock value:nil
+^ exceptionBlock valueWithOptionalArgument:nil
 ].
 isMeta := false.
 (className endsWith:' class') ifTrue:[
 className := className copyButLast:6.
 cls := Smalltalk loadedClassNamed:className
 ].
 ].
 cls isNil ifTrue:[
-^ exceptionBlock value:className
+^ exceptionBlock valueWithOptionalArgument:className
 ].
 isMeta ifTrue:[
 cls := cls class
 ].
 ^ cls
 changeHeaderLines add:(self headerLineForChangeType:changeType changeString:changeString changeDelta:changeDelta timeStampInfo:timeStampInfo)
 "Modified: / 01-05-2016 / 19:07:49 / cg"
 !
+colorizeAsCommentChange:changeType
+|c|
+NoColoring ~~ true ifTrue:[
+c := changeType allItalic.
+"/ changeString := changeString allItalic.
+c emphasisAllAdd:(#color -> UserPreferences current commentColor).
+^ c
+].
+^ changeType
+!
 headerLineForChangeType:changeType changeString:changeString changeDelta:changeDelta timeStampInfo:timeStampInfo
 |entry|
 entry := MultiColListEntry new.
 entry tabulatorSpecification:tabSpec.
 changeInfo add:(info :=
 ChangesBrowser::ChangeInfo new
 position:chunkPosition chunk:chunkText className:nil selector:nil headerLine:nil
 timestamp:timeStampInfo isFollowupChange:false).
-"/    changeChunks add:chunkText.
-"/    changeClassNames add:nil.
-"/    changePositions add:chunkPosition.
-"/    changeTimeStamps add:timeStampInfo.
-"/    changeIsFollowupMethodChange add:false.
 headerLine := nil.
 changeDelta := ' '.
 sawExcla ifFalse:[
 self processNonMethodChunk
 ] ifTrue:[
 self processMethodChunkIfNone:
 [
 changeInfo removeLast.
-"/                changeChunks removeLast.
-"/                changeClassNames removeLast.
-"/                changePositions removeLast.
-"/                changeTimeStamps removeLast.
-"/                changeIsFollowupMethodChange removeLast.
 ]
 ].
 changeString notNil ifTrue:[
 "/ self addHeaderLineForChangeType:changeType changeString:changeString changeDelta:changeDelta timeStampInfo:timeStampInfo.
 clsName := nameAndClass key. changeClass := nameAndClass value.
 sel == #categoriesForClass ifTrue:[
 methodChunks := false.
 classCategoryChunks := true.
-changeType := '(class category change)'.
+changeType := self colorizeAsCommentChange:'(class category change)'.
 ] ifFalse:[
 sel == #categoriesFor: ifTrue:[
 methodChunks := false.
 methodCategoryChunks := true.
-changeType := '(category change)'.
+changeType := self colorizeAsCommentChange:'(category change)'.
 methodSelector := (p args at:1) evaluate.
 ] ifFalse:[
 (sel numArgs == 0) ifTrue:[
 category := '* As yet uncategorized *'.
 category := sel.
 changeString := (chunkText contractTo:maxLen).
 changeType := '(change)'.
 headerLine := chunkText , ' (change)'.
 ] ifFalse:[
 changeString :=  self contractClass:clsName selector:methodSelector to:maxLen.
-changeType := '{ ' , category , ' }'.
+changeType := ('{ ' , category , ' }').
 headerLine := clsName , ' ' , methodSelector , ' ' , '(change category: ''' , category , ''')'.
 ].
 autoCompare value ifTrue:[
 changeDelta := ChangeDeltaInformation
 "Modified: / 21-11-2016 / 23:32:29 / cg"
 !
 processNonMethodChunk
-|s changeClass sel  cls p rec clsName ownerTree ownerName
+|s changeClass sel cls parseTree rec clsName ownerTree ownerName
-m nameAndClass args instVarsArg classVarsArg categoryArg|
+m nameAndClass args instVarsArg classVarsArg categoryArg
+lastInfo newCategory|
 (chunkText startsWith:'''---- snap') ifTrue:[
 self processSnapshotChunk.
 ^ self
 ].
 ] ifFalse:[
 changeType := '(doIt)'.
 ].
 changeString := (chunkText contractTo:maxLen) withoutSeparators.
-p := browser parseExpression:fullChunkText inNameSpace:Smalltalk.
+parseTree := browser parseExpression:fullChunkText inNameSpace:Smalltalk.
-(p notNil and:[p ~~ #Error]) ifTrue:[
+(parseTree notNil and:[parseTree ~~ #Error]) ifTrue:[
-p isMessage ifTrue:[
+parseTree isMessage ifTrue:[
-sel := p selector.
+sel := parseTree selector.
-rec := p receiver.
+rec := parseTree receiver.
-args := p args.
+args := parseTree args.
 ]
 ] ifFalse:[
 sel := nil.
 (Scanner new scanTokens:fullChunkText) size == 0 ifTrue:[
 "/ a comment only
-changeType := '(comment)'.
+changeType := self colorizeAsCommentChange:'(comment)'.
-NoColoring ~~ true ifTrue:[
-changeType := changeType allItalic.
-"/ changeString := changeString allItalic.
-changeType emphasisAllAdd:(#color -> UserPreferences current commentColor).
-]
 ] ifFalse:[
 changeType := '(???)'.
 ]
 ].
 (sel == #comment:) ifTrue:[
-changeType := '(comment)'.
+changeType := self colorizeAsCommentChange:'(comment)'.
 clsName := rec name.
 changeClass := (self nameSpaceForApply) classNamed:clsName.
 (changeInfo last) className:clsName.
-"/ changeClassNames at:changeClassNames size put:clsName.
-NoColoring ~~ true ifTrue:[
-changeType := changeType allItalic.
-changeType emphasisAllAdd:(#color -> UserPreferences current commentColor).
-"/ changeString := clsName allItalic.
-].
 autoCompare value ifTrue:[
 (changeClass isNil or:[changeClass isLoaded not]) ifTrue:[
 changeDelta := '?'
 ] ifFalse:[
 (changeClass comment = (args at:1) evaluate) ifTrue:[
 ^ self.
 ].
 (sel == #removeSelector:) ifTrue:[
 nameAndClass := self extractClassAndClassNameFromParseTree:rec.
-clsName := nameAndClass key. changeClass := nameAndClass value.
+clsName := nameAndClass key.
+changeClass := nameAndClass value.
 sel := (args at:1) evaluate.
 (changeInfo last) className:clsName.
-"/ changeClassNames at:changeClassNames size put:clsName.
 autoCompare value ifTrue:[
 (changeClass isNil or:[changeClass isLoaded not]) ifTrue:[
 changeDelta := '?'
 ] ifFalse:[
 changeString := self contractClass:clsName selector:sel to:maxLen.
 "/ sel := nil.
 ^ self.
 ].
-(p notNil
+(parseTree notNil
-and:[p ~~ #Error
+and:[parseTree ~~ #Error
-and:[p isMessage
+and:[parseTree isMessage
 and:[rec isMessage
 and:[rec selector == #compiledMethodAt:]]]]) ifTrue:[
 nameAndClass := self extractClassAndClassNameFromParseTree:rec receiver.
-clsName := nameAndClass key. changeClass := nameAndClass value.
+clsName := nameAndClass key.
+changeClass := nameAndClass value.
 (sel == #category:) ifTrue:[
 sel := (rec args at:1) evaluate.
-changeType := '(category change)'.
+changeType := self colorizeAsCommentChange:'(category change)'.
 changeString := self contractClass:clsName selector:sel to:maxLen.
-(changeInfo last) className:clsName.
+newCategory := (args at:1) evaluate.
-"/ changeClassNames at:changeClassNames size put:clsName.
+"/ make it a category change
+lastInfo := changeInfo last.
+lastInfo className:clsName.
+lastInfo selector:sel.
+lastInfo categoryIfCategoryChange:newCategory.
 autoCompare value ifTrue:[
 (changeClass isNil or:[changeClass isLoaded not]) ifTrue:[
 changeDelta := '?'
 ] ifFalse:[
 m := changeClass compiledMethodAt:sel asSymbol.
-m notNil ifTrue:[
+m isNil ifTrue:[
-m category = (p args at:1) evaluate ifTrue:[
+"/ mhm - the method does not (no longer=) exist
+changeDelta := '?'
+] ifFalse:[
+m category = newCategory ifTrue:[
 changeDelta := '='.
 ]
 ]
 ]
 ].
 ^ self.
 ].
 (sel == #privacy:) ifTrue:[
 sel := (rec args at:1) evaluate.
 changeType := '(privacy change)'.
 changeString := self contractClass:clsName selector:sel to:maxLen.
 (changeInfo last) className:clsName.
-"/ changeClassNames at:changeClassNames size put:clsName.
 autoCompare value ifTrue:[
 (changeClass isNil or:[changeClass isLoaded not]) ifTrue:[
 changeDelta := '?'
 ] ifFalse:[
 changeDelta := ' '
 (Class definitionSelectors includes:sel) ifTrue:[
 changeType := '(class definition)'.
 clsName := (args at:1) evaluate.
 (changeInfo last) className:clsName.
-"/ changeClassNames at:changeClassNames size put:clsName.
 "/ is it a private-class ?
 ('*privateIn:' match:sel) ifTrue:[
 ownerTree := args last.
 ownerName := ownerTree name asString.
 "/ could be an ST/V, VAge or Dolphin definition
 cls definitionSelector = (sel , 'category:')
 ])
 ifTrue:[
 ((cls superclass isNil
-and:[p receiver isLiteral
+and:[rec isLiteral
-and:[p receiver evaluate isNil]])
+and:[rec evaluate isNil]])
 or:[
 cls superclass notNil
-and:[p receiver isLiteral not
+and:[rec isLiteral not
-and:[cls superclass name = p receiver name]]
+and:[cls superclass name = rec name]]
 ]) ifTrue:[
 (sel == #'variableByteSubclass:classVariableNames:poolDictionaries:category:')
 ifTrue:[
 "/ VSE definition message
 instVarsArg := ''.
 changeDelta := '='.
 ] ifFalse:[
 cls category = categoryArg ifTrue:[
 changeDelta := '='.
 ] ifFalse:[
-changeType := '(class category change)'.
+changeType := self colorizeAsCommentChange:'(class category change)'.
 ]
 ]
 ]
 ]
 ]
 and:[rec selector == #class]]) ifTrue:[
 clsName := rec receiver name.
 changeClass := (self nameSpaceForApply) classNamed:clsName.
 changeType := '(class definition)'.
 (changeInfo last) className:clsName.
-"/ changeClassNames at:changeClassNames size put:clsName.
 autoCompare value ifTrue:[
 changeClass isNil ifTrue:[
 changeDelta := '?'.
 ] ifFalse:[
-s := (p args at:1) evaluate.
+s := (args at:1) evaluate.
 s = changeClass class instanceVariableString ifTrue:[
 changeDelta := '='.
 ]
 ]
 ].
 "Modified: / 27-08-1995 / 23:06:55 / claus"
 "Modified: / 01-05-2016 / 18:33:36 / cg"
 ! !
+!ChangesBrowser::ChangeInfo class methodsFor:'documentation'!
+documentation
+"
+documentation to be added.
+[author:]
+cg
+[instance variables:]
+[class variables:]
+[see also:]
+"
+! !
 !ChangesBrowser::ChangeInfo methodsFor:'accessing'!
+categoryIfCategoryChange
+^ categoryIfCategoryChange
+!
+categoryIfCategoryChange:something
+categoryIfCategoryChange := something.
+!
 chunk
 ^ chunk
 !
 headerLine := something.
 !
 isFollowupChange
 ^ isFollowupChange
+!
+isMethodCategoryChange
+^ categoryIfCategoryChange notNil
 !
 position
 ^ position
 !

changeset 18059	819f12f70f46
parent 18054	3bb54349d57e
child 18061	f82108ac94a1