diff --git a/src/Spec2-Examples/SpClassMethodBrowser.class.st b/src/Spec2-Examples/SpClassMethodBrowser.class.st index 6cd17216ac1..37e189b6259 100644 --- a/src/Spec2-Examples/SpClassMethodBrowser.class.st +++ b/src/Spec2-Examples/SpClassMethodBrowser.class.st @@ -71,7 +71,7 @@ SpClassMethodBrowser >> initializePresenters [ classListPresenter := self newList. methodListPresenter := self newList. textPresenter := self newCode. - textPresenter whenSubmitDo: [ :t | methodListPresenter selectedItem inspect ]. + textPresenter whenSubmitDo: [ :text | methodListPresenter selectedItem inspect ]. methodListPresenter display: #selector. self focusOrder add: classListPresenter; diff --git a/src/Spec2-Morphic-Examples/SpMethodBrowser.class.st b/src/Spec2-Morphic-Examples/SpMethodBrowser.class.st index 2ed6c94b660..5cdd3b2424a 100644 --- a/src/Spec2-Morphic-Examples/SpMethodBrowser.class.st +++ b/src/Spec2-Morphic-Examples/SpMethodBrowser.class.st @@ -61,7 +61,7 @@ SpMethodBrowser >> connectPresenters [ textModel text: m sourceCode. textModel beForMethod: m. toolbarModel method: m ] ]. - self whenSubmitDo: [ :t | self listModel selectedItem inspect ]. + self whenSubmitDo: [ :text | self listModel selectedItem inspect ]. self wrapWith: [ :item | item methodClass name , '>>#' , item selector ] ] diff --git a/src/Spec2-Tools/ChangeSorterModel.class.st b/src/Spec2-Tools/ChangeSorterModel.class.st index b0607a0ef0d..4e78a4dbf9b 100644 --- a/src/Spec2-Tools/ChangeSorterModel.class.st +++ b/src/Spec2-Tools/ChangeSorterModel.class.st @@ -146,10 +146,11 @@ ChangeSorterModel >> fileOutSelector: selector from: aClass [ ChangeSorterModel >> findChangeSetIn: aCollectionOfChangeSets [ "Search for a changeSet by name. Pop up a menu of all changeSets whose name contains the string entered by the user. If only one matches, then the pop-up menu is bypassed" | index pattern candidates nameList | + self okToChange ifFalse: [^ self]. pattern := UIManager default request: 'ChangeSet name or fragment?'. pattern isEmptyOrNil ifTrue: [^ self]. - nameList := aCollectionOfChangeSets collect: #name. + nameList := aCollectionOfChangeSets collect: [ : each | each name ]. candidates := aCollectionOfChangeSets select: [:c | (nameList includes: c name) and: [c name includesSubstring: pattern caseSensitive: false]]. diff --git a/src/Spec2-Tools/MessageBrowser.class.st b/src/Spec2-Tools/MessageBrowser.class.st index b744d2e4b4f..03e77cb8ba1 100644 --- a/src/Spec2-Tools/MessageBrowser.class.st +++ b/src/Spec2-Tools/MessageBrowser.class.st @@ -170,7 +170,7 @@ MessageBrowser >> codeFont [ { #category : #initialization } MessageBrowser >> connectPresenters [ messageList - whenSelectionChangedDo: [ :selection | [ :item | self selectItem: item ] cull: selection selectedItem ]; + whenSelectionChangedDo: [ :selection | self selectItem: selection selectedItem ]; whenModelChangedDo: [ self updateTitle ]. textModel whenSubmitDo: [ :text | (self accept: text notifying: nil) notNil ] ] diff --git a/src/Spec2-Tools/MessageList.class.st b/src/Spec2-Tools/MessageList.class.st index 6de6079df29..8f3547e12a0 100644 --- a/src/Spec2-Tools/MessageList.class.st +++ b/src/Spec2-Tools/MessageList.class.st @@ -71,7 +71,7 @@ MessageList >> buildHierarchyForMessages: messages [ ^ result ]. result := Dictionary new. - classes := (messages collect: #methodClass) asSet. + classes := (messages collect: [ :each | each methodClass ]) asSet. messages do: [:message || level class | class := message methodClass. level := OrderedCollection new. diff --git a/src/Spec2-Tools/SpChooseMethodUI.class.st b/src/Spec2-Tools/SpChooseMethodUI.class.st index 68ec39a169a..9e4edea5732 100644 --- a/src/Spec2-Tools/SpChooseMethodUI.class.st +++ b/src/Spec2-Tools/SpChooseMethodUI.class.st @@ -122,7 +122,7 @@ SpChooseMethodUI >> classListAction [ ifNil: [ #()]] postTransmission: [ :protcolList | protocolList - selectIndex: ((protcolList items collect: #name) indexOf: '-- all --') ] + selectIndex: ((protcolList items collect: [ :each | each name ]) indexOf: '-- all --') ] ] { #category : #initialization } @@ -136,8 +136,10 @@ SpChooseMethodUI >> connectPresenters [ { #category : #'initialization - actions' } SpChooseMethodUI >> fillWith: aClass [ + methodList items: aClass methods. - ^ protocolList items: (aClass protocols collect: [ :eachSymbol | aClass organization protocolOrganizer protocolNamed: eachSymbol ]) + ^ protocolList items: (aClass protocols + collect: [ :eachSymbol | aClass organization protocolOrganizer protocolNamed: eachSymbol ]) ] { #category : #initialization } diff --git a/src/Spec2-Tools/VersionBrowser.class.st b/src/Spec2-Tools/VersionBrowser.class.st index 259ba631e2e..fc8bd7e2599 100644 --- a/src/Spec2-Tools/VersionBrowser.class.st +++ b/src/Spec2-Tools/VersionBrowser.class.st @@ -70,12 +70,15 @@ VersionBrowser class >> registerToolsOn: registry [ { #category : #visiting } VersionBrowser >> accept: text notifying: notifyer [ - ^ self selectedMessage - ifNotNil: [:message | - message methodClass - compile: text - classified: message protocol - notifying: notifyer ] + | message | + + message := self selectedMessage. + message ifNil: [ ^ self ]. + + message methodClass + compile: text + classified: message protocol + notifying: notifyer ] { #category : #actions } @@ -127,7 +130,7 @@ VersionBrowser >> compareToCurrentVersion [ VersionBrowser >> compareToOtherVersion [ | labels versions index selected | versions := self changeList. - labels := versions collect: #stamp. + labels := versions collect: [ :each | each stamp ]. index := UIManager default chooseFrom: labels. index > 0 ifFalse: [ ^ self ]. selected := versions at: index. @@ -186,6 +189,8 @@ VersionBrowser >> installIconStylerFor: anItem [ { #category : #accessing } VersionBrowser >> messageListMenu [ + + self flag: #TODO. "At least some of this options needs to be a command" ^ self newMenu addGroup: [ :aGroup | aGroup @@ -219,13 +224,15 @@ VersionBrowser >> messageListMenu [ { #category : #'instance creation' } VersionBrowser >> revert: aChangeRecord [ - aChangeRecord - ifNil: [ ^ self inform: 'nothing selected, so nothing done' ] - ifNotNil: [ rgMethod realClass - compile: aChangeRecord sourceCode - classified: aChangeRecord category - withStamp: aChangeRecord stamp - notifying: nil ]. + + aChangeRecord ifNil: [ + ^ self inform: 'nothing selected, so nothing done' ]. + + rgMethod realClass + compile: aChangeRecord sourceCode + classified: aChangeRecord category + withStamp: aChangeRecord stamp + notifying: nil. "reinitialize me" self setRGMethodFrom: rgMethod realClass >> rgMethod selector. @@ -237,13 +244,12 @@ VersionBrowser >> revert: aChangeRecord [ { #category : #private } VersionBrowser >> selectItem: item [ + sourcePresenter ifNil: [ ^ self ]. - self - setSourceContentWith: - (self textConverter - method: item; - getText). + self setSourceContentWith: (self textConverter + method: item; + getText). sourcePresenter clearUndoManager. self installIconStylerFor: item @@ -251,28 +257,33 @@ VersionBrowser >> selectItem: item [ { #category : #'accessing model' } VersionBrowser >> setModelBeforeInitialization: aMethod [ - self setRGMethodFrom: aMethod. + + self setRGMethodFrom: aMethod ] { #category : #initialization } VersionBrowser >> setRGMethodFrom: aMethod [ "asHistorical, because active RGMethods don't always have the source pointer attached" - rgMethod := aMethod asRingDefinition asHistorical. + rgMethod := aMethod asRingDefinition asHistorical ] { #category : #private } VersionBrowser >> setSourceContentWith: content [ + isShowingDiff - ifTrue: [ (content isText or: [ content isString ]) + ifTrue: [ + (content isText or: [ content isString ]) ifTrue: [ sourcePresenter leftText: ''. sourcePresenter rightText: content ] ifFalse: [ sourcePresenter leftText: content first. sourcePresenter rightText: content second ] ] - ifFalse: [ sourcePresenter text: content ] + ifFalse: [ + sourcePresenter text: content ] ] { #category : #'instance creation' } VersionBrowser >> showDiffMorphWithConverter: aConverter [ + sourcePresenter := self newDiff. isShowingDiff := true. self needRebuild: false. @@ -284,12 +295,13 @@ VersionBrowser >> showDiffMorphWithConverter: aConverter [ { #category : #'instance creation' } VersionBrowser >> showSourceWithConverter: aConverter [ + sourcePresenter := self newCode. isShowingDiff := false. self needRebuild: false. self buildWithSpec. self textConverter: aConverter. - sourcePresenter whenSubmitDo: [ :text :notifyer | (self accept: text notifying: notifyer) notNil ]. + sourcePresenter whenSubmitDo: [ :text | (self accept: text notifying: nil) notNil ]. sourcePresenter beForMethod: self selectedMessage. messageList selectIndex: (messageList selectedIndex) ]