Changeset 3222

Timestamp:

Oct 27, 2018, 4:43:44 PM (6 years ago)

Author:

Andreas Schnellbacher

Message:

• Undo: Improved parameter checking again to avoid trying to restore a position if prestore_pos args are empty.

File:

• trunk/src/netlabs/macros/undo.e (modified) (1 diff)

trunk/src/netlabs/macros/undo.e ¶

@@ -218 +218 @@
       next = GetAvar( fid'.'SelectedState'.undostatepos')
       --dprintf( 'SelectUndo: 'fid'.'SelectedState'.undostatepos = 'next)
-
       parse value next with savepos'|'savemark
+      parse value savepos with svline svcol svcx svcy
+
+      NextState = SelectedState + 1
+      next = GetAvar( fid'.'NextState'.undostatepos')
+      parse value next with nextpos'|'.
+      parse value nextpos with nextline nextcol nextcx nextcy
 
       if SelectedState < PrevState then
          -- Better keep scroll pos. of NextState then
-         NextState = SelectedState + 1
-         next = GetAvar( fid'.'NextState'.undostatepos')
-         parse value next with nextpos'|'.
-         parse value nextpos with nextline nextcol nextcx nextcy
          -- Check parameters
          if nextcx <> '' & nextcy <> '' then
             -- Rebuild savepos string
-            parse value savepos with svline svcol svcx svcy
             -- Use line and col of SelectedState
-            savepos =  svline svcol nextcx nextcy
+            savepos = svline svcol nextcx nextcy
          endif
       endif
 
-      if savepos = '' then
-         -- Better don't change cursor pos. then
-      else
-         --dprintf( 'SelectUndo: prestore_pos_min_scroll( 'savepos')')
-         call prestore_pos_min_scroll( savepos)
-         'HighlightCursor'
-      endif
-      if savemark = '' then
-         -- Don't unmark other files
-         if FileIsMarked() then
-            unmark
+      -- Check parameters
+      parse value savepos with svline svcol svcx svcy
+      if svline = '' | svcol = '' then
+         -- Don't try to restore pos.
+         leave
+      endif
+      if svcx = '' | svcy = '' then
+         -- Take the scroll data of the next state instead
+         -- Check parameters
+         if nextcx = '' | nextcy = '' then
+            -- Don't try to restore pos.
+            leave
+         else
+            -- Rebuild savepos string
+            -- Use line and col of SelectedState
+            savepos = svline svcol nextcx nextcy
          endif
-      else
-         call prestore_mark( savemark)
-      endif
-
-      -- Invalidate array of multi-line comment positions, used by passist()
-      if IsADefProc( 'prune_assist_array') then
-         call prune_assist_array()
-      endif
-      'MatchFindOnMove'
+      endif
+
+      --dprintf( 'SelectUndo: prestore_pos_min_scroll( 'savepos')')
+      call prestore_pos_min_scroll( savepos)
+      'HighlightCursor'
    enddo
+
+   if savemark = '' then
+      -- Don't unmark other files
+      if FileIsMarked() then
+         unmark
+      endif
+   else
+      call prestore_mark( savemark)
+   endif
+
+   -- Invalidate array of multi-line comment positions, used by passist()
+   if IsADefProc( 'prune_assist_array') then
+      call prune_assist_array()
+   endif
+   'MatchFindOnMove'
 
    return