[squeak-dev] The Trunk: ST80-nice.265.mcz

commits at source.squeak.org commits at source.squeak.org
Tue Apr 13 00:05:20 UTC 2021


Nicolas Cellier uploaded a new version of ST80 to project The Trunk:
http://source.squeak.org/trunk/ST80-nice.265.mcz

==================== Summary ====================

Name: ST80-nice.265
Author: nice
Time: 13 April 2021, 2:05:18.555491 am
UUID: 1e580d8e-d2fc-4037-bf38-ec2f21c4db05
Ancestors: ST80-mt.264, ST80-ct.258, ST80-ct.255

Merge commit

ST80-mt.264:
	Work around the changes in Collections-nice.925 to make MVC work again. :-)

ST80-ct.258:
	Fixes home and end keys in MVC editors if the text is empty

ST80-ct.255:
	Fix Transcript in MVC projects if preference 'Force transcript updates to screen' is disabled.

=============== Diff against ST80-mt.264 ===============

Item was changed:
  ----- Method: ParagraphEditor>>cursorEnd: (in category 'nonediting/nontyping keys') -----
  cursorEnd: characterStream 
  
  	"Private - Move cursor end of current line."
  	| string |
  	self closeTypeIn: characterStream.
  	string := paragraph text string.
  	self
  		moveCursor:
  			[:position | Preferences wordStyleCursorMovement
+ 				ifTrue: [
+ 					paragraph lines	
+ 						at: (paragraph lineIndexOfCharacterIndex: position)
+ 						ifPresent: [:targetLine | targetLine last + (targetLine last = string size) asBit]
+ 						ifAbsent: [position]]
+ 				ifFalse: [
- 				ifTrue:[| targetLine |
- 					targetLine := paragraph lines at:(paragraph lineIndexOfCharacterIndex: position).
- 					targetLine = paragraph lines last
- 						ifTrue:[targetLine last + 1]
- 						ifFalse:[targetLine last]]
- 				ifFalse:[
  					string
  						indexOfAnyOf: CharacterSet crlf
  						startingAt: position
  						ifAbsent:[string size + 1]]]
  		forward: true
  		specialBlock:[:dummy | string size + 1].
  	^true!

Item was changed:
  ----- Method: ParagraphEditor>>cursorHome: (in category 'nonediting/nontyping keys') -----
  cursorHome: characterStream 
  
  	"Private - Move cursor from position in current line to beginning of
  	current line. If control key is pressed put cursor at beginning of text"
  
  	| string |
  
  	string := paragraph text string.
  	self
+ 		moveCursor: [:position | Preferences wordStyleCursorMovement
+ 				ifTrue: [
+ 					paragraph lines
+ 						at: (paragraph lineIndexOfCharacterIndex: position)
+ 						ifPresent: [:targetLine | targetLine first]								 						ifAbsent: [position]]
- 		moveCursor: [ :position | Preferences wordStyleCursorMovement
- 				ifTrue:[
- 					(paragraph lines at:(paragraph lineIndexOfCharacterIndex: position)) first]
  				ifFalse:[
  					(string
  						lastIndexOfAnyOf: CharacterSet crlf
  						startingAt: position - 1) + 1]]
  		forward: false
  		specialBlock: [:dummy | 1].
  	^true!

Item was changed:
  ----- Method: PluggableTextView>>update: (in category 'updating') -----
  update: aSymbol
  	"Refer to the comment in View|update:. Do nothing if the given symbol does not match any action. "
  
  	aSymbol == #wantToChange ifTrue:
  			[self canDiscardEdits ifFalse: [self promptForCancel].  ^ self].
  	aSymbol == #flash ifTrue: [^ controller flash].
  	aSymbol == getTextSelector ifTrue: [^ self updateDisplayContents].
  	aSymbol == getSelectionSelector ifTrue: [^ self setSelection: self getSelection].
  	aSymbol == #clearUserEdits ifTrue: [^ self hasUnacceptedEdits: false].
  	(aSymbol == #autoSelect and: [getSelectionSelector ~~ nil]) ifTrue:
  			[ParagraphEditor abandonChangeText.	"no replacement!!"
  			^ controller setSearch: model autoSelectString;
  					againOrSame: true].
+ 	(#(#appendEntry appendEntryLater) includes: aSymbol) ifTrue:
- 	aSymbol == #appendEntry ifTrue:
  			[^ controller doOccluded: [controller appendEntry]].
  	aSymbol == #clearText ifTrue:
  			[^ controller doOccluded:
  				[controller changeText: Text new]].
  	aSymbol == #bs ifTrue:
  			[^ controller doOccluded:
  				[controller bsText]].
  	aSymbol == #codeChangedElsewhere ifTrue:
  			[^ self hasEditingConflicts: true].
  	aSymbol == #saveContents ifTrue:
  			[^self controller saveContentsInFile].
  	aSymbol == #close ifTrue:
  			[^self topView controller closeAndUnscheduleNoTerminate].
  	aSymbol == #acceptChanges ifTrue:
  			[^ self controller accept].
  	aSymbol == #revertChanges ifTrue:
  			[^ self controller cancel].!



More information about the Squeak-dev mailing list