CompletionEntry: we do the wrapping too late. when we instantiate it …

…we just have symbols, so we do not know what they

where originally (variable, selectors...)

Thus: create entries in the #completionEntries method 

TODO after this: we need to create one kind of  entries for selectors, other subclass for selectors

src/NECompletion/CompletionContext.class.st

@@ -12,8 +12,7 @@ Class {
 		'node',
 		'isWorkspace',
 		'class',
-		'entries',
-		'sorter'
+		'entries'
 	],
 	#classVars : [
 		'SorterClass'
@@ -93,10 +92,10 @@ CompletionContext >> hasMessage [
 
 { #category : #entries }
 CompletionContext >> initEntries [
-	| suggestionsList |
+	| suggestionsList sorter |
 	sorter := self class sorterClass new context: self.
 	suggestionsList := sorter sortCompletionList: node completionEntries.
-	^ suggestionsList collect: [ :each | NECEntry contents: each node: node ]
+	^ suggestionsList
 ]
 
 { #category : #accessing }

src/NECompletion/RBLiteralValueNode.extension.st

@@ -4,7 +4,9 @@ Extension { #name : #RBLiteralValueNode }
 RBLiteralValueNode >> completionEntries [
 	value isSymbol ifFalse: [ ^ #() ].
 	"return all symbols that start with value"
-	^Symbol allSymbols select: [ :each | (each beginsWith: value) and: [each isLiteralSymbol]]
+	^Symbol allSymbols 
+		select: [ :each | (each beginsWith: value) and: [each isLiteralSymbol]] 
+		thenCollect: [ :each | NECEntry contents: each node: self ]
 ]
 
 { #category : #'*NECompletion' }

src/NECompletion/RBProgramNode.extension.st

@@ -13,5 +13,7 @@ RBProgramNode >> completionToken [
 { #category : #'*NECompletion' }
 RBProgramNode >> select: aCollection beginningWith: aString [
 	"note: to be inlined into the senders"
-	^ aCollection select: [ :each | each beginsWith: aString asString ]
+	^ aCollection 
+		select: [ :each | each beginsWith: aString asString ]
+		thenCollect: [ :each | NECEntry contents: each node: self ]
 ]