[Backport] Undo fixes p12

src/NECompletion-Morphic/CompletionEngine.class.st

@@ -338,7 +338,7 @@ CompletionEngine >> replaceTokenInEditorWith: aString [
 
 	The completion context uses this API to insert text into the text editor"
 
-	| newString wordEnd old doubleSpace wordStart |
+	| newString wordEnd doubleSpace wordStart oldSelectionInterval |
 
 	newString := aString.
 	wordStart := self completionTokenStart.
@@ -355,12 +355,12 @@ CompletionEngine >> replaceTokenInEditorWith: aString [
 	"If the returned index is the size of the text that means that the caret is at the end of the text and there is no more word after, so add 1 to the index to be out of range to select the entierely word because of the selectInvisiblyFrom:to: remove 1 just after to be at the end of then final word"
 	wordEnd > self editor text size ifTrue:[ wordEnd := wordEnd + 1 ].
 
+	oldSelectionInterval := self editor selectionInterval.
 	self editor
 		selectInvisiblyFrom: wordStart
 		to: wordEnd - 1.
-	old := self editor selection.
 
-	self editor replaceSelectionWith: newString.
+	self editor replaceSelectionWith: newString fromSelection: oldSelectionInterval.
 
 	doubleSpace := newString indexOfSubCollection: '  ' startingAt: 1 ifAbsent: [ newString size ].
 	self editor selectAt: wordStart + doubleSpace.

src/NECompletion-Tests/CompletionEngineTest.class.st

@@ -31,6 +31,12 @@ CompletionEngineTest >> editorTextWithCaret [
 	^ (source copyFrom: 1 to: editor caret-1), '|', (source copyFrom: editor caret to: source size)
 ]
 
+{ #category : 'helpers' }
+CompletionEngineTest >> expectText: aString [ 
+
+	self assert: editor text asString equals: aString
+]
+
 { #category : 'accessing' }
 CompletionEngineTest >> interactionModel [
 
@@ -995,3 +1001,47 @@ CompletionEngineTest >> testSmartQuoteSurroundsSelection [
 	controller smartCharacterWithEvent: (self keyboardPressFor: $').
 	self assert: editor text equals: ' ''text'' '
 ]
+
+{ #category : 'tests - undo' }
+CompletionEngineTest >> testUndoAutocompleteLeavesCursorInOriginalPosition [
+
+	"If the caret is at the end of a word, replace the entire word"
+	editor addString: 'self'.
+	editor closeTypeIn.
+	editor unselect.
+
+	"Put the cursor after the `sel` token, and then we will simulate code completion"
+	self selectAt: 'self' size - 1.
+
+	editor textArea openInWorld.
+	controller openMenu.
+
+	controller context replaceTokenInEditorWith: 'selection'.
+
+	editor undo.
+	self expectText: 'self'.
+	self assert: editor selectionInterval equals: (3 to: 2)
+]
+
+{ #category : 'tests - undo' }
+CompletionEngineTest >> testUndoCompletionEntryKeepsFollowingLine [
+
+	"If the caret is at the end of a word, replace the entire word"
+
+	| text |
+	text := 'self mEthOdThatDoes
+nextLine'.
+
+	self
+		setEditorText: text;
+		selectAt: text lines first size.
+
+	editor textArea openInWorld.
+	controller openMenu.
+
+	controller context replaceTokenInEditorWith: 'mEthOdThatDoesNotExist'.
+
+	editor undo.
+
+	self assert: editor text asString equals: text
+]

src/Rubric-Tests/RubAbstractTest.class.st

@@ -0,0 +1,20 @@
+Class {
+	#name : 'RubAbstractTest',
+	#superclass : 'TestCase',
+	#instVars : [
+		'string',
+		'editor'
+	],
+	#category : 'Rubric-Tests-Editing-Core',
+	#package : 'Rubric-Tests',
+	#tag : 'Editing-Core'
+}
+
+{ #category : 'running' }
+RubAbstractTest >> setUp [
+
+	super setUp.
+	editor := RubTextEditor forTextArea: RubEditingArea new.
+	"Add text with a paragraph"
+	string := 'Lorem ipsum '
+]

src/Rubric-Tests/RubTextEditorLocalHistoryTest.class.st

@@ -0,0 +1,87 @@
+Class {
+	#name : 'RubTextEditorLocalHistoryTest',
+	#superclass : 'RubAbstractTest',
+	#category : 'Rubric-Tests-Editing-Core',
+	#package : 'Rubric-Tests',
+	#tag : 'Editing-Core'
+}
+
+{ #category : 'tests - undo' }
+RubTextEditorLocalHistoryTest >> expectText: aString [ 
+
+	self assert: editor text asString equals: aString
+]
+
+{ #category : 'tests - undo' }
+RubTextEditorLocalHistoryTest >> selectAt: anIndex [
+	editor selectFrom: anIndex to: anIndex - 1
+]
+
+{ #category : 'tests - undo' }
+RubTextEditorLocalHistoryTest >> testRedoCompletionEntryKeepsFollowingLine [
+
+	"If the caret is at the end of a word, replace the entire word"
+	editor addString: 'self'.
+	editor closeTypeIn.
+	editor unselect.
+	"Simulate an enter"
+	editor crWithIndent: KeyboardEvent new.
+	editor addString: '	b'.
+	editor closeTypeIn.
+	editor unselect.
+
+	"Put the cursor after the `self` token, and then we will simulate code completion"
+	self selectAt: 'self' size + 1.
+	editor addString: ' te'.
+	editor closeTypeIn.
+
+	self expectText: 'self te
+	b'.
+
+	editor undo.
+	self expectText: 'self
+	b'.
+
+	editor redo.
+	self expectText: 'self te
+	b'.
+]
+
+{ #category : 'tests - undo' }
+RubTextEditorLocalHistoryTest >> testRedoLeavesCursorInOriginalPosition [
+
+	"If the caret is at the end of a word, replace the entire word"
+	editor addString: 'self'.
+	editor unselect.
+	editor undo.
+	editor redo.
+
+	self expectText: 'self'.
+	self assert: editor selectionInterval equals: (5 to: 4)
+]
+
+{ #category : 'tests - undo' }
+RubTextEditorLocalHistoryTest >> testUndoAfterTypeThenTabUndoesOnlyTheTab [
+
+	editor addString: 'self'.
+	editor unselect.
+	editor tab: KeyboardEvent new.
+
+	editor undo.
+
+	self expectText: 'self'
+]
+
+{ #category : 'tests - undo' }
+RubTextEditorLocalHistoryTest >> testUndoWordUndoesOneWordAtATime [
+
+	editor addString: 'self'.
+	editor unselect.
+	editor space: KeyboardEvent new.
+
+	editor addString: 'toto'.
+
+	editor undo.
+
+	self expectText: 'self'
+]

src/Rubric-Tests/RubTextEditorTest.class.st

@@ -3,11 +3,7 @@ A RubTextEditorTest is a test class for testing the behavior of RubTextEditor
 "
 Class {
 	#name : 'RubTextEditorTest',
-	#superclass : 'TestCase',
-	#instVars : [
-		'editor',
-		'string'
-	],
+	#superclass : 'RubAbstractTest',
 	#category : 'Rubric-Tests-Editing-Core',
 	#package : 'Rubric-Tests',
 	#tag : 'Editing-Core'

src/Rubric/RubAbstractTextArea.class.st

@@ -1744,7 +1744,13 @@ RubAbstractTextArea >> recomputeSelection [
 
 { #category : 'multi level undo' }
 RubAbstractTextArea >> redoTypeIn: aText interval: anInterval [
-	self handleEdit: [self editor redoTypeIn: aText interval: anInterval]
+
+	^ self redoTypeIn: aText interval: anInterval selection: anInterval
+]
+
+{ #category : 'multi level undo' }
+RubAbstractTextArea >> redoTypeIn: aText interval: anInterval selection: selection [
+	self handleEdit: [self editor redoTypeIn: aText interval: anInterval selection: selection]
 ]
 
 { #category : 'caching' }
@@ -2105,7 +2111,13 @@ RubAbstractTextArea >> undoRedoExchange: aninterval with: anotherInterval [
 
 { #category : 'multi level undo' }
 RubAbstractTextArea >> undoTypeIn: aText interval: anInterval [
-	self handleEdit: [self editor undoTypeIn: aText interval: anInterval]
+
+	^ self undoTypeIn: aText interval: anInterval selection: anInterval
+]
+
+{ #category : 'multi level undo' }
+RubAbstractTextArea >> undoTypeIn: aText interval: anInterval selection: aSelection [
+	self handleEdit: [self editor undoTypeIn: aText interval: anInterval selection: aSelection]
 ]
 
 { #category : 'private' }