hg/stx-libwidg2: comparison DoWhatIMeanSupport.st

equal deleted inserted replaced

-:ce09771c85a9
+:a25d288252f4
 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
 newParts nSelParts oldLen newLen selectorParts
-findBest parentNode nodeReceiver "selectorsSentInCode" selectorsImplementedInClass
+parentNode nodeReceiver "selectorsSentInCode" selectorsImplementedInClass
 editAction parentNodeClassIfKnown
 receiverNodeClassIfKnown
 offerParenthisationAroundNode parenthesisAroundIndex parentNodeToParenthesize
 offerValueInsertion valueToInsert valueToInsertIndex valueInfo
 classesFromAssignmentsToReceiver otherMessagesToReceiver
 canParenthesize classesOfReceiver|
-"/ Transcript show:'node '; show:node; show:' ; '.
+Verbose == true ifTrue:[
-"/ Transcript show:'msg in '; show:methodOrNil; show:' / '; showCR:classOrNil.
+Transcript show:'node '; show:node; show:' ; '.
+Transcript show:'msg in '; show:methodOrNil; show:' / '; showCR:classOrNil.
+].
 offerParenthisationAroundNode := nil.
 offerValueInsertion := false.
-"/ node at:1
-findBest :=
-[:node :selector |
-|srchClasses bestSelectors bestPrefixes
-allMessagesSentToVariable classesImplementingAllMessages|
-srchClasses := node==nodeReceiver
-ifTrue:[classesOfReceiver]
-ifFalse:[self classesOfNode:node].
-srchClasses isEmptyOrNil ifTrue:[
-node isVariable ifTrue:[
-allMessagesSentToVariable := Set new.
-rememberedNodes do:[:eachNode |
-eachNode allMessageNodesDo:[:eachMessage |
-|msgReceiver msgSelector|
-(msgReceiver := eachMessage receiver) isVariable ifTrue:[
-msgReceiver name = node name ifTrue:[
-(msgSelector := eachMessage selector) ~= selector ifTrue:[
-allMessagesSentToVariable add:msgSelector
-]
-]
-]
-]
-].
-allMessagesSentToVariable notEmpty ifTrue:[
-"/ consider classes which implement all those messages.
-classesImplementingAllMessages := Smalltalk allImplementorsOf:(allMessagesSentToVariable first).
-allMessagesSentToVariable do:[:eachSelector |
-classesImplementingAllMessages := classesImplementingAllMessages
-select:[:cls | cls implements:eachSelector].
-].
-srchClasses := classesImplementingAllMessages.
-].
-].
-].
-bestSelectors := Set new.
-srchClasses isEmptyOrNil ifTrue:[
-bestSelectors addAll:( Parser findBest:50 selectorsFor:selector in:nil forCompletion:true ).
-] ifFalse:[
-srchClasses do:[:srchClass |
-|bestForThisClass|
-bestForThisClass := Parser findBest:50 selectorsFor:selector in:srchClass forCompletion:true.
-bestForThisClass := self
-withoutSelectorsUnlikelyFor:srchClass
-from:bestForThisClass
-forPartial:selector.
-bestSelectors addAll:bestForThisClass.
-].
-].
-"/ remove the already typed-in selector itself, in case.
-bestSelectors remove:selector ifAbsent:[].
-bestSelectors := bestSelectors asOrderedCollection.
-bestSelectors
-].
 selector := node selector.
 lcSelector := selector asLowercase.
 parentNode := node parent.
 nodeReceiver := node receiver.
 nodeReceiver notNil ifTrue:[
 classesOfReceiver := self classesOfNode:nodeReceiver.
 ].
-Transcript show:node; show:' -> '; showCR:classesOfReceiver.
+Verbose == true ifTrue:[
-( node isVariable and:[node name = 'self']) ifTrue:[self halt].
+Transcript show:node; show:' -> '; showCR:classesOfReceiver.
+( node isVariable and:[node name = 'self']) ifTrue:[self halt].
+].
 "/ if there is already space before the cursor, and the parent node is not a message,
 "/ do not attempt to complete the current message.
 "/ If it is a message, we will look for parent-message completion also below (best2 stuff)
 (codeView characterBeforeCursor ? $ ) isSeparator ifTrue:[
 selector isKeyword ifFalse:[
 ].
 ].
 "/ only do this if the node-message has no parents around
 node parentheses isEmptyOrNil ifTrue:[
-bestSelectors := findBest value:nodeReceiver value:selector.
+Verbose == true ifTrue:[
+Transcript show:'try for: '; showCR:nodeReceiver
+].
+bestSelectors := self findBest:nodeReceiver for:selector
+inClasses:classesOfReceiver
 ] ifFalse:[
 bestSelectors := OrderedCollection new.
 ].
 "/ if the receiver is a real variable,
 (selector isUnarySelector and:[ parentNode notNil and:[ parentNode isMessage ]]) ifTrue:[
 (parentSelector := parentNode selector) isKeyword ifTrue:[
 "/ if its a unary message AND the parent is a keyword node, look for parent completion too.
 "/ i.e. look if there is a longer keyword possible
 newParentSelector := parentSelector,selector.
-bestSelectors2 := findBest value:(parentNode receiver) value:newParentSelector.
+bestSelectors2 := self
+findBest:(parentNode receiver) for:newParentSelector
+inClasses:(self classesOfNode:parentNode receiver).
 bestSelectors2 := bestSelectors2 select:[:sel | sel isKeyword and:[ sel startsWith:parentSelector]].
 bestSelectors2 := bestSelectors2 asOrderedCollection sort:[:a :b | a size < b size].
 bestSelectors := bestSelectors reject:[:sel | bestSelectors2 includes:sel].
 "/ if the parent has a valid selector, offer parenthization
 "/    or after foo bar baz <-
 "/ not if typing into an existing message
 "/ (i.e. into foo == shift <- more
 "/    or into foo bar <- baz
 codeView characterPositionOfCursor >= parentNode stop ifTrue:[
-kwSels := findBest value:parentNode value:selector.
+kwSels := self
+findBest:parentNode for:selector
+inClasses:(self classesOfNode:parentNode).
 kwSels := kwSels select:[:sel | sel isKeyword].
 kwSels := kwSels asOrderedCollection sort:[:a :b | a size < b size].
 bestSelectors := bestSelectors reject:[:sel | kwSels includes:sel].
 ^ self editActionToReplaceCodeFrom:node start to:node stop byWordIn:suggestions
 "Created: / 01-05-2016 / 18:44:09 / cg"
 !
+findBest:node for:selector inClasses:srchClassesArg
+|srchClasses bestSelectors
+allMessagesSentToVariable classesImplementingAllMessages|
+srchClasses := srchClassesArg.
+Verbose == true ifTrue:[
+Transcript show:'node: '; showCR:node.
+Transcript show:'srchClasses: '; showCR:srchClasses.
+].
+srchClasses isEmptyOrNil ifTrue:[
+node isVariable ifTrue:[
+allMessagesSentToVariable := Set new.
+rememberedNodes do:[:eachNode |
+eachNode allMessageNodesDo:[:eachMessage |
+|msgReceiver msgSelector|
+(msgReceiver := eachMessage receiver) isVariable ifTrue:[
+msgReceiver name = node name ifTrue:[
+(msgSelector := eachMessage selector) ~= selector ifTrue:[
+allMessagesSentToVariable add:msgSelector
+]
+]
+]
+]
+].
+allMessagesSentToVariable notEmpty ifTrue:[
+"/ consider classes which implement all those messages.
+classesImplementingAllMessages := Smalltalk allImplementorsOf:(allMessagesSentToVariable first).
+allMessagesSentToVariable do:[:eachSelector |
+classesImplementingAllMessages := classesImplementingAllMessages
+select:[:cls | cls implements:eachSelector].
+].
+srchClasses := classesImplementingAllMessages.
+].
+].
+].
+bestSelectors := Set new.
+srchClasses isEmptyOrNil ifTrue:[
+bestSelectors addAll:( Parser findBest:50 selectorsFor:selector in:nil forCompletion:true ).
+Verbose == true ifTrue:[
+Transcript show:'bestSelectors (1): '; showCR:bestSelectors.
+].
+] ifFalse:[
+srchClasses do:[:srchClass |
+|bestForThisClass|
+bestForThisClass := Parser findBest:50 selectorsFor:selector in:srchClass forCompletion:true.
+bestForThisClass := self
+withoutSelectorsUnlikelyFor:srchClass
+from:bestForThisClass
+forPartial:selector.
+Verbose == true ifTrue:[
+Transcript show:'bestSelectors (2): '; showCR:bestForThisClass.
+].
+bestSelectors addAll:bestForThisClass.
+].
+].
+"/ remove the already typed-in selector itself, in case.
+bestSelectors remove:selector ifAbsent:[].
+bestSelectors := bestSelectors asOrderedCollection.
+^ bestSelectors
+!
 findNodeForInterval:interval in:source
 |tree node|
 interval isEmpty ifTrue: [^ nil].
 RBParser isNil ifTrue: [^ nil].
 found in object, but only make sense for variable objects or those which do
 implement at:put: themself.
 I have currently no better idea than hardcoding stuff I found irritating..."
 |selectors noNilChecks noIsXXXChecks noNoXXXChecks noBecome
-noIndexedSetters noIndexedGetters noSizeQueries|
+noIndexedSetters noIndexedGetters noSizeQueries docSelectors|
 aClass isNil ifTrue:[ ^ selectorsArg ].
 noNilChecks := noIsXXXChecks := noNoXXXChecks := noBecome := false.
 noIndexedSetters := noIndexedGetters := noSizeQueries := false.
 selectors := (selectorsArg ? #()) asOrderedCollection.
 self tracePoint:#cg message:aClass.
+aClass isMeta ifTrue:[
+docSelectors := #(copyright documentation examples
+version version_CVS version_SVN version_HG).
+selectors := selectors reject:[:sel | docSelectors includes:sel].
+].
 "/ actually meaning booleans here
 (aClass == True or:[aClass == False]) ifTrue:[
 noNilChecks := noBecome := true.
 (partialSelector startsWith:'is') ifFalse:[ noIsXXXChecks := true ].
 (partialSelector startsWith:'no') ifFalse:[ noNoXXXChecks := true ].

changeset 5112	a25d288252f4
parent 5109	18c01df208c2
child 5113	6a5ae22ee501