hg/stx-libwidg2: comparison DoWhatIMeanSupport.st

equal deleted inserted replaced

-:d3381caeb327
+:d5b6d7c0b6ee
 !DoWhatIMeanSupport class methodsFor:'typing distance'!
 isKey:k1 nextTo:k2
 "return true, if k1 and k2 are adjacent keys on the keyboard.
 This is used to specially priorize plausible typing errors of adjacent keys.
-CAVEAT: hard coded us- and german keyboards here."
+CAVEAT: hard coded us-, german and french keyboards here; data should come from somewhere else."
 ^ self isKey:k1 nextTo:k2 onKeyboard:(self keyboard)
 "
 self isKey:$a nextTo:$a
 self isKey:$a nextTo:$x
 "
 !
 keyboard
-"the keyboard layout (useful to figure out which keys are nearby a key,
+"the keyboard layout
-to find possible typing errors)"
+(useful to figure out which keys are nearby a key, to find possible typing errors)
+CAVEAT: hard coded us-, german and french keyboards here; data should come from somewhere else."
 |lang|
 lang := UserPreferences current language.
 lang == #de ifTrue:[
 ^ #(
 '1234567890-'
 '*qwertzuiop'
 '**asdfghjkl:'
-'***yxcvbnm' ).
+'***yxcvbnm'
+).
 ].
 lang == #fr ifTrue:[
 ^ #(
 '1234567890'
 '*azertyuiop'
 '**qsdfghjklm'
-'***wxcvbn,' ).
+'***wxcvbn,'
+).
 ].
 ^ #(
 '1234567890-'
 '*qwertyuiop'
 '**asdfghjkl:'
-'***zxcvbnm' ).
+'***zxcvbnm'
+).
 "
 self keyboard
 "
 "/ otherwise, a unary message is probably intended to be sent to the variable.
 "/ (however, no character is available to determine what is useful)
 forceNewMessageSend := true.
 ].
 ] ifFalse:[
-(node isUnary) ifTrue:[
+(node isMessage and:[node isUnary]) ifTrue:[
 "/ expanding <rcvr> foo |<- cursor here (i.e. a space after foo)
 "/
 forceNewMessageSend := true.
 "/                "/ can we see what we get from foo?
 "/                classOfReceiver := self
 codeCompletionForMessage:node into:actionBlock
 |selector srchClass implClass
 bestSelectors selector2 bestSelectors2 allBest best info numArgs
 newParts nSelParts oldLen newLen selectorParts
 findBest parentNode selectorsSentInCode split editAction parentNodeClassIfKnown
-otherMessagesToReceiver possibleClasses receiverNodeClassIfKnown|
+otherMessagesToReceiver assignmentsToReceiver possibleClasses receiverNodeClassIfKnown|
 "/ Transcript show:'msg in '; show:methodOrNil; show:' / '; showCR:classOrNil.
 "/    classOrNil notNil ifTrue:[
 "/        parser := Parser parseMethod:codeView contents string in:classOrNil ignoreErrors:true ignoreWarnings:true.
 ].
 ].
 bestSelectors := findBest value:node receiver value:selector.
-"/ if the receiver is a variable, we can look for other messages being sent to that variable in the current method
+"/ if the receiver is a variable,
+"/ we can look for other messages being sent to that variable in the current method.
+"/ also, if there is an assignment like class new to it...
 (tree notNil and:[ node receiver isVariable ])
 ifTrue:[
-otherMessagesToReceiver := tree allMessageNodes
+assignmentsToReceiver := tree allAssignmentNodes
-select:[:eachMessageNode |
+collect:[:eachAssignmentNode |
-node receiver = eachMessageNode receiver
+|cls|
-and:[ selector ~= eachMessageNode selector]]
-thenCollect:[:eachNode | eachNode selector].
+(node receiver = eachAssignmentNode variable
-possibleClasses := Smalltalk allClassesForWhich:[:cls |
+and:[ (cls := self classOfNode:eachAssignmentNode value) notNil ]
-otherMessagesToReceiver conform:[:eachSelectorSent | cls canUnderstand:eachSelectorSent]].
+) ifTrue:[
-possibleClasses := possibleClasses select:[:cls | cls isLoaded].
+cls
+] ifFalse:[
+nil
+]
+]
+thenSelect:[:classOrNil | classOrNil notNil].
+assignmentsToReceiver notEmptyOrNil ifTrue:[
+possibleClasses := assignmentsToReceiver
+] ifFalse:[
+otherMessagesToReceiver := tree allMessageNodes
+select:[:eachMessageNode |
+node receiver = eachMessageNode receiver
+and:[ selector ~= eachMessageNode selector]]
+thenCollect:[:eachNode | eachNode selector].
+otherMessagesToReceiver := otherMessagesToReceiver asSet.
+possibleClasses := Smalltalk allClassesForWhich:[:cls |
+otherMessagesToReceiver conform:[:eachSelectorSent | cls includesSelector: "canUnderstand:" eachSelectorSent]].
+possibleClasses := possibleClasses select:[:cls | cls isLoaded].
+].
 (possibleClasses notEmpty and:[possibleClasses size < 10]) ifTrue:[
 bestSelectors := Set new.
 possibleClasses do:[:eachClass |
 |bestSelectorsForClass|
 self information:info.
 ].
 editAction :=
 [:index |
-|best|
+|chosen|
-best := allBest at:index.
+chosen := allBest at:index.
-best ~= selector ifTrue:[
+chosen ~= selector ifTrue:[
-numArgs := best numArgs.
+numArgs := chosen numArgs.
-(bestSelectors2 notEmptyOrNil and:[bestSelectors2 includes:best]) ifTrue:[
+(bestSelectors2 notEmptyOrNil and:[bestSelectors2 includes:chosen]) ifTrue:[
 selectorParts := parentNode selectorParts , node selectorParts.
 ] ifFalse:[
 selectorParts := node selectorParts.
 ].
 nSelParts := selectorParts size.
-newParts := best asCollectionOfSubstringsSeparatedBy:$:.
+newParts := chosen asCollectionOfSubstringsSeparatedBy:$:.
 newParts := newParts select:[:part | part size > 0].
 codeView
 undoableDo:[
 |newCursorPosition stop checkForArgumentTemplates|
 checkForArgumentTemplates := false.
-(selector isUnarySelector and:[best isKeywordSelector]) ifTrue:[ checkForArgumentTemplates := true ].
+(selector isUnarySelector and:[chosen isKeywordSelector]) ifTrue:[ checkForArgumentTemplates := true ].
 numArgs > nSelParts ifTrue:[
 "/ new selector has more arguments; append them
 stop := selectorParts last stop.
 "/ append the rest ...
 numArgs downTo:nSelParts+1 do:[:idx |
 |newPart|
 newPart := newParts at:idx.
-(best endsWith:$:) ifTrue:[
+(chosen endsWith:$:) ifTrue:[
 newPart := newPart , ':'
 ].
 (codeView characterAtCharacterPosition:stop) == $: ifFalse:[
 newPart := ':' , newPart.
 newPart := newParts at:idx.
 oldPartialToken := selectorParts at:idx.
 start := oldPartialToken start.
 stop := oldPartialToken stop.
-(best endsWith:$:) ifTrue:[
+(chosen endsWith:$:) ifTrue:[
 (codeView characterAtCharacterPosition:stop+1) == $: ifFalse:[
 newPart := newPart , ':'
 ]
 ] ifFalse:[
 (codeView characterAtCharacterPosition:stop) == $: ifTrue:[
 extra := hasSpace ifTrue:[''] ifFalse:[' '].
 (
 #(
 'ifTrue:' 'ifFalse:' 'ifTrue:ifFalse:' 'ifFalse:ifTrue:' 'and:' 'or:'
-) includes:best
+) includes:chosen
 ) ifTrue:[
 codeView insertStringAtCursor:('[]',extra).
 codeView cursorLeft:1+extra size.
 ].
 (
 #(
 'collect:' 'select:' 'reject:' 'do:'
-) includes:best
+) includes:chosen
 ) ifTrue:[
 codeView insertStringAtCursor:('[:each | ]',extra).
 codeView cursorLeft:1+extra size.
 ].
 ].
 [:suggestions :action :whatIsIt |
 |chosen|
 chosen := self askUserForCompletion:whatIsIt for:codeView at:node start from:suggestions.
-action value:(suggestions indexOf:chosen)
+chosen notNil ifTrue:[
+action value:(suggestions indexOf:chosen)
+].
 ].
 "/    |crsrPos
 "/     selectorSoFar matchingSelectors
 "/     selectors distances best rest
 ! !
 !DoWhatIMeanSupport class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg2/DoWhatIMeanSupport.st,v 1.154 2013-09-12 14:01:17 cg Exp $'
+^ '$Header: /cvs/stx/stx/libwidg2/DoWhatIMeanSupport.st,v 1.155 2013-09-15 10:43:18 cg Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libwidg2/DoWhatIMeanSupport.st,v 1.154 2013-09-12 14:01:17 cg Exp $'
+^ '$Header: /cvs/stx/stx/libwidg2/DoWhatIMeanSupport.st,v 1.155 2013-09-15 10:43:18 cg Exp $'
 ! !

changeset 4386	d5b6d7c0b6ee
parent 4385	d3381caeb327
child 4387	306eac46bcb1