hg/stx-libwidg2: comparison DoWhatIMeanSupport.st

equal deleted inserted replaced

-:e77a2fa2031f
+:46c0f7f9b92c
 !
 codeCompletionForMessage:node into:actionBlock
 "find good completions for a message selector in a message-send node"
-|selector lcSelector bestSelectors parentSelector newParentSelector bestSelectors2 bestWithParenthesis allBest numArgs
+|selector lcSelector selectorWithoutColon lcSelectorWithoutColon
+bestSelectors parentSelector newParentSelector bestSelectors2 bestWithParenthesis allBest numArgs
 newParts nSelParts oldLen newLen selectorParts
 parentNode nodeReceiver "selectorsSentInCode" selectorsImplementedInClass
 editAction parentNodeClassIfKnown
 receiverNodeClassIfKnown
 offerParenthisationAroundNode parenthesisAroundIndex parentNodeToParenthesize
 offerParenthisationAroundNode := nil.
 offerValueInsertion := false.
 selector := node selector.
 lcSelector := selector asLowercase.
+selectorWithoutColon := selector.
+lcSelectorWithoutColon := lcSelector.
+(selectorWithoutColon includes:$:) ifTrue:[
+selectorWithoutColon := selector upTo:$:.
+].
+(lcSelectorWithoutColon includes:$:) ifTrue:[
+lcSelectorWithoutColon := lcSelector upTo:$:.
+].
 parentNode := node parent.
 nodeReceiver := node receiver.
 nodeReceiver notNil ifTrue:[
 classesOfReceiver := self classesOfNode:nodeReceiver.
 ].
 Parser findBest:30 selectorsFor:selector in:eachClass forCompletion:true.
 ] as:Set) asOrderedCollection.
 "/ if any of those is a prefix-keyword of the selector,
 "/ do not offer it (i.e. ifTrue:ifFalse: is already present, don't offer ifTrue:ifFalse: again.
-bestSelectors := bestSelectors reject: [:sel | (selector startsWith: sel) or: [selector endsWith: sel]].
+bestSelectors := bestSelectors reject: [:sel |
+(selector startsWith: sel) or: [selector endsWith: sel]
+].
 ].
 ].
 "/ if we are behind a keyword messages colon,
 "/ only look for matching prefix selectors;
 offerParenthisationAroundNode := node.
 "/ Transcript show:'2:'; showCR:node.
 ].
 codeView characterBeforeCursor == $: ifTrue:[
-(bestSelectors select:[:sel | sel asLowercase startsWith:lcSelector]) isEmpty ifTrue:[
+(bestSelectors select:[:sel | sel asLowercase startsWith:lcSelectorWithoutColon]) isEmpty ifTrue:[
 "/ nothing better around
 |argIndex argNames argNameStrings impls|
 argIndex := node selectorParts size.
 argNames := Set new.
 "/ when completing a non-keyword AND the parent is a keyword message,
 "/ only consider longer keyword messages or unary messages.
 "/ unless the node is parenthesized
 node hasParentheses ifFalse:[
 (parentNode notNil and:[ parentNode isKeywordMessage ]) ifTrue:[
-bestSelectors := bestSelectors select:[:sel | sel isUnarySelector or:[ sel startsWith:sel]]
+bestSelectors := bestSelectors select:[:sel |
+sel isUnarySelector
+or:[ sel startsWith:parentNode selector]
+]
 ]
 ]
 ].
 "/    bestSelectors := bestSelectors asOrderedCollection.
 ].
 ].
 ].
 allBest := (bestSelectors ? #()) , (bestSelectors2 ? #()) asOrderedCollection.
-self sortSelectors:allBest forSelector:selector lcSelector:lcSelector.
+self sortSelectors:allBest forSelector:selectorWithoutColon lcSelector:lcSelectorWithoutColon.
 "/ sort: prefixes first.
 parentSelector notNil ifTrue:[
 allBest := self
 splitSelectorList:allBest
 by:[:sel |
-(sel asLowercase startsWith:lcSelector)
+(sel asLowercase startsWith:lcSelectorWithoutColon)
 or:[sel startsWith:parentSelector]].
 ].
 "/ if receiver is super, always include the method's own selector
 nodeReceiver isSuper ifTrue:[
 (tree isMethod) ifTrue:[
 |mSel|
 mSel := tree selector.
 mSel notNil ifTrue:[
-(mSel startsWith:selector) ifTrue:[
+(mSel startsWith:selectorWithoutColon) ifTrue:[
 "/ already the word before the cursor?
 (mSel ~= selector) ifTrue:[
 allBest removeAndAddFirst:mSel.
 ]
 ]
 "/].
 (parentSelector notNil and:[parentSelector includes:$:]) ifTrue:[
 "/ the one's which are a prefix are moved towards the top of the list
 allBest := self splitSelectorList:allBest
-by:[:sel | sel notNil and:[sel asLowercase startsWith:lcSelector]].
+by:[:sel | sel notNil and:[sel asLowercase startsWith:lcSelectorWithoutColon]].
 ].
 "/ heuristic hack:
 "/ 'i' and 'w' generate lists in which ifXXX / whileXXX are not at the top of the list.
 "/ we know, that those are most often wanted!!
 #(ifTrue: ifFalse: isNil notNil whileTrue whileFalse) includes:sel
 ].
 ].
 "/ sort again: prefixes must always come before
-self sortSelectors:allBest forSelector:selector lcSelector:lcSelector.
+allBest sortBySelector:#size.
-self sortUsefulSelectorsIn:allBest. "/cosmetics
+self sortSelectors:allBest forSelector:selectorWithoutColon lcSelector:lcSelectorWithoutColon.
+"/ self sortUsefulSelectorsIn:allBest. "/cosmetics
 (parentSelector notNil and:[parentSelector includes:$:]) ifTrue:[
 allBest := (allBest
 select:[:sel | sel startsWith:parentSelector]
 thenCollect:[:sel | sel copyFrom:(parentSelector lastIndexOf:$:)+1])
 ].
 actionBlock value:allBest value:editAction value:nil.
 "Created: / 10-11-2006 / 13:18:27 / cg"
 "Modified: / 16-02-2010 / 10:33:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-"Modified: / 15-09-2017 / 11:07:13 / cg"
+"Modified: / 30-09-2017 / 14:12:47 / cg"
 !
 codeCompletionForMessageTo:node into:actionBlock
 "find good suggestions for a message send to node, with no input yet.
 I.e. right after a receiver (w.o. any input yet)"
 codeCompletionForMethodSpec:node
 "completion in a method's selector pattern"
 self
 codeCompletionForMethodSpec:node
-into:
+into:[:suggestions :action :whatIsIt |
-[:suggestions :action :whatIsIt |
 |chosen|
 chosen := self askUserForCompletion:whatIsIt for:codeView
 at:node start from:suggestions.
 "Modified: / 04-07-2006 / 18:48:26 / fm"
 "Created: / 10-11-2006 / 13:46:44 / cg"
 "Modified: / 16-02-2010 / 10:13:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 01-06-2012 / 20:31:36 / cg"
+"Modified (format): / 30-09-2017 / 12:58:32 / cg"
 !
 codeCompletionForMethodSpec:node into:actionBlock
 "completion in a method's selector pattern"
 sortSelectors:list forSelector:selector lcSelector:lcSelector
 list sort: [:a :b |
 |aBeforeB|
+"/        (a startsWith:'sho') ifTrue:[
+"/            (b startsWith:'sho') ifTrue:[
+"/                self halt.
+"/            ].
+"/        ].
 (a startsWith:selector) ifTrue:[
-(b startsWith:selector) ifFalse:[
+(b startsWith:selector) ifTrue:[
+aBeforeB := (a size < b size) or:[a < b]
+] ifFalse:[
 aBeforeB := true
 ]
 ] ifFalse:[
 (b startsWith:selector) ifTrue:[
 aBeforeB := false
 ]
 ].
 ]
 ].
 ].
 aBeforeB
 ].
+"Modified: / 30-09-2017 / 14:10:06 / cg"
 !
 sortUsefulSelectorsIn:selectorList
 "/ cosmetics:
 "/  ifTrue / whileTrue should come before ifFalse/whileFalse

changeset 5613	46c0f7f9b92c
parent 5612	e77a2fa2031f
child 5621	bc187db92ab4