Activate smart characters even when in completion position

+ Tests
pharo-project · Mar 4, 2021 · 74ee127 · 74ee127
1 parent dd0cee6
commit 74ee127
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/NECompletion-Morphic/CompletionEngine.class.st b/src/NECompletion-Morphic/CompletionEngine.class.st
@@ -187,8 +187,8 @@ CompletionEngine >> handleKeystrokeBefore: aKeyboardEvent editor: anEditor [
 	keyCharacter := aKeyboardEvent keyCharacter.
 	controlKeyPressed := aKeyboardEvent controlKeyPressed.
 
-	self editor atCompletionPosition ifFalse: [ 
-		^ (self smartInputWithEvent: aKeyboardEvent ) notNil ].	
+	(self smartInputWithEvent: aKeyboardEvent )
+		ifNotNil: [ ^ true ].
 
 	self isMenuOpen
 		ifFalse: [ ^ self handleKeystrokeWithoutMenu: aKeyboardEvent ].

diff --git a/src/NECompletion-Tests/CompletionEngineTest.class.st b/src/NECompletion-Tests/CompletionEngineTest.class.st
@@ -243,6 +243,16 @@ CompletionEngineTest >> testSmartBackspaceWithSelection [
 
 ]
 
+{ #category : #'tests-keyboard' }
+CompletionEngineTest >> testSmartCharacterAfterEspace [
+	"Test we surround selected text with smart characters properly"
+	self
+		setEditorText: 'a b';
+		selectFrom: 2 to: 4.
+	editor keystroke: (self keyboardPressFor: $").
+	self assert: editor text equals: 'a" b"'.
+]
+
 { #category : #'tests-keyboard' }
 CompletionEngineTest >> testSmartCharacterPairForIfAbsent [