hg/stx-libwidg: comparison ETxtView.st

equal deleted inserted replaced

-:53cbfeaa9c9a
+:3ee5ea99d0e2
 'From Smalltalk/X, Version:2.10.5 on 14-mar-1995 at 11:12:00 am'!
 TextView subclass:#EditTextView
 	 instanceVariableNames:'cursorLine cursorVisibleLine cursorCol cursorShown
-prevCursorState readOnly modified fixedSize exceptionBlock
+		prevCursorState readOnly modified fixedSize exceptionBlock
-errorMessage cursorFgColor cursorBgColor cursorType undoAction
+		errorMessage cursorFgColor cursorBgColor cursorType undoAction
-typeOfSelection lastString lastReplacement lastAction replacing
+		typeOfSelection lastString lastReplacement lastAction replacing
-showMatchingParenthesis hasKeyboardFocus'
+		showMatchingParenthesis hasKeyboardFocus'
 	 classVariableNames:'DefaultCursorForegroundColor DefaultCursorBackgroundColor
-DefaultCursorType'
+		DefaultCursorType'
 	 poolDictionaries:''
 	 category:'Views-Text'
 !
 EditTextView comment:'
 COPYRIGHT (c) 1989 by Claus Gittinger
 	    All Rights Reserved
-$Header: /cvs/stx/stx/libwidg/Attic/ETxtView.st,v 1.23 1995-03-18 05:14:09 claus Exp $
+$Header: /cvs/stx/stx/libwidg/Attic/ETxtView.st,v 1.24 1995-05-03 00:29:07 claus Exp $
 '!
 !EditTextView class methodsFor:'documentation'!
 copyright
 "
 !
 version
 "
-$Header: /cvs/stx/stx/libwidg/Attic/ETxtView.st,v 1.23 1995-03-18 05:14:09 claus Exp $
+$Header: /cvs/stx/stx/libwidg/Attic/ETxtView.st,v 1.24 1995-05-03 00:29:07 claus Exp $
 "
 !
 documentation
 "
 "insert a single character at lineNr/colNr"
 |line lineSize newLine drawCharacterOnly|
 readOnly ifTrue: [
-exceptionBlock value:errorMessage.
+	exceptionBlock value:errorMessage.
-^ self
+	^ self
 ].
 aCharacter == (Character cr) ifTrue:[
-self splitLine:lineNr before:colNr.
+	self splitLine:lineNr before:colNr.
-^ self
+	^ self
 ].
 drawCharacterOnly := false.
 self checkForExistingLine:lineNr.
 line := list at:lineNr.
 lineSize := line size.
 (aCharacter == Character space) ifTrue:[
-(colNr > lineSize)  ifTrue:[
+	(colNr > lineSize)  ifTrue:[
-^ self
+	    ^ self
-]
+	]
 ].
 (lineSize == 0) ifTrue: [
-newLine := String new:colNr.
+	newLine := String new:colNr.
-drawCharacterOnly := true
+	drawCharacterOnly := true
 ] ifFalse: [
-(colNr > lineSize) ifTrue: [
+	(colNr > lineSize) ifTrue: [
-newLine := String new:colNr.
+	    newLine := String new:colNr.
-newLine replaceFrom:1 to:lineSize
+	    newLine replaceFrom:1 to:lineSize
-with:line startingAt:1.
+			   with:line startingAt:1.
-drawCharacterOnly := true
+	    drawCharacterOnly := true
-] ifFalse: [
+	] ifFalse: [
-newLine := String new:(lineSize + 1).
+	    newLine := String new:(lineSize + 1).
-newLine replaceFrom:1 to:(colNr - 1)
+	    newLine replaceFrom:1 to:(colNr - 1)
-with:line startingAt:1.
+			   with:line startingAt:1.
-newLine replaceFrom:(colNr + 1) to:(lineSize + 1)
+	    newLine replaceFrom:(colNr + 1) to:(lineSize + 1)
-with:line startingAt:colNr
+			   with:line startingAt:colNr
-]
+	]
 ].
 newLine at:colNr put:aCharacter.
 aCharacter == (Character tab) ifTrue:[
-newLine := self withTabsExpanded:newLine.
+	newLine := self withTabsExpanded:newLine.
-drawCharacterOnly := false
+	drawCharacterOnly := false
 ].
 list at:lineNr put:newLine.
+widthOfWidestLine notNil ifTrue:[
+	widthOfWidestLine := widthOfWidestLine max:(self widthOfLineString:line).
+].
 self textChanged.
 shown ifTrue:[
-drawCharacterOnly ifTrue:[
+	drawCharacterOnly ifTrue:[
-self redrawLine:lineNr col:colNr
+	    self redrawLine:lineNr col:colNr
-] ifFalse:[
+	] ifFalse:[
-self redrawLine:lineNr from:colNr
+	    self redrawLine:lineNr from:colNr
-]
+	]
 ]
 !
 withoutRedrawInsertStringWithoutCRs:aString atLine:lineNr col:colNr
 "insert aString (which has no crs) at lineNr/colNr"
 |strLen line lineSize newLine|
 aString isNil ifTrue:[^ self].
 readOnly ifTrue: [
-exceptionBlock value:errorMessage.
+	exceptionBlock value:errorMessage.
-^ self
+	^ self
 ].
 strLen := aString size.
 self checkForExistingLine:lineNr.
 line := list at:lineNr.
 line notNil ifTrue:[
-lineSize := line size
+	lineSize := line size
 ] ifFalse:[
-lineSize := 0
+	lineSize := 0
 ].
 ((colNr == 1) and:[lineSize == 0]) ifTrue: [
-newLine := aString
+	newLine := aString
 ] ifFalse:[
-(lineSize == 0) ifTrue: [
+	(lineSize == 0) ifTrue: [
-newLine := String new:(colNr + strLen - 1)
+	    newLine := String new:(colNr + strLen - 1)
-] ifFalse: [
+	] ifFalse: [
-(colNr > lineSize) ifTrue: [
+	    (colNr > lineSize) ifTrue: [
-newLine := String new:(colNr + strLen - 1).
+		newLine := String new:(colNr + strLen - 1).
-newLine replaceFrom:1 to:lineSize
+		newLine replaceFrom:1 to:lineSize
-with:line startingAt:1
+			       with:line startingAt:1
-] ifFalse: [
+	    ] ifFalse: [
-newLine := String new:(lineSize + strLen).
+		newLine := String new:(lineSize + strLen).
-newLine replaceFrom:1 to:(colNr - 1)
+		newLine replaceFrom:1 to:(colNr - 1)
-with:line startingAt:1.
+			       with:line startingAt:1.
-newLine replaceFrom:(colNr + strLen) to:(lineSize + strLen)
+		newLine replaceFrom:(colNr + strLen) to:(lineSize + strLen)
-with:line startingAt:colNr
+			       with:line startingAt:colNr
-]
+	    ]
-].
+	].
-newLine replaceFrom:colNr to:(colNr + strLen - 1)
+	newLine replaceFrom:colNr to:(colNr + strLen - 1)
-with:aString startingAt:1
+		       with:aString startingAt:1
 ].
 (aString occurrencesOf:(Character tab)) == 0 ifFalse:[
-newLine := self withTabsExpanded:newLine
+	newLine := self withTabsExpanded:newLine
 ].
 list at:lineNr put:newLine.
+widthOfWidestLine notNil ifTrue:[
+	widthOfWidestLine := widthOfWidestLine max:(self widthOfLineString:newLine).
+].
 self textChanged.
 !
 splitLine:lineNr before:colNr
 "split the line linNr before colNr; the right part (from colNr)
 is cut off and inserted after lineNr; the view is redrawn"
 |line lineSize leftRest rightRest visLine w
 srcY    "{ Class: SmallInteger }" |
 list isNil ifFalse:[
-lineNr > (list size) ifFalse:[
+	lineNr > (list size) ifFalse:[
-(colNr == 1) ifTrue:[
+	    (colNr == 1) ifTrue:[
-self insertLine:nil before:lineNr.
+		self insertLine:nil before:lineNr.
-^ self
+		^ self
-].
+	    ].
-line := list at:lineNr.
+	    line := list at:lineNr.
-line isNil ifFalse:[
+	    line isNil ifFalse:[
-lineSize := line size.
+		lineSize := line size.
-(colNr <= lineSize) ifTrue:[
+		(colNr <= lineSize) ifTrue:[
-rightRest := line copyFrom:colNr to:lineSize.
+		    rightRest := line copyFrom:colNr to:lineSize.
-(colNr > 1) ifTrue:[
+		    (colNr > 1) ifTrue:[
-leftRest := line copyTo:(colNr - 1)
+			leftRest := line copyTo:(colNr - 1)
-]
+		    ]
-] ifFalse:[
+		] ifFalse:[
-leftRest := line
+		    leftRest := line
-]
+		]
-].
+	    ].
-leftRest notNil ifTrue:[
+	    leftRest notNil ifTrue:[
-leftRest isBlank ifTrue:[leftRest := nil]
+		leftRest isBlank ifTrue:[leftRest := nil]
-].
+	    ].
-list at:lineNr put:leftRest.
+	    list at:lineNr put:leftRest.
-self withoutRedrawInsertLine:rightRest before:(lineNr + 1).
+	    self withoutRedrawInsertLine:rightRest before:(lineNr + 1).
-visLine := self listLineToVisibleLine:(lineNr).
+	    visLine := self listLineToVisibleLine:(lineNr).
-visLine notNil ifTrue:[
+	    visLine notNil ifTrue:[
-w := self widthForScrollBetween:lineNr
+		w := self widthForScrollBetween:lineNr
-and:(firstLineShown + nLinesShown).
+					    and:(firstLineShown + nLinesShown).
-srcY := topMargin + (visLine * fontHeight).
+		srcY := topMargin + (visLine * fontHeight).
-self catchExpose.
+		self catchExpose.
-self copyFrom:self x:textStartLeft y:srcY
+		self copyFrom:self x:textStartLeft y:srcY
-toX:textStartLeft y:(srcY + fontHeight)
+				 toX:textStartLeft y:(srcY + fontHeight)
-width:w
+			       width:w
-height:((nLinesShown - visLine - 1) * fontHeight).
+			      height:((nLinesShown - visLine - 1) * fontHeight).
-self redrawLine:lineNr.
+		self redrawLine:lineNr.
-self redrawLine:(lineNr + 1).
+		self redrawLine:(lineNr + 1).
-self waitForExpose
+		self waitForExpose
-].
+	    ].
-self textChanged.
+	    widthOfWidestLine := nil. "/ unknown
-]
+	    self textChanged.
+	]
 ]
 !
 withoutRedrawInsertLine:aString before:lineNr
 "insert the argument, aString before line lineNr; the string
 |visLine w nLines "{ Class: SmallInteger }"
 srcY "{ Class: SmallInteger }"
 dstY "{ Class: SmallInteger }" |
 readOnly ifTrue:[
-^ self
+	^ self
 ].
 visLine := self listLineToVisibleLine:lineNr.
 (shown not or:[visLine isNil]) ifTrue:[
-self withoutRedrawInsertLines:someText
+	self withoutRedrawInsertLines:someText
-from:start to:end
+				 from:start to:end
-before:lineNr.
+			       before:lineNr.
-self textChanged.
-^ self
-].
-nLines := end - start + 1.
-((visLine + nLines) >= nLinesShown) ifTrue:[
-self withoutRedrawInsertLines:someText
-from:start to:end
-before:lineNr.
-self redrawFromVisibleLine:visLine to:nLinesShown
 ] ifFalse:[
-w := self widthForScrollBetween:(lineNr + nLines)
+	nLines := end - start + 1.
-and:(firstLineShown + nLines + nLinesShown).
+	((visLine + nLines) >= nLinesShown) ifTrue:[
-srcY := topMargin + ((visLine - 1) * fontHeight).
+	    self withoutRedrawInsertLines:someText
-dstY := srcY + (nLines * fontHeight).
+				     from:start to:end
-"
+				   before:lineNr.
-stupid: must catchExpose before inserting new
+	    self redrawFromVisibleLine:visLine to:nLinesShown
-stuff - since catchExpose may perform redraws
+	] ifFalse:[
-"
+	    w := self widthForScrollBetween:(lineNr + nLines)
-self catchExpose.
+					and:(firstLineShown + nLines + nLinesShown).
-self withoutRedrawInsertLines:someText
+	    srcY := topMargin + ((visLine - 1) * fontHeight).
-from:start to:end
+	    dstY := srcY + (nLines * fontHeight).
-before:lineNr.
+	    "
-self copyFrom:self x:textStartLeft y:srcY
+	     stupid: must catchExpose before inserting new
-toX:textStartLeft y:dstY
+	     stuff - since catchExpose may perform redraws
-width:w
+	    "
-height:(height - dstY).
+	    self catchExpose.
-self redrawFromVisibleLine:visLine to:(visLine + nLines - 1).
+	    self withoutRedrawInsertLines:someText
-self waitForExpose
+				     from:start to:end
+				   before:lineNr.
+	    self copyFrom:self x:textStartLeft y:srcY
+			     toX:textStartLeft y:dstY
+			   width:w
+			  height:(height - dstY).
+	    self redrawFromVisibleLine:visLine to:(visLine + nLines - 1).
+	    self waitForExpose
+	].
+].
+widthOfWidestLine notNil ifTrue:[
+	someText do:[:line |
+	    widthOfWidestLine := widthOfWidestLine max:(self widthOfLineString:line).
+	]
 ].
 self textChanged.
 !
 deleteFromLine:startLine col:startCol toLine:endLine col:endCol
 joining lines if nescessary"
 |line lineSize|
 readOnly ifTrue: [
-exceptionBlock value:errorMessage.
+	exceptionBlock value:errorMessage.
-^ self
+	^ self
 ].
 list isNil ifTrue:[^ self].
 (startLine == endLine) ifTrue:[
-"delete chars within a line"
+	"delete chars within a line"
-self deleteCharsAtLine:startLine fromCol:startCol toCol:endCol.
+	self deleteCharsAtLine:startLine fromCol:startCol toCol:endCol.
-^ self
+	^ self
 ].
 ((startCol == 1) and:[endCol == 0]) ifTrue:[
-"delete full lines only"
+	"delete full lines only"
-endLine > startLine ifTrue:[
+	endLine > startLine ifTrue:[
-self deleteFromLine:startLine toLine:(endLine - 1)
+	    self deleteFromLine:startLine toLine:(endLine - 1)
-].
+	].
-^ self
+	^ self
 ].
 "delete right rest of 1st line"
 self deleteCharsAtLine:startLine fromCol:startCol.
 "delete the inner lines ..."
 endLine > (startLine + 1) ifTrue:[
-self deleteFromLine:(startLine + 1) toLine:(endLine - 1)
+	self deleteFromLine:(startLine + 1) toLine:(endLine - 1)
 ].
 (endCol ~~ 0) ifTrue:[
-"delete the left rest of the last line"
+	"delete the left rest of the last line"
-self deleteCharsAtLine:(startLine + 1) toCol:endCol.
+	self deleteCharsAtLine:(startLine + 1) toCol:endCol.
-"must add blanks, if startCal lies behond end of startLine"
+	"must add blanks, if startCal lies behond end of startLine"
-line := list at:startLine.
+	line := list at:startLine.
-lineSize := line size.
+	lineSize := line size.
-(startCol > lineSize) ifTrue:[
+	(startCol > lineSize) ifTrue:[
-line isNil ifTrue:[
+	    line isNil ifTrue:[
-line := String new:(startCol - 1)
+		line := String new:(startCol - 1)
-] ifFalse:[
+	    ] ifFalse:[
-line := line , (String new:(startCol - 1 - lineSize))
+		line := line , (String new:(startCol - 1 - lineSize))
-].
+	    ].
-list at:startLine put:line.
+	    list at:startLine put:line.
-self textChanged.
+	    widthOfWidestLine := nil. "/ i.e. unknown
-]
+	    self textChanged.
+	]
 ].
 "merge the left rest of 1st line with right rest of last line into one"
 self mergeLine:startLine
 !
 "
 list replaceFrom:(lineNr + nLines) to:(list size) with:list startingAt:lineNr.
 list replaceFrom:lineNr to:(lineNr + nLines - 1) with:newLines startingAt:start.
 !
-deleteCharsAtLine:lineNr fromCol:startCol toCol:endCol
-"delete characters from startCol to endCol in line lineNr"
-|line lineSize newLine|
-readOnly ifTrue: [
-exceptionBlock value:errorMessage.
-^ self
-].
-list isNil ifTrue: [^self].
-(list size < lineNr) ifTrue: [^ self].
-line := list at:lineNr.
-line isNil ifTrue: [^self].
-lineSize := line size.
-(startCol > lineSize) ifTrue: [^ self].
-(endCol == 0) ifTrue:[^ self].
-(endCol < startCol) ifTrue:[^ self].
-(startCol == endCol) ifTrue:[
-self deleteCharAtLine:lineNr col:startCol.
-^ self
-].
-(endCol >= lineSize) ifTrue:[
-self deleteCharsAtLine:lineNr fromCol:startCol.
-^ self
-].
-(startCol <= 1) ifTrue:[
-self deleteCharsAtLine:lineNr toCol:endCol.
-^ self
-].
-newLine := (line copyTo:(startCol - 1))
-, (line copyFrom:(endCol + 1) to:lineSize).
-newLine isBlank ifTrue:[
-newLine := nil
-].
-list at:lineNr put:newLine.
-self textChanged.
-self redrawLine:lineNr
-!
 insertStringWithoutCRs:aString atLine:lineNr col:colNr
 "insert aString (which has no crs) at lineNr/colNr"
 self withoutRedrawInsertStringWithoutCRs:aString atLine:lineNr col:colNr.
 shown ifTrue:[self redrawLine:lineNr from:colNr]
 	].
 	self makeCursorVisible
 ]
 !
-deleteFromLine:startLineNr toLine:endLineNr
-"delete some lines"
-readOnly ifTrue: [
-exceptionBlock value:errorMessage.
-^ self
-].
-list isNil ifTrue:[^ self].
-list removeFromIndex:startLineNr toIndex:endLineNr.
-self textChanged.
-self redrawFromLine:startLineNr.
-(firstLineShown >= list size) ifTrue:[
-self makeLineVisible:(list size)
-]
-!
 insertLine:aString before:lineNr
 "insert the line aString before line lineNr"
 |visLine w
 dstY "{ Class: SmallInteger }" |
 visLine := self listLineToVisibleLine:lineNr.
 (shown not or:[visLine isNil]) ifTrue:[
-self withoutRedrawInsertLine:aString before:lineNr.
+	self withoutRedrawInsertLine:aString before:lineNr.
 ] ifFalse:[
-w := self widthForScrollBetween:lineNr
+	w := self widthForScrollBetween:lineNr
-and:(firstLineShown + nLinesShown).
+				    and:(firstLineShown + nLinesShown).
-dstY := topMargin + ((visLine ) * fontHeight).
+	dstY := topMargin + ((visLine ) * fontHeight).
-self catchExpose.
+	self catchExpose.
-self withoutRedrawInsertLine:aString before:lineNr.
+	self withoutRedrawInsertLine:aString before:lineNr.
-self copyFrom:self x:textStartLeft y:(dstY - fontHeight)
+	self copyFrom:self x:textStartLeft y:(dstY - fontHeight)
-toX:textStartLeft y:dstY
+			 toX:textStartLeft y:dstY
-width:w
+		       width:w
-height:((nLinesShown - visLine "- 1") * fontHeight).
+		      height:((nLinesShown - visLine "- 1") * fontHeight).
-self redrawVisibleLine:visLine.
+	self redrawVisibleLine:visLine.
-self waitForExpose.
+	self waitForExpose.
+].
+widthOfWidestLine notNil ifTrue:[
+	widthOfWidestLine := widthOfWidestLine max:(self widthOfLineString:aString).
 ].
 self textChanged.
 !
 mergeLine:lineNr
 self insertStringAtCursor:aString.
 self selectFromLine:startLine col:startCol
 		 toLine:cursorLine col:(cursorCol - 1)
 !
+deleteCharsAtLine:lineNr fromCol:startCol toCol:endCol
+"delete characters from startCol to endCol in line lineNr"
+|line lineSize newLine|
+readOnly ifTrue: [
+	exceptionBlock value:errorMessage.
+	^ self
+].
+list isNil ifTrue: [^self].
+(list size < lineNr) ifTrue: [^ self].
+line := list at:lineNr.
+line isNil ifTrue: [^self].
+lineSize := line size.
+(startCol > lineSize) ifTrue: [^ self].
+(endCol == 0) ifTrue:[^ self].
+(endCol < startCol) ifTrue:[^ self].
+(startCol == endCol) ifTrue:[
+	self deleteCharAtLine:lineNr col:startCol.
+	^ self
+].
+(endCol >= lineSize) ifTrue:[
+	self deleteCharsAtLine:lineNr fromCol:startCol.
+	^ self
+].
+(startCol <= 1) ifTrue:[
+	self deleteCharsAtLine:lineNr toCol:endCol.
+	^ self
+].
+newLine := (line copyTo:(startCol - 1))
+	       , (line copyFrom:(endCol + 1) to:lineSize).
+newLine isBlank ifTrue:[
+	newLine := nil
+].
+list at:lineNr put:newLine.
+widthOfWidestLine := nil. "/ i.e. unknown
+self textChanged.
+self redrawLine:lineNr
+!
 deleteCharAtLine:lineNr col:colNr
 "delete single character at colNr in line lineNr"
-|line lineSize newLine drawCharacterOnly|
+|line lineSize newLine drawCharacterOnly wasLargest|
 readOnly ifTrue: [
-exceptionBlock value:errorMessage.
+	exceptionBlock value:errorMessage.
-^ self
+	^ self
 ].
 list isNil ifTrue: [^self].
 (list size < lineNr) ifTrue: [^ self].
 line := list at:lineNr.
 line isNil ifTrue: [^self].
 lineSize := line size.
 (colNr > lineSize) ifTrue: [^ self].
+wasLargest := (self widthOfLineString:line) == widthOfWidestLine.
 drawCharacterOnly := false.
 (colNr == lineSize) ifTrue:[
-newLine := line copyTo:(lineSize - 1).
+	newLine := line copyTo:(lineSize - 1).
-fontIsFixedWidth ifTrue:[
+	fontIsFixedWidth ifTrue:[
-drawCharacterOnly := true
+	    drawCharacterOnly := true
-]
+	]
 ] ifFalse:[
-newLine := String new:(lineSize - 1).
+	newLine := String new:(lineSize - 1).
-newLine replaceFrom:1 to:(colNr - 1)
+	newLine replaceFrom:1 to:(colNr - 1)
-with:line startingAt:1.
+		       with:line startingAt:1.
-newLine replaceFrom:colNr to:(lineSize - 1)
+	newLine replaceFrom:colNr to:(lineSize - 1)
-with:line startingAt:(colNr + 1)
+		       with:line startingAt:(colNr + 1)
 ].
 newLine isBlank ifTrue:[
-newLine := nil
+	newLine := nil
 ].
 list at:lineNr put:newLine.
+wasLargest ifTrue:[
+	widthOfWidestLine := nil. "/ i.e. unknown
+].
 self textChanged.
 drawCharacterOnly ifTrue:[
-self redrawLine:lineNr col:colNr
+	self redrawLine:lineNr col:colNr
 ] ifFalse:[
-self redrawLine:lineNr from:colNr
+	self redrawLine:lineNr from:colNr
 ]
 !
 removeTrailingBlankLines
 "remove all blank lines at end of text"
 line finished|
 lastLine := list size.
 finished := false.
 [finished] whileFalse:[
-(lastLine <= 1) ifTrue:[
+	(lastLine <= 1) ifTrue:[
-finished := true
+	    finished := true
-] ifFalse:[
+	] ifFalse:[
-line := list at:lastLine.
+	    line := list at:lastLine.
-line notNil ifTrue:[
+	    line notNil ifTrue:[
-line isBlank ifTrue:[
+		line isBlank ifTrue:[
-list at:lastLine put:nil.
+		    list at:lastLine put:nil.
-line := nil
+		    line := nil
-]
+		]
-].
+	    ].
-line notNil ifTrue:[
+	    line notNil ifTrue:[
-finished := true
+		finished := true
-] ifFalse:[
+	    ] ifFalse:[
-lastLine := lastLine - 1
+		lastLine := lastLine - 1
-]
+	    ]
-]
+	]
 ].
 (lastLine ~~ list size) ifTrue:[
-list grow:lastLine.
+	list grow:lastLine.
 "/        self textChanged
 ]
 !
 deleteCharsAtLine:lineNr toCol:colNr
 "delete characters from start up to colNr in line lineNr"
 |line lineSize newLine|
 readOnly ifTrue: [
-exceptionBlock value:errorMessage.
+	exceptionBlock value:errorMessage.
-^ self
+	^ self
 ].
 list isNil ifTrue: [^self].
 (list size < lineNr) ifTrue: [^ self].
 line := list at:lineNr.
 line isNil ifTrue: [^self].
 lineSize := line size.
 (colNr >= lineSize) ifTrue:[
-newLine := nil
+	newLine := nil
 ] ifFalse:[
-newLine := line copyFrom:(colNr + 1) to:lineSize.
+	newLine := line copyFrom:(colNr + 1) to:lineSize.
-newLine isBlank ifTrue:[
+	newLine isBlank ifTrue:[
-newLine := nil
+	    newLine := nil
-]
+	]
 ].
 list at:lineNr put:newLine.
+widthOfWidestLine := nil. "/ i.e. unknown
 self textChanged.
 self redrawLine:lineNr
 !
 insertTabAtCursor
 	    self makeCursorVisible
 	]
 ]
 !
+deleteFromLine:startLineNr toLine:endLineNr
+"delete some lines"
+readOnly ifTrue: [
+	exceptionBlock value:errorMessage.
+	^ self
+].
+list isNil ifTrue:[^ self].
+list removeFromIndex:startLineNr toIndex:endLineNr.
+widthOfWidestLine := nil. "/ i.e. unknown
+self textChanged.
+self redrawFromLine:startLineNr.
+(firstLineShown >= list size) ifTrue:[
+	self makeLineVisible:(list size)
+]
+!
 deleteLineWithoutRedraw:lineNr
 "delete line - no redraw;
 return true, if something was really deleted"
 readOnly ifTrue:[
-exceptionBlock value:errorMessage.
+	exceptionBlock value:errorMessage.
-^ false
+	^ false
 ].
 (list isNil or:[lineNr > list size]) ifTrue:[^ false].
 list removeIndex:lineNr.
+widthOfWidestLine := nil. "/ i.e. unknown
 self textChanged.
 ^ true
 !
 deleteLinesWithoutRedrawFrom:startLine to:endLine
 return true, if something was really deleted"
 |lastLine|
 readOnly ifTrue:[
-exceptionBlock value:errorMessage.
+	exceptionBlock value:errorMessage.
-^ false
+	^ false
 ].
 (list isNil or:[startLine > list size]) ifTrue:[^ false].
 (endLine > list size) ifTrue:[
-lastLine := list size
+	lastLine := list size
 ] ifFalse:[
-lastLine := endLine
+	lastLine := endLine
 ].
 list removeFromIndex:startLine toIndex:lastLine.
+widthOfWidestLine := nil. "/ i.e. unknown
 self textChanged.
 ^ true
 !
 deleteLine:lineNr
 "delete characters from colNr up to the end in line lineNr"
 |line newLine|
 readOnly ifTrue: [
-exceptionBlock value:errorMessage.
+	exceptionBlock value:errorMessage.
-^ self
+	^ self
 ].
 list isNil ifTrue: [^self].
 (list size < lineNr) ifTrue: [^ self].
 line := list at:lineNr.
 line isNil ifTrue: [^self].
 (colNr > line size) ifTrue: [^ self].
 newLine := line copyTo:(colNr - 1).
 newLine isBlank ifTrue:[
-newLine := nil
+	newLine := nil
 ].
 list at:lineNr put:newLine.
+widthOfWidestLine := nil. "/ i.e. unknown
 self textChanged.
 self redrawLine:lineNr
 !
 replaceSelectionBy:something
 "find a line to base indent on..."
 leftStart := 0.
 lnr := start.
 [(leftStart == 0) and:[lnr ~~ 1]] whileTrue:[
-lnr := lnr - 1.
+	lnr := lnr - 1.
-leftStart := self leftIndentOfLine:lnr
+	leftStart := self leftIndentOfLine:lnr
 ].
 (leftStart == 0) ifTrue:[^ self].
 delta := leftStart - (self leftIndentOfLine:start).
 (delta == 0) ifTrue:[^ self].
 (delta > 0) ifTrue:[
-spaces := String new:delta
+	spaces := String new:delta
 ].
 start to:end do:[:lineNr |
-line := self listAt:lineNr.
+	line := self listAt:lineNr.
-line notNil ifTrue:[
+	line notNil ifTrue:[
-line isBlank ifTrue:[
+	    line isBlank ifTrue:[
-list at:lineNr put:nil
+		list at:lineNr put:nil
-] ifFalse:[
+	    ] ifFalse:[
-(delta > 0) ifTrue:[
+		(delta > 0) ifTrue:[
-line := spaces , line
+		    line := spaces , line.
-] ifFalse:[
+		    widthOfWidestLine notNil ifTrue:[
-"check if deletion is ok"
+			widthOfWidestLine := widthOfWidestLine max:(self widthOfLineString:line).
-d := delta negated + 1.
+		    ]
+		] ifFalse:[
-line size > d ifTrue:[
+		    "check if deletion is ok"
-(line copyTo:(d - 1)) withoutSeparators isEmpty ifTrue:[
+		    d := delta negated + 1.
-line := line copyFrom:d
-]
+		    line size > d ifTrue:[
-]
+			(line copyTo:(d - 1)) withoutSeparators isEmpty ifTrue:[
-].
+			    line := line copyFrom:d
-list at:lineNr put:line.
+			]
-self textChanged.
+		    ].
-]
+		    widthOfWidestLine := nil
-]
+		].
+		list at:lineNr put:line.
+		self textChanged.
+	    ]
+	]
 ].
 self redrawFromLine:start to:end
 ! !
 !EditTextView methodsFor:'undo & again'!
 !
 searchFwd:pattern ifAbsent:aBlock
 "do a forward search"
-self searchFwd:pattern startingAtLine:cursorLine col:cursorCol ifAbsent:aBlock
+|startCol|
+"/ if there is no selection and the cursor is at the origin,
+"/ assume its the first search and do not skip the very first match
+startCol := cursorCol.
+self hasSelection ifFalse:[
+	(cursorLine == 1 and:[cursorCol == 1]) ifTrue:[
+	    startCol := 0
+	]
+].
+self searchFwd:pattern startingAtLine:cursorLine col:startCol ifAbsent:aBlock
 !
 searchBwd:pattern ifAbsent:aBlock
 "do a backward search"

changeset 118	3ee5ea99d0e2
parent 105	3d064ba4a0cc
child 121	4e63bbdb266a