Merge branch 'Pharo13' into helping-to-test-refactorings

Author: tesonep

src/NECompletion/CompletionSorter.class.st

@@ -21,7 +21,7 @@ CompletionSorter class >> kind [
 
 { #category : 'tools registry' }
 CompletionSorter class >> register [
-	CompletionContext sorterClass: SizeSorter
+	CompletionContext sorterClass: NoSorter
 ]
 
 { #category : 'accessing' }

src/Rubric-Tests/RubTextEditorLocalHistoryTest.class.st

@@ -60,6 +60,46 @@ RubTextEditorLocalHistoryTest >> testRedoLeavesCursorInOriginalPosition [
 	self assert: editor selectionInterval equals: (5 to: 4)
 ]
 
+{ #category : 'tests - undo' }
+RubTextEditorLocalHistoryTest >> testUndoAfterFormatShouldRestoreOriginalCode [
+
+	editor textArea beForSmalltalkCode.
+
+	"Insert the start of the text and commit the transaction"
+	editor addString: 'method (to be formatted; but) maybe not nice'.
+	editor closeTypeIn.
+
+	"let's replace the to be formatted by a shorter sequence.
+	Do not commit the transaction here, simulating a text edition by a user.
+	When the transaction is committed, two entries will get created:
+	 - an entry with the removal of the selection
+	 - an entry with the addition of the new text in that place"
+	editor selectFrom: 'method (to ' size + 1 to: 'method (to be formatted' size.
+	editor addString: 'format'.
+	
+	"Unselect and format. This should not break the undo buffer"
+	editor unselect.
+	editor textArea formatMethodCode.
+
+	self expectText: 'method
+
+	(to
+		 format;
+		 but) maybe not nice'.
+
+	"Undo the format"	
+	editor undo.
+	self expectText: 'method (to format; but) maybe not nice'.	
+	
+	"Undo the addition of new text"
+	editor undo.
+	self expectText: 'method (to ; but) maybe not nice'.
+	
+	"Undo the removal"
+	editor undo.
+	self expectText: 'method (to be formatted; but) maybe not nice'
+]
+
 { #category : 'tests - undo' }
 RubTextEditorLocalHistoryTest >> testUndoAfterTypeThenTabUndoesOnlyTheTab [
 

src/Rubric/RubSmalltalkCodeMode.class.st

@@ -164,6 +164,7 @@ RubSmalltalkCodeMode >> classOrMetaClass: aBehavior [
 RubSmalltalkCodeMode >> formatMethodCode [
 
 	| source tree formatted |
+	self editor closeTypeIn.
 	self textArea hasSelection
 		ifTrue: [
 			source := self textArea selection.

src/Rubric/RubSmalltalkEditor.class.st

@@ -717,11 +717,6 @@ RubSmalltalkEditor >> findValidKeywordIn: sourceCode at: locationIndex ifFound:
 	validLocation ifTrue: aBlock
 ]
 
-{ #category : 'do-its' }
-RubSmalltalkEditor >> format [
-	self model formatSourceCodeInView
-]
-
 { #category : 'do-its' }
 RubSmalltalkEditor >> highlightEvaluateAndDo: aBlock [
 	"Treat the current selection as an expression; evaluate it and invoke aBlock with the result."