Changeset 4262

Timestamp:

Oct 31, 2020, 9:09:12 AM (4 years ago)

Author:

Andreas Schnellbacher

Message:

• Fixed FindStringInCode: If comments have to be ignored, the scroll pos. was wrong.

File:

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

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

@@ -2428 +2428 @@
    --dprintf( 'FindStrInCode: arg( 1) = 'arg( 1)', .filename = '.filename)
 
-   -- Reset last search args to always execute a fresh search and not a
-   -- find-next. Otherwise the t option would be removed.
-   call SetLastSearchArgs( '')
+   call pSave_Pos( savedpos)
+
+   fCaseSensitive = QueryModeKey( Mode, 'CaseSensitive')
+   if fCaseSensitive = 0 then
+      CaseOpt = 'c'  -- ignore
+   else
+      CaseOpt = 'e'  -- exact
+   endif
 
    -- First try word search
-   'l '\1''SearchStr''\1'wt+fac'
-   --dprintf( 'FindStrInCode: l '\1''SearchStr''\1'wt+fac, rc = 'rc)
+   'xcom l '\1''SearchStr''\1'wt+fa'CaseOpt
+   --dprintf( 'FindStrInCode: xcom l '\1''SearchStr''\1'wt+fa'CaseOpt', rc = 'rc)
 
    -- If nothing found, try normal search
    if rc then
-      'l '\1''SearchStr''\1't+fac'
+      'xcom l '\1''SearchStr''\1't+fa'CaseOpt
    endif
 
@@ -2445 +2450 @@
       -- Check for comments. Strings are valid if a cmd is searched.
       if InsideComment( Mode) then
-         repeatfind
+
+         -- Search again
+         repeatfind  -- This works also with for xcom l and option t
          if rc then
             leave
-         -- Recognize an inifinite loop
+         -- Recognize an infinite loop
          elseif .line .col = PrevPos then
             leave
          endif
+
          PrevPos = .line .col
          iterate
@@ -2458 +2466 @@
       leave
    enddo
-
+   lrc = rc
+   call pSave_Pos( lpos)
+
+   if not lrc then
+      -- This proc is often used for newly-loaded files. It opens the file
+      -- without a dialog in the way. Therefore better center the found
+      -- line.
+      call ScrollAfterLocate( savedpos, lpos, '', 'C C')
+   endif
+
+