Changeset 2779

Timestamp:

Oct 29, 2017, 6:46:32 PM (7 years ago)

Author:

Andreas Schnellbacher

Message:

• Fixed start position after a grep or egrep change.
• Fixed highlighting for a grep or egrep change.
• Fixed start position for a change followed after a locate.

File:

• trunk/src/netlabs/macros/locate.e (modified) (8 diffs)

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

@@ -293 +293 @@
    -- If there is no string to change at the cursor, it processes the next
    -- string. For that no cursor move is required.
-   if SearchMode = 'c' then
+   if LastSearchMode = 'l' & SearchMode = 'c' then
       fMoveCursor = 0
    endif
-
-   --dprintf( 'fMoveCursor = 'fMoveCursor', fFindNext = 'fFindNext)
+   --dprintf( '   ProcessSearchPos: fMoveCursor = 'fMoveCursor', fFindNext = 'fFindNext)
 
    fSearch = 1
@@ -452 +451 @@
    -- The rest is similar for both 'locate' and 'change'
 
-   -- Pos from before the search and maybe move
-   call psave_pos( savedpos)
    SearchMode = 'l'
 
@@ -471 +468 @@
    endif
 
+   -- Pos from before the search
+   call psave_pos( savedpos)
+
    if fSearch then
       display -8  -- suppress writing to MsgBox
@@ -517 +517 @@
 defc RepeatChange, C, Change
    universal default_search_options
-;   universal search_len
    universal lastsearchpos
    universal stay  -- if 1, then restore pos even after a successful change
@@ -575 +574 @@
    call SetLastSearchArgs( SearchArgs)
 
-   -- Pos from before the search and maybe move
-   call psave_pos( savedpos)
    SearchMode = 'c'
 
@@ -595 +592 @@
    endif
 
+   -- Pos from before the search
+   call psave_pos( savedpos)
+
+   OldLineLength = ''
+   NewLineLength = ''
+   if fSearch then
+      if pos( 'g', lowcase( search_options)) > 0 | pos( 'x', lowcase( search_options)) > 0 then
+         -- For grep and egrep searches only:
+         -- Also build SearchArgs for finding the same line where Change will process
+         -- next. This allows for querying the line length before the change and
+         -- for calculating the change length.
+         TmpSearchArgs = delim''search_string''delim''search_options
+         display -8
+         'xcom l 'TmpSearchArgs
+         if rc = 0 then
+            OldLineLen = length( textline( .line))
+            --dprintf( 'OldLineLen = 'OldLineLen', .line = '.line)
+         endif
+         call prestore_pos( savedpos)
+         display 8
+      endif
+   endif
+
    if fSearch then
       display -8
       'xcom c 'ChangeArgs
       lrc = rc
+      NewLineLen = length( textline( .line))
       call psave_pos( lpos)
       display 8
@@ -620 +641 @@
       -- But getpminfo( EPMINFO_LSLENGTH) gives the value for the search string,
       -- not for the change string.
-      -- Therefore estimate its value here to submit it as arg to highlight_match().
-      -- This likely gives a wrong result for a grep search.
-      SearchLen = length( replace_string)
-      call highlight_match( .line .col SearchLen)
+      -- While for a non-grep search the length of the replacement string
+      -- is known, it has to be calculated with the line length from before
+      -- the change for a grep search.
+      if pos( 'g', lowcase( search_options)) > 0 | pos( 'x', lowcase( search_options)) > 0 then
+         OldLen = getpminfo( EPMINFO_LSLENGTH)
+         NewLen = OldLen - OldLineLen + NewLineLen
+         --dprintf( 'NewLen = 'NewLen)
+         ReplaceLen = NewLen
+      else
+         ReplaceLen = length( replace_string)
+      endif
+      call highlight_match( .line .col ReplaceLen)
 
       -- Restore pos after change command if stay = 1
@@ -635 +664 @@
 
    -- Save last searched pos, file and search mode
-   thissearchpos = .line .col fid length( replace_string) 'c'
+   thissearchpos = .line .col fid ReplaceLen 'c'
    --dprintf( 'thissearchpos = 'thissearchpos', lastsearchpos = 'lastsearchpos)
    lastsearchpos = thissearchpos