Fix #6721: Do not take the completion token from the AST

The completion context should take the completionToken from the engine. The engine takes it from the editor. This avoids glitches when the AST is not entirely valid, or when typing inside comments
pharo-project · Jun 29, 2020 · 1b747ef · 1b747ef
1 parent d53ebbf
commit 1b747ef
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 21 deletions.
diff --git a/src/HeuristicCompletion-Model/CoASTHeuristicsResultSetBuilder.class.st b/src/HeuristicCompletion-Model/CoASTHeuristicsResultSetBuilder.class.st
@@ -62,7 +62,6 @@ CoASTHeuristicsResultSetBuilder >> visitMessageNode: aRBMessageNode [
 	^ self
 		configureFetcherForNode: aRBMessageNode
 		usingHeuristicAvoidingRepetitions: self messageHeuristic
-		narrowingWith: aRBMessageNode selector
 ]
 
 { #category : #visiting }
@@ -71,7 +70,6 @@ CoASTHeuristicsResultSetBuilder >> visitMethodNode: aRBMethodNode [
 	^ self
 		configureFetcherForNode: aRBMethodNode
 		usingHeuristicAvoidingRepetitions: self methodNodeHeuristic
-		narrowingWith: aRBMethodNode selector
 ]
 
 { #category : #visiting }
@@ -80,5 +78,4 @@ CoASTHeuristicsResultSetBuilder >> visitVariableNode: aRBVariableNode [
 	^ self
 		configureFetcherForNode: aRBVariableNode
 		usingHeuristicAvoidingRepetitions: self variablesHeuristic
-		narrowingWith: aRBVariableNode name
 ]
diff --git a/src/HeuristicCompletion-Model/CoASTResultSetBuilder.class.st b/src/HeuristicCompletion-Model/CoASTResultSetBuilder.class.st
@@ -37,38 +37,25 @@ CoASTResultSetBuilder >> configureEmptyFetcherForNode: aNode [
 	^ self
 		configureFetcher: CoEmptyFetcher new
 		forNode: aNode
-		narrowingWith: ''
 ]
 
 { #category : #'private-building' }
-CoASTResultSetBuilder >> configureFetcher: aFetcher forNode: aNode narrowingWith: aString [
+CoASTResultSetBuilder >> configureFetcher: aFetcher forNode: aNode [
 
 	| completion |
 	completion := CoResultSet fetcher: aFetcher.
-	completion filterWithString: aString.
+	completion filterWithString: completionContext completionToken.
 	^ completion
 ]
 
 { #category : #'private-building' }
-CoASTResultSetBuilder >> configureFetcherForNode: aNode usingHeuristic: heuristic narrowingWith: aString [
-
-	| fetcher |
-	fetcher := heuristic fetcherFor: aNode inContext: completionContext.
-	^ self
-		configureFetcher: fetcher
-		forNode: aNode
-		narrowingWith: aString
-]
-
-{ #category : #'private-building' }
-CoASTResultSetBuilder >> configureFetcherForNode: aNode usingHeuristicAvoidingRepetitions: heuristic narrowingWith: aString [
+CoASTResultSetBuilder >> configureFetcherForNode: aNode usingHeuristicAvoidingRepetitions: heuristic [
 
 	| fetcher |
 	fetcher := heuristic fetcherFor: aNode inContext: completionContext.
 	^ self
 		configureFetcher: fetcher withoutRepetition
 		forNode: aNode
-		narrowingWith: aString
 ]
 
 { #category : #accessing }

diff --git a/src/HeuristicCompletion-Model/CoCompletionContext.class.st b/src/HeuristicCompletion-Model/CoCompletionContext.class.st
@@ -89,7 +89,7 @@ CoCompletionContext >> completionEnvironment [
 { #category : #accessing }
 CoCompletionContext >> completionToken [
 
-	^ self completion completionToken
+	^ self engine completionToken
 ]
 
 { #category : #accessing }

diff --git a/src/HeuristicCompletion-Model/CoGlobalSorterResultSetBuilder.class.st b/src/HeuristicCompletion-Model/CoGlobalSorterResultSetBuilder.class.st
@@ -44,5 +44,4 @@ CoGlobalSorterResultSetBuilder >> visitNode: aNode [
 	^ self
 		configureFetcher: fetcher
 		forNode: aNode
-		narrowingWith: (aNode completionToken: completionContext position)
 ]
diff --git a/src/NECompletion-Morphic/CompletionEngine.class.st b/src/NECompletion-Morphic/CompletionEngine.class.st
@@ -53,6 +53,19 @@ CompletionEngine >> closeMenu [
 	menuMorph := nil.
 ]
 
+{ #category : #replacement }
+CompletionEngine >> completionToken [
+
+	"Return the word just before the caret"
+	^ (self editor text copyFrom: self completionTokenStart to: self editor caret - 1) asString
+]
+
+{ #category : #replacement }
+CompletionEngine >> completionTokenStart [
+	"This is the position in the editor where the completion token starts"
+	^ self editor previousWord: self editor caret - 1
+]
+
 { #category : #accessing }
 CompletionEngine >> context [
 	^context