hg/stx-libtool2: comparison MethodFinderWindow.st

equal deleted inserted replaced

-:693d13243c07
+:caafc519b235
 "Do not manually edit this!! If it is corrupted,
 the UIHelpTool may not be able to read the specification."
 "
 UIHelpTool openOnClass:MethodFinderWindow
 "
 <resource: #help>
 ^ super helpSpec addPairsFrom:#(
+#'*'
+'as in GLOB patterns (i.e. like filename patterns)'
+#answerValue
+'Enter result value here.\Can be a constant (like ''hello'')\or an expression, such as "Rectangle basicNew".'
+#arg1Value
+'Enter a value for the first argument here.\Can be a constant or an expression.'
+#arg2Value
+'Enter a value for the second argument here.\Can be a constant or an expression.'
+#arg3Value
+'Enter a value for the third argument here.\Can be a constant or an expression.'
+#argumentCount
+'Specify the number of arguments here.'
+#clearButton
+'Clear all sample value fields.'
+#implementorsFound
+'Shows a list of messages which deliver the result or match the selector pattern'
 #receiverValue
 'Enter a receiver value here.\Can be a constant (like ''hello'')\or an expression, such as "Rectangle basicNew".'
-#answerValue
+#selectorPattern
-'Enter result value here.\Can be a constant (like ''hello'')\or an expression, such as "Rectangle basicNew".'
+'Enter a pattern to search by message name'
-#arg1Value
+#selectorPatternSearch
-'Enter a value for the first argument here.\Can be a constant or an expression.'
+'Search by name.\You can use match characters'
-#arg2Value
-'Enter a value for the second argument here.\Can be a constant or an expression.'
-#arg3Value
-'Enter a value for the third argument here.\Can be a constant or an expression.'
-#argumentCount
-'Specify the number of arguments here.'
-#clearButton
-'Clear all sample value fields.'
 #startSearchButton
 'Search for methods which answer the desired value,\given the concrete arguments'
-#selectorPatternSearch
+#startSearchPatternButton
-'Search by name.\You can use match characters '*' as in GLOB patterns (i.e. like filename patterns)'
+'Search for methods whose name matches the pattern'
 )
+"Modified: / 08-06-2019 / 16:06:17 / Claus Gittinger"
 ! !
 !MethodFinderWindow class methodsFor:'interface specs'!
 windowSpec
 <resource: #canvas>
 ^
 #(FullSpec
 name: windowSpec
+uuid: '5fb0c294-89f6-11e9-8df0-b8f6b1108e05'
 window:
 (WindowSpec
 label: 'MethodFinder'
 name: 'MethodFinder'
+uuid: '5fb0c87a-89f6-11e9-8df0-b8f6b1108e05'
 bounds: (Rectangle 0 0 816 738)
 menu: menu
 icon: defaultIcon
 )
 component:
 (SpecCollection
 collection: (
 (VariableHorizontalPanelSpec
 name: 'VariableHorizontalPanel1'
 layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+uuid: '5fb0cd98-89f6-11e9-8df0-b8f6b1108e05'
 showHandle: true
 snapMode: both
 component:
 (SpecCollection
 collection: (
 (VariableVerticalPanelSpec
 name: 'LeftBox'
+uuid: '5fb0d1a8-89f6-11e9-8df0-b8f6b1108e05'
 showHandle: true
 component:
 (SpecCollection
 collection: (
 (ViewSpec
 name: 'MethodFinderBox'
+uuid: '5fb0d36a-89f6-11e9-8df0-b8f6b1108e05'
 component:
 (SpecCollection
 collection: (
 (ViewSpec
 name: 'ReceiverArgBox'
 layout: (LayoutFrame 0 0 0 0 0 1 -30 1)
+uuid: '5fb0d4f0-89f6-11e9-8df0-b8f6b1108e05'
 component:
 (SpecCollection
 collection: (
 (LabelSpec
 label: 'Receiver'
 name: 'ReceiverLabel'
 layout: (LayoutFrame 0 0 0 0 0 0.34000000000000002 28 0)
+uuid: '5fb0d6b2-89f6-11e9-8df0-b8f6b1108e05'
 translateLabel: true
 )
 (ComboListSpec
 name: 'allowedArgments'
 layout: (LayoutFrame 0 0.34000000000000002 1 0 0 0.64000000000000135 28 0)
 activeHelpKey: argumentCount
+uuid: '5fb0da9a-89f6-11e9-8df0-b8f6b1108e05'
 model: argCountHolder
 comboList: argCountList
 useIndex: true
 )
 (LabelSpec
 label: 'Answer'
 name: 'MessageAnswerLabel'
 layout: (LayoutFrame 0 0.64000000000000135 0 0 0 1 28 0)
 activeHelpKey: arg1Value
+uuid: '5fb0dd60-89f6-11e9-8df0-b8f6b1108e05'
 translateLabel: true
 )
 (HorizontalPanelViewSpec
 name: 'HorizontalPanel1'
 layout: (LayoutFrame 0 0 30 0 0 1 0 1)
+uuid: '5fb0dee6-89f6-11e9-8df0-b8f6b1108e05'
 horizontalLayout: fit
 verticalLayout: fit
 horizontalSpace: 3
 verticalSpace: 3
 component:
 (SpecCollection
 collection: (
 (WorkspaceSpec
 name: 'ReceiverEditor'
 activeHelpKey: receiverValue
+uuid: '5fb0e152-89f6-11e9-8df0-b8f6b1108e05'
 tabable: true
 hasHorizontalScrollBar: true
 hasVerticalScrollBar: true
 miniScrollerHorizontal: true
 miniScrollerVertical: true
 autoHideScrollBars: true
 hasKeyboardFocusInitially: false
-extent: (Point 85 142)
+extent: (Point 86 142)
 postBuildCallback: receiverWidgetCreated:
 )
 (VerticalPanelViewSpec
 name: 'VerticalPanel1'
+uuid: '5fb0e51c-89f6-11e9-8df0-b8f6b1108e05'
 horizontalLayout: fit
 verticalLayout: fit
 horizontalSpace: 3
 verticalSpace: 3
 component:
 (SpecCollection
 collection: (
 (ViewSpec
 name: 'Box1'
+uuid: '5fb0e6d4-89f6-11e9-8df0-b8f6b1108e05'
 visibilityChannel: arg1BoxVisible
 component:
 (SpecCollection
 collection: (
 (WorkspaceSpec
 name: 'Arg1Editor'
 layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
 activeHelpKey: arg1Value
+uuid: '5fb0e7ce-89f6-11e9-8df0-b8f6b1108e05'
 tabable: true
 hasHorizontalScrollBar: true
 hasVerticalScrollBar: true
 miniScrollerHorizontal: true
 miniScrollerVertical: true
 postBuildCallback: argument1WidgetCreated:
 )
 )
 )
-extent: (Point 86 45)
+extent: (Point 87 45)
 )
 (ViewSpec
 name: 'Box2'
+uuid: '5fb0e9b8-89f6-11e9-8df0-b8f6b1108e05'
 visibilityChannel: arg2BoxVisible
 component:
 (SpecCollection
 collection: (
 (WorkspaceSpec
 name: 'TextEditor5'
 layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
 activeHelpKey: arg2Value
+uuid: '5fb0eabc-89f6-11e9-8df0-b8f6b1108e05'
 tabable: true
 hasHorizontalScrollBar: true
 hasVerticalScrollBar: true
 miniScrollerHorizontal: true
 miniScrollerVertical: true
 postBuildCallback: argument2WidgetCreated:
 )
 )
 )
-extent: (Point 86 46)
+extent: (Point 87 46)
 )
 (ViewSpec
 name: 'Box3'
+uuid: '5fb0ec74-89f6-11e9-8df0-b8f6b1108e05'
 visibilityChannel: arg3BoxVisible
 component:
 (SpecCollection
 collection: (
 (WorkspaceSpec
 name: 'TextEditor6'
 layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
 activeHelpKey: arg3Value
+uuid: '5fb0ed64-89f6-11e9-8df0-b8f6b1108e05'
 tabable: true
 hasHorizontalScrollBar: true
 hasVerticalScrollBar: true
 miniScrollerHorizontal: true
 miniScrollerVertical: true
 postBuildCallback: argument3WidgetCreated:
 )
 )
 )
-extent: (Point 86 45)
+extent: (Point 87 45)
 )
 )
 )
-extent: (Point 86 142)
+extent: (Point 87 142)
 )
 (WorkspaceSpec
 name: 'AnswerEditor'
 activeHelpKey: answerValue
+uuid: '5fb0ef30-89f6-11e9-8df0-b8f6b1108e05'
 tabable: true
 hasHorizontalScrollBar: true
 hasVerticalScrollBar: true
 miniScrollerHorizontal: true
 miniScrollerVertical: true
 autoHideScrollBars: true
 hasKeyboardFocusInitially: false
-extent: (Point 86 142)
+extent: (Point 87 142)
 postBuildCallback: messageAnswerWidgetCreated:
 )
 )
 )
 )
 )
 (ViewSpec
 name: 'ReceiverArgBoxActionBox'
 layout: (LayoutFrame 0 0 -30 1 0 1 0 1)
+uuid: '5fb0f0fc-89f6-11e9-8df0-b8f6b1108e05'
 component:
 (SpecCollection
 collection: (
 (ActionButtonSpec
 label: 'Clear'
 name: 'Button2'
 layout: (LayoutFrame 5 0 0 0 -5 0.5 0 1)
 activeHelpKey: clearButton
+uuid: '5fb0f214-89f6-11e9-8df0-b8f6b1108e05'
 translateLabel: true
 model: clear
 )
 (ActionButtonSpec
 label: 'Search'
 name: 'Button1'
 layout: (LayoutFrame 5 0.5 0 0 -5 1 0 1)
 activeHelpKey: startSearchButton
+uuid: '5fb0f52a-89f6-11e9-8df0-b8f6b1108e05'
 translateLabel: true
 tabable: true
 model: search
 )
 )
 )
 )
 (ViewSpec
 name: 'SelectorFinderBox'
+uuid: '5fb0f714-89f6-11e9-8df0-b8f6b1108e05'
 component:
 (SpecCollection
 collection: (
 (ViewSpec
 name: 'MatchActionBox'
 layout: (LayoutFrame 0 0 0 0 0 1 90 0)
+uuid: '5fb0f818-89f6-11e9-8df0-b8f6b1108e05'
 component:
 (SpecCollection
 collection: (
 (LabelSpec
 label: 'Selector Pattern:'
 name: 'Label1'
 layout: (LayoutFrame 0 0 0 0 0 0.5 25 0)
+uuid: '5fb0f908-89f6-11e9-8df0-b8f6b1108e05'
 translateLabel: true
 adjust: left
 )
 (InputFieldSpec
 name: 'EntryField1'
 layout: (LayoutFrame 2 0 -54 1 -2 1 -29 1)
+activeHelpKey: selectorPattern
+uuid: '5fb0fa70-89f6-11e9-8df0-b8f6b1108e05'
 model: selectorPatternHolder
 immediateAccept: true
 acceptOnReturn: true
 acceptOnTab: true
 acceptOnPointerLeave: true
 )
 (ActionButtonSpec
 label: 'Search'
 name: 'Button4'
 layout: (LayoutFrame 5 0.5 -25 1 -5 1 0 1)
+activeHelpKey: startSearchPatternButton
+uuid: '5fb0fea8-89f6-11e9-8df0-b8f6b1108e05'
 translateLabel: true
 tabable: true
 model: searchPatternMatchesInBackground
 )
 )
 )
 )
 (SequenceViewSpec
 name: 'ResultList'
 layout: (LayoutFrame 0 0 94 0 0 1 0 1)
+activeHelpKey: implementorsFound
+uuid: '5fb1009c-89f6-11e9-8df0-b8f6b1108e05'
 model: selectedImplementorsHolder
 menu: resultListMenu
 hasHorizontalScrollBar: true
 hasVerticalScrollBar: true
 autoHideScrollBars: true
 )
 handles: (Any 0.28000000000000003 1.0)
 )
 (VariableVerticalPanelSpec
 name: 'RightBox'
+uuid: '5fb103c6-89f6-11e9-8df0-b8f6b1108e05'
 component:
 (SpecCollection
 collection: (
 (SequenceViewSpec
 name: 'List2'
+uuid: '5fb10524-89f6-11e9-8df0-b8f6b1108e05'
 model: selectedClassOfResultHolder
 menu: implementorListMenu
 hasHorizontalScrollBar: true
 hasVerticalScrollBar: true
 autoHideScrollBars: true
 useIndex: false
 sequenceList: classOfResultHolder
 )
 (CodeViewSpec
 name: 'CodeView'
+uuid: '5fb106dc-89f6-11e9-8df0-b8f6b1108e05'
 model: codeHolder
 hasHorizontalScrollBar: true
 hasVerticalScrollBar: true
 autoHideScrollBars: true
 hasKeyboardFocusInitially: false
+viewClassName: 'codeViewClass'
 postBuildCallback: sourceCodeWidgetCreated:
-viewClassName: 'codeViewClass'
 )
 )
 )
 handles: (Any 0.23999999999999999 1.0)
 "the following then replaces data1 and data2 created by the method finder to the appropriate arguments"
 resultArray
 keysAndValuesDo:[:key :value |
 |newValue|
-newValue := value copyReplaceString:'data1' withString:(tempReceiver key).
+newValue := value copyReplaceString:'data1'
+withString:(tempReceiver value storeString). "/ was: "tempReceiver key"
 (tempArguments size) >= 1 ifTrue:[
-newValue := newValue replString:'data2'
+newValue := newValue copyReplaceString:'data2'
-withString:(tempArguments keyAt:1)
+withString:(tempArguments valueAt:1) storeString "/ was "keyAt:1"
 ].
 (tempArguments size) > 1 ifTrue:[
 newValue := newValue copyReplaceString:'data3'
-withString:(tempArguments keyAt:2).
+withString:(tempArguments valueAt:2) storeString. "/ was "keyAt:2"
 ].
 (tempArguments size) > 2 ifTrue:[
 newValue := newValue copyReplaceString:'data4'
-withString:(tempArguments keyAt:3).
+withString:(tempArguments valueAt:3) storeString. "/ was: keyAt:3
 ].
 (tempArguments size) > 3 ifTrue:[
 self halt:'unimplemented'.
 ].
 "    newValue:= value copyReplaceString: 'data3' withString:(self messageAnswer key). "
 resultSelectors := mf selectors.
 receiver := tempReceiver
 "Modified: / 26-09-2011 / 12:42:28 / cg"
 "Modified: / 27-02-2018 / 11:37:58 / stefan"
+"Modified: / 08-06-2019 / 16:24:00 / Claus Gittinger"
 !
 searchPatternMatchesInBackground
 "Do a search based on the pattern match as a background task"
 aNumber := anInteger ? 1.
 methods := SystemBrowser
 findImplementorsOf:(resultSelectors at:aNumber)
 in:Smalltalk allClasses
 ignoreCase:false.
-classList := methods asOrderedCollection
+methods := methods asOrderedCollection.
-collect:[:m | m mclass name , ' ' , m selector ].
+classList := methods collect:[:m | m mclass name , ' ' , m selector ].
-classList := (self markMatchingClasses:(resultSelectors at:aNumber)
+classList := self markMatchingClasses:(resultSelectors at:aNumber)
-classesWithSelector:classList).
+classesWithSelector:classList.
+"/ now classList contains a list of <className> <selector>,
+"/ where the one which is responsible for the selected result is marked (bold)
 self classOfResultHolder value:classList.
-classList size ~~ 0 ifTrue:[
-self selectedClassOfResultHolder value:(classList first).
+"/ initially select the bold one
+classList notEmptyOrNil ifTrue:[
+|receiversMethodEntryInClass|
+receiversMethodEntryInClass := classList detect:#isText ifNone:nil.
+receiversMethodEntryInClass notNil ifTrue:[
+self selectedClassOfResultHolder value:receiversMethodEntryInClass.
+] ifFalse:[
+self selectedClassOfResultHolder value:(classList first).
+].
 self selectedClassOfResultHolderChanged.
 ] ifFalse:[
 self selectedClassOfResultHolder value:nil.
 ].
 "Modified (comment): / 24-06-2012 / 18:41:45 / cg"
-"Modified: / 03-03-2019 / 23:13:43 / Claus Gittinger"
+"Modified: / 08-06-2019 / 15:39:49 / Claus Gittinger"
 !
 updateListAfterPatternSearch:resultList
 |searchPattern idx|
 " Matches the class of the receiver with all the elements in anOrderedCollection
 (which are classes with selectors). If a match is found it is marked with an asterisk.
 The classes are then sorted so the asterisk appears first. Return the
 markedClassList."
-|marker recClass unmarkedClassList markedClassList|
+|marker recClass unmarkedClassList markedClassList toMark|
 marker := self class markerForImplementingClass.
 recClass := receiver value class.
+toMark := OrderedCollection new.
 unmarkedClassList := anOrderedCollection copy.
 unmarkedClassList do:[:classAndMethod |
 |className class sel|
-className := classAndMethod copyButLast:aSelector size.
+className := (classAndMethod copyButLast:aSelector size) withoutSeparators.
 class := Smalltalk classNamed:className. "/ Compiler evaluate:className.
 "/ (recClass == class)
 (recClass whichClassImplements:aSelector) == class ifTrue:[
-"/ unmarkedClassList add: marker, classAndMethod.
+toMark add:classAndMethod.
-unmarkedClassList add:classAndMethod allBold.
-unmarkedClassList remove:classAndMethod.
 ].
 ].
+unmarkedClassList removeAll:toMark.
+unmarkedClassList addAll:(toMark collect:#allBold).
 unmarkedClassList
 sort:[:a :b |
 |rawA rawB|
 rawA := a string withoutPrefix:marker.
 rawA < rawB.
 ].
 markedClassList := unmarkedClassList.
 ^ markedClassList
-"Modified: / 13.11.2001 / 12:16:05 / cg"
+"Modified: / 13-11-2001 / 12:16:05 / cg"
+"Modified: / 08-06-2019 / 15:36:30 / Claus Gittinger"
 !
 mergeReceiver: aReceiver withArgument: arguments
 "Puts the receiver and arguments into an array so it can be of a suitable input for the

changeset 3675	caafc519b235
parent 3665	86d311ea68fd
child 3685	854b28268aa6