Changeset 2955 for trunk/src/netlabs/macros/wrap.e

Timestamp:

Mar 4, 2018, 7:24:01 PM (7 years ago)

Author:

Andreas Schnellbacher

Message:

• Wrap: Added processing of marked lines, if file is marked.
• Fixed wrap message after processing.

File:

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

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

@@ -629 +629 @@
 
 ; ---------------------------------------------------------------------------
-; Hard wrap: split lines. Try to split at words first.
+; Hard wrap: split lines. Try to split at words first. Processes only marked
+; lines, if current file is marked.
 ;
 ; Syntax: Wrap SplitCol [Style]
@@ -691 +692 @@
    mouse_setpointer WAIT_POINTER
    display -1  -- disable update of text area
-   call psave_pos(saved_pos)
+   call psave_pos( saved_pos)
+
+   fProcessMark = FileIsMarked()
+   if fProcessMark then
+      getmark firstl, lastl, firstc, lastc, markfid
+      MarkToLineMark()
+   else
+      firstl = 1
+      lastl = .last
+   endif
 
    .line = 1
    .col  = 1
    m = 0
-   l = 1
-   getfileid fid
-   client = gethwndc(EPMINFO_EDITCLIENT)
-   do while l <= .last
-      -- process all lines
+   l = firstl
+   do forever  -- do forever is faster then using a condition
+      -- Check if line counter is > last (marked) line
+      if l > lastl then
+         leave
+      endif
+      if l > .last then
+         leave
+      endif
+
+      -- process lines
       getline line, l
 
@@ -739 +755 @@
          endif
 
+         lastl = lastl + 1
+
+         if fProcessMark then
+            if l = lastl - 1 then
+               -- Extend mark to include wrapped line
+               setmark firstl, lastl, firstc, lastc, 0, markfid
+            endif
+         endif
+
          m = m + 1
       endif  -- length( strip( line, 'T')) > SplitCol
+
       l = l + 1
-   enddo  -- while l <= .last
-
-   call prestore_pos(saved_pos)
+   enddo  -- forever
+
+   call prestore_pos( saved_pos)
    display 1
    mouse_setpointer vEPM_POINTER
 
-   Msg = 'Wrap after 'SplitCol' chars: 'm
+   Msg = 'Wrap at column 'SplitCol': 'm
    if m = 1 then
       Msg = Msg' change.'