hg/stx-libwidg: comparison TextView.st

equal deleted inserted replaced

-:9bc209db3be5
+:e7580f29c467
 WordSelectCatchesBlanks := StyleSheet at:'text.wordSelectCatchesBlanks' default:false.
 "Modified: / 03-07-2006 / 16:29:42 / cg"
 ! !
+!TextView class methodsFor:'help specs'!
+flyByHelpSpec
+"This resource specification was automatically generated
+by the UIHelpTool of ST/X."
+"Do not manually edit this!! If it is corrupted,
+the UIHelpTool may not be able to read the specification."
+"
+UIHelpTool openOnClass:TextView
+"
+<resource: #help>
+^ Dictionary new addPairsFrom:#(
+#matchSearch
+'Search for a pattern (glob) as opposed to a direct string search'
+#searchCaseSensitive
+'Care for case differences'
+#searchFullWord
+'Search only for full words (ignore occurrences as substring)'
+#searchPattern
+'String or match-pattern to be searched'
+#searchVariable
+'Search only for that variable name (ignore occurrences in other contexts)'
+)
+! !
 !TextView class methodsFor:'interface specs'!
 searchDialogSpec
 "This resource specification was automatically generated
 by the UIPainter of ST/X."
 (WindowSpec
 label: 'String search'
 name: 'String search'
 min: (Point 10 10)
 max: (Point 1280 1024)
-bounds: (Rectangle 0 0 302 161)
+bounds: (Rectangle 0 0 302 189)
 )
 component:
 (SpecCollection
 collection: (
+(LabelSpec
+label: 'SearchPattern:'
+name: 'label'
+layout: (LayoutFrame 1 0.0 3 0 -1 1.0 20 0)
+level: 0
+translateLabel: true
+adjust: left
+)
+(ComboBoxSpec
+name: 'patternComboBox'
+layout: (LayoutFrame 3 0.0 26 0 -3 1.0 48 0)
+activeHelpKey: searchPattern
+tabable: true
+model: searchPattern
+immediateAccept: false
+acceptOnLeave: true
+acceptOnReturn: true
+acceptOnTab: true
+acceptOnLostFocus: true
+acceptOnPointerLeave: false
+autoSelectInitialText: true
+comboList: patternList
+)
+(VerticalPanelViewSpec
+name: 'VerticalPanel1'
+layout: (LayoutFrame 0 0.0 52 0 0 1.0 -30 1)
+horizontalLayout: fit
+verticalLayout: top
+component:
+(SpecCollection
+collection: (
+(CheckBoxSpec
+label: 'Case Sensitive'
+name: 'ignoreCaseCheckBox'
+activeHelpKey: searchCaseSensitive
+level: 0
+tabable: true
+model: caseSensitive
+translateLabel: true
+extent: (Point 302 24)
+)
+(CheckBoxSpec
+label: 'Match (for Forward only)'
+name: 'matchCheckBox'
+activeHelpKey: matchSearch
+level: 0
+tabable: true
+model: match
+translateLabel: true
+extent: (Point 302 24)
+)
+(CheckBoxSpec
+label: 'Search Full Words'
+name: 'CheckBox2'
+activeHelpKey: searchFullWord
+level: 0
+enableChannel: searchFullWordEnabled
+tabable: true
+model: searchFullWord
+translateLabel: true
+extent: (Point 302 24)
+)
+(CheckBoxSpec
+label: 'Variable Only'
+name: 'CheckBox1'
+activeHelpKey: searchVariable
+level: 0
+visibilityChannel: searchVariableVisible
+enableChannel: searchVariableEnabled
+tabable: true
+model: searchVariable
+translateLabel: true
+labelChannel: stringWithVariableUnderCursorHolder
+extent: (Point 302 24)
+)
+)
+)
+)
 (HorizontalPanelViewSpec
 name: 'horizontalPanelView'
-layout: (LayoutFrame 0 0.0 -26 1.0 0 1.0 0 1.0)
+layout: (LayoutFrame 0 0.0 -28 1.0 0 1.0 0 1.0)
 level: 0
 horizontalLayout: fitSpace
 verticalLayout: center
 horizontalSpace: 3
 verticalSpace: 3
 )
 )
 )
 )
-(LabelSpec
-label: 'SearchPattern:'
-name: 'label'
-layout: (LayoutFrame 1 0.0 3 0 -1 1.0 20 0)
-level: 0
-translateLabel: true
-adjust: left
-)
-(ComboBoxSpec
-name: 'patternComboBox'
-layout: (LayoutFrame 3 0.0 26 0 -3 1.0 48 0)
-tabable: true
-model: searchPattern
-immediateAccept: false
-acceptOnLeave: true
-acceptOnReturn: true
-acceptOnTab: true
-acceptOnLostFocus: true
-acceptOnPointerLeave: false
-autoSelectInitialText: true
-comboList: patternList
-)
-(CheckBoxSpec
-label: 'Case Sensitive'
-name: 'ignoreCaseCheckBox'
-layout: (LayoutFrame 3 0.0 54 0 -3 1.0 77 0)
-level: 0
-tabable: true
-model: caseSensitive
-translateLabel: true
-)
-(CheckBoxSpec
-label: 'Match (for Forward only)'
-name: 'matchCheckBox'
-layout: (LayoutFrame 3 0.0 78 0 -3 1.0 100 0)
-level: 0
-tabable: true
-model: match
-translateLabel: true
-)
-(CheckBoxSpec
-label: 'Variable Only'
-name: 'CheckBox1'
-layout: (LayoutFrame 3 0.0 102 0 -3 1.0 124 0)
-level: 0
-visibilityChannel: searchVariableVisible
-enableChannel: searchVariableEnabled
-tabable: true
-model: searchVariable
-translateLabel: true
-labelChannel: stringWithVariableUnderCursorHolder
-)
 )
 )
 )
 ! !
 "
 Q: is it a good idea to preserve the last searchstring between views ?
 "
 |searchBox patternHolder caseHolder matchHolder fwd ign match initialString
-bindings bldr doSearch modal searchVariableHolder selectedVariable|
+bindings bldr doSearch modal searchVariableHolder selectedVariable searchFullWordHolder|
 searchBarActionBlock notNil ifTrue:[
 self resetVariablesBeforeNewSearch.
 searchBarActionBlock value:#search value:self.
 ^ self
 caseHolder := ign not asValue.
 match := lastSearchWasMatch ? LastSearchWasMatch ? false.
 matchHolder := match asValue.
 searchVariableHolder := (lastSearchWasVariableSearch ? false) asValue.
+searchFullWordHolder := false asValue.
 patternHolder := '' asValue.
 self setSearchPatternWithMatchEscapes: match.
 ].
 fwd := true.
 doSearch := [:fwd |
-self resetVariablesBeforeNewSearch.
+|pattern|
+self resetVariablesBeforeNewSearch.
 (self searchVariableVisible
 and:[searchVariableHolder value
 and:[selectedVariable notNil]]
 ) ifTrue:[
 self searchVariableWithSyntaxElement:selectedVariable forward:fwd
 ] ifFalse:[
 lastSearchWasVariableSearch := false.
 LastSearchIgnoredCase := lastSearchIgnoredCase := (caseHolder value not).
 LastSearchWasMatch := lastSearchWasMatch := matchHolder value.
+pattern := patternHolder value.
-self
+pattern notEmptyOrNil ifTrue:[
-search:patternHolder value
+self searchUsingSpec:(
-ignoreCase:lastSearchIgnoredCase
+ListView::SearchSpec new
-match: lastSearchWasMatch
+pattern:pattern
-forward:fwd.
+ignoreCase:lastSearchIgnoredCase
+match: lastSearchWasMatch
+variable: searchVariableHolder value
+fullWord: searchFullWordHolder value
+forward:fwd).
+"/                self
+"/                    search:patternHolder value
+"/                    ignoreCase:lastSearchIgnoredCase
+"/                    match: lastSearchWasMatch
+"/                    forward:fwd.
+]
 ].
 ].
 bindings := IdentityDictionary new.
 bindings at:#searchPattern put:patternHolder.
 ].
 bindings at:#caseSensitive put:caseHolder.
 bindings at:#match put:matchHolder.
 bindings at:#patternList put:LastSearchPatterns.
-selectedVariable := self syntaxElementForSelectedVariable.
+self supportsSyntaxElements ifFalse:[
-bindings at:#searchVariableEnabled put:(selectedVariable notNil).
+bindings at:#searchVariableVisible put:false.
-selectedVariable notNil ifTrue:[
+] ifTrue:[
-bindings
+bindings at:#searchVariableVisible put:true.
-at:#stringWithVariableUnderCursorHolder
+selectedVariable := self syntaxElementForSelectedVariable.
-put:('Variable ("%1")' bindWith:selectedVariable value).
+bindings at:#searchVariableEnabled put:(selectedVariable notNil).
-searchVariableHolder value:true.
+selectedVariable notNil ifTrue:[
-] ifFalse:[
+bindings
-bindings
+at:#stringWithVariableUnderCursorHolder
-at:#stringWithVariableUnderCursorHolder
+put:('Variable ("%1")' bindWith:selectedVariable value).
-put:('Variable (none selected)').
+searchVariableHolder value:true.
+] ifFalse:[
+bindings
+at:#stringWithVariableUnderCursorHolder
+put:('Variable (none selected)').
+].
 ].
 bindings at:#searchVariable put:searchVariableHolder.
+bindings at:#searchFullWord put:searchFullWordHolder.
+bindings at:#searchFullWordEnabled put:true.
 modal ifTrue:[
 searchBox := SimpleDialog new.
 ] ifFalse:[
 searchBox := ApplicationModel new.
 ].
 searchBox resources:(self resources).
 bldr := searchBox builder.
 bldr addBindings:bindings.
+bldr aspectAt:#flyByHelpSpec put:(self class flyByHelpSpec).
 searchBox allButOpenFrom:(self class searchDialogSpec).
 (bldr componentAt:#nextButton) cursor:(Cursor thumbsUp).
 (bldr componentAt:#prevButton) cursor:(Cursor thumbsUp).
 (bldr componentAt:#cancelButton) cursor:(Cursor thumbsDown).
 "Created: / 11-07-2006 / 11:18:04 / fm"
 "Modified: / 23-03-2012 / 12:12:07 / cg"
 !
+searchUsingSpec:aSearchSpec
+self rememberSearchPattern:(aSearchSpec pattern).
+"/ LastSearchIgnoredCase := lastSearchIgnoredCase := ign.
+"/ LastSearchWasMatch := match.
+aSearchSpec forward ifFalse:[
+lastSearchDirection := #backward.
+self searchBwdUsingSpec:aSearchSpec
+] ifTrue:[
+lastSearchDirection := #forward.
+self searchFwdUsingSpec:aSearchSpec
+]
+"Created: / 11-07-2006 / 11:18:04 / fm"
+"Modified: / 23-03-2012 / 12:12:07 / cg"
+!
 searchVariableVisible
 "search variable option in searchbox visible?
 (only true for codeview2's textview)"
 ^ false
 "Created: / 08-03-2012 / 14:01:24 / cg"
 !
 searchVariableWithSyntaxElement:syntaxElementForVariable forward:fwd
+"this only works for CodeView2::TextView, which supports syntaxElements"
 |el el2|
 lastSearchWasVariableSearch := true.
 el := fwd
 ifTrue:[syntaxElementForVariable nextElement]
 lastSearchPattern notNil ifTrue:[
 lastSearchDirection == #backward ifTrue:[
 self
 searchBwd:lastSearchPattern
 ignoreCase:ign
+match: match
 ] ifFalse:[
 self
 searchFwd:lastSearchPattern
 ignoreCase:ign
 match: match
 "Created: / 03-05-1999 / 15:02:16 / cg"
 "Modified: / 21-09-2006 / 16:47:57 / cg"
 !
 searchBwd
-"search backward and -if found- position cursor"
+"search backward (for the same thing again)
+If found, position cursor"
 |ign selectedVariable|
 searchAction notNil ifTrue:[
 "/autosearch is cleared whenever there is search with user selection
 !
 searchBwd:pattern ifAbsent:aBlock
 "do a backward search"
+self
+searchBwdUsingSpec:(ListView::SearchSpec new
+pattern:pattern)
+ifAbsent:aBlock
+"Modified: 13.9.1997 / 01:05:49 / cg"
+!
+searchBwd:pattern ignoreCase:ign
+"do a backward search"
+self
+searchBwd:pattern
+ignoreCase:ign
+ifAbsent:[
+self sensor compressKeyPressEventsWithKey:#FindPrev.
+self showNotFound
+].
+"/ lastSearchIgnoredCase := ign.
+lastSearchPattern := pattern string
+"Created: / 13-09-1997 / 06:18:00 / cg"
+"Modified: / 23-03-2012 / 12:10:25 / cg"
+!
+searchBwd:pattern ignoreCase:ign ifAbsent:aBlock
+"do a backward search"
+self
+searchBwdUsingSpec:(ListView::SearchSpec new
+pattern:pattern
+ignoreCase:ign)
+ifAbsent:aBlock
+"Modified: 13.9.1997 / 01:05:49 / cg"
+"Created: 13.9.1997 / 06:18:41 / cg"
+!
+searchBwd:pattern ignoreCase:ign match: match
+"do a backward search.
+match pattern functionality is not yet available for backward search"
+"/ lastSearchWasMatch := match.
+self searchBwd:pattern ignoreCase:ign.
+"Modified: / 23-03-2012 / 12:12:44 / cg"
+!
+searchBwdUsingSpec:searchSpec
+"do a backward search"
+self
+searchBwdUsingSpec:searchSpec
+ifAbsent:[self showNotFound].
+"/    lastSearchIgnoredCase := false.
+lastSearchPattern := searchSpec pattern string
+"Modified: / 21-09-2006 / 16:48:29 / cg"
+!
+searchBwdUsingSpec:searchSpec ifAbsent:aBlock
+"do a backward search"
 |pos startLine startCol|
 pos :=  self startPositionForSearchBackward.
 startLine := pos y.
 startCol := pos x.
 self
-searchBackwardFor:pattern
+searchBackwardUsingSpec:searchSpec
 startingAtLine:startLine col:startCol
-ifFound:[:line :col |
+ifFound:[:line :col | self showMatch:searchSpec pattern isMatch:searchSpec match atLine:line col:col]
-self showMatch:pattern isMatch:false atLine:line col:col]
 ifAbsent:aBlock
-"Modified: 13.9.1997 / 01:05:49 / cg"
-!
-searchBwd:pattern ignoreCase:ign
-"do a backward search"
-self searchBwd:pattern
-ignoreCase:ign
-ifAbsent:[
-self sensor compressKeyPressEventsWithKey:#FindPrev.
-self showNotFound
-].
-"/ lastSearchIgnoredCase := ign.
-lastSearchPattern := pattern string
-"Created: / 13-09-1997 / 06:18:00 / cg"
-"Modified: / 23-03-2012 / 12:10:25 / cg"
-!
-searchBwd:pattern ignoreCase:ign ifAbsent:aBlock
-"do a backward search"
-|pos startLine startCol|
-pos :=  self startPositionForSearchBackward.
-startLine := pos y.
-startCol := pos x.
-self
-searchBackwardFor:pattern
-ignoreCase:ign
-startingAtLine:startLine col:startCol
-ifFound:[:line :col | self showMatch:pattern isMatch:false atLine:line col:col]
-ifAbsent:aBlock
-"Modified: 13.9.1997 / 01:05:49 / cg"
-"Created: 13.9.1997 / 06:18:41 / cg"
-!
-searchBwd:pattern ignoreCase:ign match: match
-"do a backward search.
-match pattern functionality is not yet available for backward search"
-"/ lastSearchWasMatch := match.
-self searchBwd:pattern ignoreCase:ign.
-"Modified: / 23-03-2012 / 12:12:44 / cg"
 !
 searchForAndSelectMatchingParenthesisFromLine:startLine col:startCol
 "select characters enclosed by matching parenthesis if one is under startLine/Col"
 "Modified: 15.10.1996 / 12:22:30 / cg"
 !
 searchFwd
-"search forward for pattern or selection"
+"search forward for the same pattern or selection again"
 |ign match variable|
 searchAction notNil ifTrue:[
 "/ autosearch is cleared whenever there is search with user selection
 !
 searchFwd:pattern ifAbsent:aBlock
 "do a forward search"
-|pos startLine startCol|
+self
+searchFwdUsingSpec:(ListView::SearchSpec new
-pos := self startPositionForSearchForward.
+pattern:pattern)
-startLine := pos y.
-startCol := pos x.
-self
-searchForwardFor:pattern
-startingAtLine:startLine col:startCol
-ifFound:[:line :col | self showMatch:pattern atLine:line col:col]
 ifAbsent:aBlock
 "Modified: / 21-09-2006 / 16:51:28 / cg"
 !
 searchFwd:pattern ignoreCase:ign
 "do a forward search"
 self
-searchFwd:pattern
+searchFwdUsingSpec:(ListView::SearchSpec new
-ignoreCase:ign
+pattern:pattern
+ignoreCase:ign)
 ifAbsent:[
 self sensor compressKeyPressEventsWithKey:#FindNext.
 self showNotFound
 ].
 "/ lastSearchIgnoredCase := ign.
 !
 searchFwd:pattern ignoreCase:ign ifAbsent:aBlock
 "do a forward search"
-|pos startLine startCol|
+self
+searchFwdUsingSpec:(ListView::SearchSpec new
-pos :=  self startPositionForSearchForward.
+pattern:pattern
-startLine := pos y.
+ignoreCase:ign)
-startCol := pos x.
-self
-searchForwardFor:pattern
-ignoreCase:ign
-startingAtLine:startLine col:startCol
-ifFound:[:line :col | self showMatch:pattern atLine:line col:col]
 ifAbsent:aBlock
 "Modified: 13.9.1997 / 01:05:35 / cg"
 "Created: 13.9.1997 / 06:18:27 / cg"
 !
 searchFwd:pattern ignoreCase:ign match: match
 "do a forward search"
 self
-searchFwd:pattern
+searchFwdUsingSpec:(ListView::SearchSpec new
-ignoreCase:ign
+pattern:pattern
-match: match
+ignoreCase:ign
+match:match)
 ifAbsent:[
 self sensor compressKeyPressEventsWithKey:#FindNext.
 self showNotFound
 ].
 "/ lastSearchIgnoredCase := ign.
 !
 searchFwd:pattern ignoreCase:ign match: match ifAbsent:aBlock
 "do a forward search"
+self
+searchFwdUsingSpec:(ListView::SearchSpec new
+pattern:pattern
+ignoreCase:ign
+match:match)
+ifAbsent:aBlock
+"Modified: 13.9.1997 / 01:05:35 / cg"
+"Created: 13.9.1997 / 06:18:27 / cg"
+!
+searchFwd:pattern ignoreCase:ign match: match startingAtLine:startLine col:startCol ifAbsent:aBlock
+"do a forward search"
+self
+searchFwdUsingSpec:(ListView::SearchSpec new
+pattern:pattern
+ignoreCase:ign
+match:match)
+startingAtLine:startLine col:startCol
+ifAbsent:aBlock
+!
+searchFwdUsingSpec:searchSpec
+"do a forward search"
+self
+searchFwdUsingSpec:searchSpec
+ifAbsent:[self showNotFound].
+"/    lastSearchIgnoredCase := false.
+lastSearchPattern := searchSpec pattern string
+"Modified: / 21-09-2006 / 16:52:04 / cg"
+!
+searchFwdUsingSpec:searchSpec ifAbsent:aBlock
+"do a forward search"
 |pos startLine startCol|
-pos :=  self startPositionForSearchForward.
+pos := self startPositionForSearchForward.
 startLine := pos y.
 startCol := pos x.
 self
-searchFwd:pattern
+searchFwdUsingSpec:searchSpec
-ignoreCase:ign
-match: match
 startingAtLine:startLine col:startCol
 ifAbsent:aBlock
 "Modified: 13.9.1997 / 01:05:35 / cg"
 "Created: 13.9.1997 / 06:18:27 / cg"
 !
-searchFwd:pattern ignoreCase:ign match: match startingAtLine:startLine col:startCol ifAbsent:aBlock
+searchFwdUsingSpec:searchSpec startingAtLine:startLine col:startCol ifAbsent:aBlock
 "do a forward search"
 self
-searchForwardFor:pattern
+searchForwardUsingSpec:searchSpec
-ignoreCase:ign
-match: match
 startingAtLine:startLine col:startCol
-ifFound:[:line :col | self showMatch:pattern isMatch:match atLine:line col:col]
+ifFound:[:line :col | self showMatch:searchSpec pattern isMatch:searchSpec match atLine:line col:col]
 ifAbsent:aBlock
 !
 searchPattern
 "return the last search pattern"
 ! !
 !TextView class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg/TextView.st,v 1.340 2012-10-02 14:23:34 cg Exp $'
+^ '$Header: /cvs/stx/stx/libwidg/TextView.st,v 1.341 2012-10-23 12:58:41 cg Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libwidg/TextView.st,v 1.340 2012-10-02 14:23:34 cg Exp $'
+^ '$Header: /cvs/stx/stx/libwidg/TextView.st,v 1.341 2012-10-23 12:58:41 cg Exp $'
 ! !
 TextView initialize!

changeset 4462	e7580f29c467
parent 4457	f2efec2e3f93
child 4466	5c7a01426564