hg/stx-libwidg2: comparison DoWhatIMeanSupport.st

equal deleted inserted replaced

-:b295c198a0d0
+:5303d78eb69a
 ^ choice
 "Created: / 10-11-2006 / 14:00:53 / cg"
 !
+codeCompletionForBlockArgument:node into:actionBlock
+!
 codeCompletionForLiteralSymbol:nodeOrNil element:tokenOrNil considerAll:considerAll into:actionBlock
 "looking for all symbols is way too much and inprecise;
 experiment: only present symbols which are used by the class,
 and classes in that class category, or at least: implemented as method.
 We'll see..."
 parentNode := node parent.
 nodeReceiver := node receiver.
 nodeReceiver notNil ifTrue:[
 classesOfReceiver := self classesOfNode:nodeReceiver.
 ].
+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)
 "Modified: / 16-02-2010 / 10:33:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 01-05-2016 / 18:36:36 / cg"
 !
 codeCompletionForMessageTo:node into:actionBlock
-"find good suggestions for a message send to node, with no input yet"
+"find good suggestions for a message send to node, with no input yet.
+I.e. right after a receiver (w.o. any input yet)"
 |knownClass suggestions selectorsImplementedInClass mostUseful editActions pos|
-(knownClass := self classOfNode:node) isNil ifTrue:[^ self].
+(knownClass := self classOfNode:node) isNil ifTrue:[
+self classOfNode:node.
+^ self
+].
+Transcript show:node; show:' -> '; showCR:knownClass.
 selectorsImplementedInClass := Set new.
 knownClass withAllSuperclassesDo:[:cls |
 cls ~~ Object ifTrue:[
 selectorsImplementedInClass addAll:cls selectors.
 "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"
 !
+codeCompletionForTempVariable:node into:actionBlock
+!
 codeCompletionForVariable:node into:actionBlock
 |nonMetaClass crsrPos nm parent
 allVariables allDistances variablesAlreadyAdded nodeVal
 char getDistanceComputeBlockWithWeight addWithFactorBlock allTheBest bestAssoc
 globalFactor localFactor selectorOfMessageToNode implementors argIdx namesUsed kwPart editActions suggestions nameIsOK longerNames setOfNames otherArgNames
 "/ Transcript showCR:'No parseNode found (syntax error before or in comment?)'.
 self information:'No parseNode found (syntax error before or in comment?)'.
 ^ self.
 ].
 ].
-(source startsWith:'sel') ifTrue:[self halt].
+"/ (source startsWith:'sel') ifTrue:[self halt].
 nodeParent := node parent.
 (node isVariable
 and:[ nodeParent notNil
 and:[ nodeParent isMessage
 and:[scope arguments notEmpty
 and:[scope arguments first start <= node start
 and:[scope arguments last stop >= node stop]]].
 ].
 ].
-nodeIsInTemporaries ifTrue:[ ^ self ]. "/ no completion in a tempvar decl
+nodeIsInTemporaries ifTrue:[ self codeCompletionForTempVariable:node into:actionBlock. ^ self ].
-nodeIsInBlockArguments ifTrue:[ ^ self ]. "/ no completion in a tempvar decl
+nodeIsInBlockArguments ifTrue:[ self codeCompletionForBlockArgument:node into:actionBlock. ^ self ].
 "/ for variable completion, cursor must be right after the node
 codeView characterPositionOfCursor = (node stop + 1) ifTrue:[
 codeView characterBeforeCursor ~= Character space ifTrue:[
 self codeCompletionForVariable:node into:actionBlock.
 ].
 ^ setOfTypes
 !
 addClassesOfExpression:expr inClass:classOrNil to:setOfTypes
-|cls exprVal varName varScope instVarClass sym|
+|cls exprVal varName varScope instVarClass classVarClass poolVarClass sym|
 expr isLiteral ifTrue:[
 exprVal := expr value.
 cls := exprVal class.
 (exprVal isArray or:[ exprVal isByteArray or:[ exprVal isString ]]) ifTrue:[
 ^ setOfTypes
 ].
 ].
 classOrNil notNil ifTrue:[
+"/ inst var
 instVarClass := classOrNil whichClassDefinesInstVar:varName.
 instVarClass notNil ifTrue:[
 setOfTypes addAll:(self classesOfInstVarNamed:varName inClass:instVarClass).
+^ setOfTypes
 ].
-].
+"/ class vars
+classVarClass := classOrNil theNonMetaclass whichClassDefinesClassVar:varName.
+classVarClass notNil ifTrue:[
+"/ see what is currently there
+setOfTypes add:(classVarClass classVarAt:varName asSymbol) class.
+^ setOfTypes
+].
+varName isUppercaseFirst ifTrue:[
+"/ private class
+varName knownAsSymbol ifTrue:[
+cls := classOrNil theNonMetaclass privateClassesAt:varName asSymbol.
+cls notNil ifTrue:[
+setOfTypes add:(cls theMetaclass).
+^ setOfTypes
+].
+].
+].
+"/ pool vars
+poolVarClass := classOrNil theNonMetaclass whichPoolDefinesPoolVar:varName.
+poolVarClass notNil ifTrue:[
+"/ see what is currently there
+setOfTypes add:(poolVarClass classVarAt:varName asSymbol) class.
+^ setOfTypes
+].
+].
 varName isUppercaseFirst ifTrue:[
 sym := varName asSymbolIfInterned.
 sym notNil ifTrue:[
 exprVal := (Smalltalk at:sym).
 exprVal notNil ifTrue:[
 valueAndKindOfVariable:aVariableName
 "when showing possible completions for a variable,
 it is a good idea to know what the reveiver's value is.
 Sigh - returns nil as value both if unknown AND if a real nil is there"
-|nodeVal con privateClass pool sym|
+|nodeVal con classInstVarClass classVarClass privateClass pool sym nameSpace topNameSpace|
 aVariableName isUppercaseFirst ifTrue:[
 classOrNil notNil ifTrue:[
-(classOrNil theNonMetaclass classVarNames includes:aVariableName) ifTrue:[
+classOrNil isMeta ifTrue:[
-nodeVal := classOrNil theNonMetaclass classVarAt:aVariableName.
+"/ class instVars
+(classInstVarClass := classOrNil whichClassDefinesInstVar:aVariableName) notNil ifTrue:[
+nodeVal := classInstVarClass theNonMetaclass instVarNamed:aVariableName.
+^ { nodeVal . #classInstVariable }
+].
+].
+"/ class vars
+(classVarClass := classOrNil theNonMetaclass whichClassDefinesClassVar:aVariableName) notNil ifTrue:[
+nodeVal := classVarClass classVarAt:aVariableName asSymbol.
 ^ { nodeVal . #classVariable }
 ].
 privateClass := classOrNil theNonMetaclass privateClasses detect:[:cls | cls nameWithoutPrefix = aVariableName] ifNone:nil.
 privateClass notNil ifTrue:[
 nodeVal := privateClass.
 ^ { nodeVal . #privateClass }
 ].
-pool := classOrNil theNonMetaclass sharedPools detect:[:pool | pool classVariableNames includes:aVariableName] ifNone:nil.
+pool := classOrNil theNonMetaclass whichPoolDefinesPoolVar:aVariableName.
 pool notNil ifTrue:[
 nodeVal := pool classVarAt:aVariableName.
 ^ { nodeVal . #poolVariable }
 ].
+((nameSpace := classOrNil nameSpace) notNil and:[nameSpace ~~ Smalltalk]) ifTrue:[
+nameSpace isNameSpace ifTrue:[
+nodeVal := nameSpace at:aVariableName asSymbol.
+^ { nodeVal . #nameSpaceVariable }
+].
+nodeVal := nameSpace privateClassNamed:aVariableName asSymbol.
+^ { nodeVal . #privateClass }
+].
+((topNameSpace := classOrNil topNameSpace) notNil
+and:[topNameSpace ~~ nameSpace
+and:[topNameSpace ~~ Smalltalk]]) ifTrue:[
+nodeVal := topNameSpace at:aVariableName asSymbol.
+^ { nodeVal . #nameSpaceVariable }
+].
 ].
 (sym := aVariableName asSymbolIfInterned) notNil ifTrue:[
 nodeVal := Smalltalk at:sym.
 (nodeVal notNil or:[Smalltalk includesKey:sym]) ifTrue:[
 ^ { nodeVal . #global }

changeset 5106	5303d78eb69a
parent 5104	b295c198a0d0
child 5107	0048f8cf82fd
child 5109	18c01df208c2