Ticket #124: libwidg_fix_2_of_2_rev_68542cb0ed12_Issue__124__Fixed_problem_with_leftovers_after_undo_when_pasted_text_has_tabs.patch

EditTextView.st

@@ -4530 +4530 @@
     ].
 !
 
-withoutRedrawInsertStringWithoutCRs:aString atLine:lineNr col:colNr
+withoutRedrawInsertStringWithoutCRs:string atLine:lineNr col:colNr
     "insert aString (which has no crs) at lineNr/colNr"
 
-    self basicWithoutRedrawInsertStringWithoutCRs:aString atLine:lineNr col:colNr.
-    self addUndo:(DeleteRange line1:lineNr col1:colNr line2:lineNr col2:colNr+aString size-1 info:'insert').
+    | col2Nr |
+
+    self basicWithoutRedrawInsertStringWithoutCRs:string atLine:lineNr col:colNr.
+
+    col2Nr := self withTabs:ListView tab8Positions computeSizeOf:string startCol: colNr.
+    self addUndo:(DeleteRange line1:lineNr col1:colNr line2:lineNr col2:col2Nr info:'insert').
+
+    "Modified: / 22-03-2017 / 08:24:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 wrapLines
@@ -5172 +5178 @@
         newLine := self withTabs:(ListView tab8Positions) expand:newLine
     ].
 
-    self basicListAt:lineNr put:(newLine ifNil:[newLine] ifNotNil:[newLine asSingleByteStringIfPossible]).
+    self basicListAt:lineNr put:(newLine isNil ifTrue:[newLine] ifFalse:[newLine asSingleByteStringIfPossible]).
     widthOfWidestLine notNil ifTrue:[
         widthOfWidestLine := widthOfWidestLine max:(self widthOfLineString:newLine).
     ].
     self textChanged.
 
     "Modified: / 25-01-2012 / 00:37:29 / cg"
+    "Modified: / 21-03-2017 / 22:25:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !EditTextView methodsFor:'event handling'!

ListView.st

@@ -5233 +5233 @@
     "Modified: 23.2.1996 / 19:10:36 / cg"
 !
 
+withTabs:tabulatorTable computeSizeOf:line startCol: startCol
+    "Expand tabs into spaces, return a SIZE of a `line` if 
+     pasted after startCol.
+
+     BIG FAT WARNING: If you change this method, please make
+     sure it is in sync with #withTabs:expans: otherwise the 
+     undo may break. 
+
+     See https://swing.fit.cvut.cz/projects/stx-jv/ticket/124
+     "
+
+
+    | dstIndex   "{ Class: SmallInteger }" |
+
+    line isNil ifTrue:[^ 0].
+    (line occurrencesOf: Character tab) == 0 ifTrue:[ ^ startCol + line size - 1 ].
+    dstIndex := startCol.
+    line do:[:character |
+        (character == (Character tab)) ifTrue:[
+            dstIndex := self nextTabAfter:dstIndex in:tabulatorTable.
+        ] ifFalse:[
+            dstIndex := dstIndex + 1
+        ].
+        "make stc-optimizer happy
+         - no need to return value of ifTrue:/ifFalse above"
+        0
+    ].
+    ^ dstIndex - 1.
+
+    "Created: / 22-03-2017 / 08:17:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 withTabs:tabulatorTable expand:line
-    "expand tabs into spaces, return a new line string,
+    "Expand tabs into spaces, return a new line string,
      or original line, if no tabs are included.
      good idea, to make this one a primitive, since it is called
-     many times if a big text is read from a file."
+     many times if a big text is read from a file.
+
+     BIG FAT WARNING: If you change this method, please make
+     sure it is in sync with #withTabs:computeSizeOf:startCol:
+     otherwise the undo may break. 
+
+     See https://swing.fit.cvut.cz/projects/stx-jv/ticket/124
+    "
 
     |tmpString nString nTabs
      currentMax "{ Class: SmallInteger }"
@@ -5259 +5298 @@
     tmpString := line species new:currentMax.
     dstIndex := 1.
     line do:[:character |
-        (character == (Character tab)) ifTrue:[
-            nextTab := self nextTabAfter:dstIndex in:tabulatorTable.
-            [dstIndex < nextTab] whileTrue:[
-                tmpString at:dstIndex put:(Character space).
-                dstIndex := dstIndex + 1
-            ]
-        ] ifFalse:[
-            tmpString at:dstIndex put:character.
-            dstIndex := dstIndex + 1
-        ].
-        (dstIndex > currentMax) ifTrue:[
-            "
-             this cannot happen with <= 8 tabs
-            "
-            currentMax := currentMax + currentMax.
-            nString := line species new:currentMax.
-            nString replaceFrom:1 to:(dstIndex - 1)
-                           with:tmpString startingAt:1.
-            tmpString := nString.
-            nString := nil
-        ].
-
-        "make stc-optimizer happy
-         - no need to return value of ifTrue:/ifFalse above"
-        0
+        (character == (Character tab)) ifTrue:[
+            nextTab := self nextTabAfter:dstIndex in:tabulatorTable.
+            [dstIndex < nextTab] whileTrue:[
+                tmpString at:dstIndex put:(Character space).
+                dstIndex := dstIndex + 1
+            ]
+        ] ifFalse:[
+            tmpString at:dstIndex put:character.
+            dstIndex := dstIndex + 1
+        ].
+        (dstIndex > currentMax) ifTrue:[
+            "
+             this cannot happen with <= 8 tabs
+            "
+            currentMax := currentMax + currentMax.
+            nString := line species new:currentMax.
+            nString replaceFrom:1 to:(dstIndex - 1)
+                           with:tmpString startingAt:1.
+            tmpString := nString.
+            nString := nil
+        ].
+
+        "make stc-optimizer happy
+         - no need to return value of ifTrue:/ifFalse above"
+        0
     ].
     dstIndex := dstIndex - 1.
     dstIndex == currentMax ifTrue:[
-        ^ tmpString
+        ^ tmpString
     ].
     ^ tmpString copyTo:dstIndex
 
-    "Modified: 23.2.1996 / 19:11:01 / cg"
+    "Modified: / 23-02-1996 / 19:11:01 / cg"
+    "Modified (comment): / 22-03-2017 / 08:36:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 withTabsExpanded:line