minor changes on selecter

src/Album/AlbTextEditorNavigatorMoveToStartPreviousWordOperation.class.st

@@ -4,7 +4,7 @@ I move a cursor to the beginning of the current word when in the middle of a wor
 Class {
 	#name : #AlbTextEditorNavigatorMoveToStartPreviousWordOperation,
 	#superclass : #AlbTextEditorNavigatorOperation,
-	#category : 'Album-Model-Operators'
+	#category : #'Album-Model-Operators'
 }
 
 { #category : #matching }
@@ -13,5 +13,5 @@ AlbTextEditorNavigatorMoveToStartPreviousWordOperation >> performOn: aNavigator
 
 	aNavigator
 		privateRegisterForMove: self cursor
-		to: (aNavigator findWordStartBefore: self cursor position) 
+		to: (aNavigator findWordEnlargedStartBefore: self cursor position) 
 ]

src/Album/AlbTextEditorOperator.class.st

@@ -6,7 +6,7 @@ Class {
 		'subscriptions',
 		'context'
 	],
-	#category : 'Album-Model-Operators'
+	#category : #'Album-Model-Operators'
 }
 
 { #category : #'api - processing' }
@@ -310,7 +310,25 @@ AlbTextEditorOperator >> findWhitespaceOfLineBefore: aTextIndex [
 ]
 
 { #category : #private }
-AlbTextEditorOperator >> findWordAt: aTextIndex [
+AlbTextEditorOperator >> findWordEndAfter: aTextIndex [
+	"Find a text index of the end of the next word after a given text index"
+	| textIterator newPosition aText |
+
+	newPosition := aTextIndex.
+	aText := self text.
+
+	textIterator := aText iterator: (newPosition max: 1) to: aText size.
+	[ textIterator hasNext and: [ newPosition = aTextIndex ] ] whileTrue: [
+		| skip |
+		skip := textIterator peek isSeparator.
+		textIterator nextWord.
+		skip ifFalse: [ newPosition := textIterator position ] ].
+
+	^ newPosition
+]
+
+{ #category : #private }
+AlbTextEditorOperator >> findWordEnlargedIntervalAt: aTextIndex [ 
 	"Find a word text interval or a whitespace at a given text index"
 	<return: #Interval>
 	| aTextIterator hasWordToTheLeft hasWordToTheRight shouldBeWord aWordStart aWordEnd aDesiredType |
@@ -344,25 +362,7 @@ AlbTextEditorOperator >> findWordAt: aTextIndex [
 ]
 
 { #category : #private }
-AlbTextEditorOperator >> findWordEndAfter: aTextIndex [
-	"Find a text index of the end of the next word after a given text index"
-	| textIterator newPosition aText |
-
-	newPosition := aTextIndex.
-	aText := self text.
-
-	textIterator := aText iterator: (newPosition max: 1) to: aText size.
-	[ textIterator hasNext and: [ newPosition = aTextIndex ] ] whileTrue: [
-		| skip |
-		skip := textIterator peek isSeparator.
-		textIterator nextWord.
-		skip ifFalse: [ newPosition := textIterator position ] ].
-
-	^ newPosition
-]
-
-{ #category : #private }
-AlbTextEditorOperator >> findWordStartBefore: aTextIndex [
+AlbTextEditorOperator >> findWordEnlargedStartBefore: aTextIndex [
 	"Find a text index of start of the previous word before a given text index"
 	| newPosition aText |
 
@@ -377,6 +377,48 @@ AlbTextEditorOperator >> findWordStartBefore: aTextIndex [
 	^ newPosition
 ]
 
+{ #category : #private }
+AlbTextEditorOperator >> findWordIntervalAt: aTextIndex [ 
+	"Find a word text interval or a whitespace at a given text index"
+	<return: #Interval>
+	| aTextIterator hasWordToTheLeft hasWordToTheRight shouldBeWord aWordStart aWordEnd aDesiredType |
+
+	aTextIterator := self text iterator skip: aTextIndex.
+	hasWordToTheLeft := aTextIterator hasPrevious and: [ self isWordChar: aTextIterator peer ].
+	hasWordToTheRight := aTextIterator hasNext and: [ self isWordChar: aTextIterator peek ].
+	shouldBeWord := hasWordToTheLeft.
+
+	aWordStart := aTextIndex.
+	aWordEnd := aTextIndex.
+	shouldBeWord ifFalse: [ ^ aWordStart to: aWordEnd - 1 ].	
+	aTextIterator := self text iterator skip: aTextIndex.
+	aTextIterator hasPrevious ifTrue: [
+		aTextIterator
+			previousSegment: [ :eachCharacter | self characterType: eachCharacter ]
+			indicesDo: [ :aStart :anEnd :aType |
+				((aType = #word and: [ shouldBeWord ]) or: [ (aDesiredType isNil or: [ aType = aDesiredType ] ) ])
+					ifTrue: [ aWordStart := aStart ] ] ].
+
+	^ aWordStart to: aWordEnd
+]
+
+{ #category : #private }
+AlbTextEditorOperator >> findWordStartBefore: aTextIndex [
+	"Find a text index of start of the previous word before a given text index"
+
+	| newPosition aText |
+	aText := self text.
+	newPosition := aTextIndex - 1.
+	newPosition := newPosition max: 0.
+
+	[ newPosition = 0 or: [ (aText at: newPosition) isSeparator ] ]
+		whileFalse: [ newPosition := newPosition - 1 ].
+
+	^ newPosition = 0
+		  ifTrue: [ newPosition ]
+		  ifFalse: [ newPosition + 1 ]
+]
+
 { #category : #private }
 AlbTextEditorOperator >> hasSpaceAroundCursor: aCursor [
 	"Answer a boolean indicating whether the characters either side of the cursor are separators (or end of string)"

src/Album/AlbTextEditorSelecter.class.st

@@ -10,7 +10,7 @@ Class {
 		'shouldDeselectExisting',
 		'commands'
 	],
-	#category : 'Album-Model-Operators'
+	#category : #'Album-Model-Operators'
 }
 
 { #category : #'api - configuration' }
@@ -99,7 +99,7 @@ AlbTextEditorSelecter >> extendToPreviousWordStart [
 	theCommands := self cursors collect: [ :aCursor |
 		| aDelta |
 
-		aDelta := aCursor position - (self findWordStartBefore: aCursor position).
+		aDelta := aCursor position - (self findWordEnlargedStartBefore: aCursor position).
 		(self
 			privateExtendSelectionLeftAt: aCursor position
 			by: aDelta)
@@ -529,6 +529,6 @@ AlbTextEditorSelecter >> wordAt: aTextIndex [
 	"Select a word or a whitespace at a given text index"
 	| aWordInterval |
 
-	aWordInterval := self findWordAt: aTextIndex.
+	aWordInterval := self findWordEnlargedIntervalAt: aTextIndex.
 	self from: aWordInterval first to: aWordInterval last
 ]

src/Album/AlbTextInsertedEvent.class.st

@@ -5,7 +5,7 @@ Class {
 		'text',
 		'index'
 	],
-	#category : 'Album-Model-Events'
+	#category : #'Album-Model-Events'
 }
 
 { #category : #'instance creation' }
@@ -17,6 +17,12 @@ AlbTextInsertedEvent class >> text: aBlText at: anIndex [
 		index: anIndex
 ]
 
+{ #category : #accessing }
+AlbTextInsertedEvent >> endIndex [
+
+	^ self index + self text size
+]
+
 { #category : #accessing }
 AlbTextInsertedEvent >> index [
 	^ index