Changeset 3346

Timestamp:

Dec 14, 2018, 7:50:09 PM (6 years ago)

Author:

Andreas Schnellbacher

Message:

• TabCompress, TabCompressAll: Fixed processing when IndentOnly option is set.
• TabCompressLine: Fixed pos. calculation. That gave false results when the part after the indent is processed.

File:

• trunk/src/netlabs/macros/tabsspaces.e (modified) (12 diffs)

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

@@ -26 +26 @@
 
    if arg1 = '' | not IsNum( arg1) then
-      'commandline Spaces2Tabs 'word( .tabs, 1)
+      'CommandLine Spaces2Tabs 'word( .tabs, 1)
       return
    else
@@ -304 +304 @@
 
    if arg1 = '' | not IsNum( arg1) then
-      'commandline Tabs2Spaces 'word( .tabs, 1)
+      'CommandLine Tabs2Spaces 'word( .tabs, 1)
       return
    else
@@ -521 +521 @@
       fIndentOnly = 0
    endif
+
    fChanged = 0
    TabChar = \9
@@ -526 +527 @@
    TmpLineStr = ''
    Col = 1
-   p = pos( '  ', rest)
-   pNonBlank = max( 1, verify( rest, ' '\t))
-   do while p <> 0
+
+   if fIndentOnly then
+      pNonBlank = max( 1, verify( rest, ' '\t))
+   endif
+
+   do forever
+      p = pos( '  ', rest)
+      if p = 0 then
+         leave
+      endif
+
       if fIndentOnly then
          -- Check pos > indent
-         if p > pNonBlank then
-            leave
-         endif
-      endif
+         if Col + p >= pNonBlank then
+            leave
+         endif
+      endif
+
       LeftPart  = substr( rest, 1, p - 1)
       RightPart = substr( rest, p)  -- including all spaces
       TmpLineStr = TmpLineStr''LeftPart
-      Col  = Col + length( LeftPart)
+      Col = Col + length( LeftPart)
+
       SpaceLen = max( 0, verify( RightPart, ' ', 'N') - 1)
+      -- Don't process spaces at line end
       if SpaceLen = 0 then
-         --SpaceLen = length( RightPart)  -- Avoid endless loop if spaces at end of line
-         -- Don't process spaces at line end
          leave
       endif
       rest = substr( rest, p + SpaceLen)  -- stripped leading spaces
+
       -- Don't process enquoted string
       if PosInQuotes( TmpLineStr) then  -- TmpLineStr is here only left part before current doublespace
          TmpLineStr = TmpLineStr''copies( ' ', SpaceLen)
          Col = Col + SpaceLen
-      else
-         -- Convert spaces
-         do while SpaceLen > 0
-            NextTabCol = Col + TabWidth - ((Col - 1) // TabWidth)
-            --NextTabCol = (((Col - 1) % TabWidth) + 1) * TabWidth + 1  -- works as well
-            if (NextTabCol > Col) & (Col + SpaceLen >= NextTabCol) then
-               TmpLineStr = TmpLineStr''TabChar
-               SpaceLen = SpaceLen - (NextTabCol - Col)
-               Col = NextTabCol
-               if fChanged = 0 then
-                  fChanged = 1
-               endif
-            else
-               TmpLineStr = TmpLineStr''copies( ' ', SpaceLen)
-               Col = Col + SpaceLen
-               SpaceLen = 0
-            endif
-         enddo
-      endif
-      p = pos( '  ', rest)
+         SpaceLen = 0
+      endif
+
+      -- Convert spaces
+      do while SpaceLen > 0
+         NextTabCol = Col + TabWidth - ((Col - 1) // TabWidth)
+         --NextTabCol = (((Col - 1) % TabWidth) + 1) * TabWidth + 1  -- works as well
+         if (NextTabCol > Col) & (Col + SpaceLen >= NextTabCol) then
+            TmpLineStr = TmpLineStr''TabChar
+            SpaceLen = SpaceLen - (NextTabCol - Col)
+            Col = NextTabCol
+            fChanged = 1
+         else
+            TmpLineStr = TmpLineStr''copies( ' ', SpaceLen)
+            Col = Col + SpaceLen
+            SpaceLen = 0
+         endif
+      enddo
+
    enddo
+
    TmpLineStr = TmpLineStr''rest
    return TmpLineStr
@@ -611 +622 @@
       pNonBlank = max( 1, verify( LineStr, ' '\t))
    endif
+
+   -- When fRestoreCol is 1, the line is split at the cursor into
+   -- LeftLineStr and RightLineStr. These parts are separately processed.
    if fRestoreCol then
       Maxn = 2
@@ -639 +653 @@
       ExpCol = .col
       do forever
+         PrevCol = .col
 
          display -14
@@ -659 +674 @@
             endif
          endif
+
+         -- The search adanced .col. Advance ExpCol as well.
+         DeltaCol = .col - PrevCol
+         ExpCol = ExpCol + DeltaCol
+
          -- Check pos > indent
          if fIndentOnly then
-            if .col > pNonBlank then
+            if ExpCol >= pNonBlank then
                leave
             endif
@@ -677 +697 @@
 
          SpaceLen = max( 0, verify( RightLineStr, ' ', 'N') - 1)
+         -- Don't process spaces at line end
          if SpaceLen = 0 then
-            --SpaceLen = length( RightLineStr)
-            -- Don't process spaces at line end
             leave
          endif
@@ -720 +739 @@
          if EndCol > -1 then
             EndCol = EndCol - NextSpaceLen + TabLen
-         endif
-         if fIndentOnly then
-            pNonBlank = pNonBlank - NextSpaceLen + TabLen
          endif
          ExpCol = ExpCol + NextSpaceLen
@@ -753 +769 @@
       return LineStr
    endif
+
    rest = LineStr
    TmpLineStr = ''
-   p = pos( TabChar, rest)
-   do while p <> 0
+   do forever
+      p = pos( TabChar, rest)
+      if p = 0 then
+         leave
+      endif
+
       LeftPart = substr( rest, 1, p - 1)
       TmpLineStr = TmpLineStr''LeftPart
       rest = substr( rest, p + 1)
       Col = length( TmpLineStr) + 1  -- processed columns before current tab char
+
       NextTabCol = Col + TabWidth - ((Col - 1) // TabWidth)
       --NextTabCol = (((Col - 1) % TabWidth) + 1) * TabWidth + 1  -- works as well
       SpaceLen = NextTabCol - Col
       TmpLineStr  = TmpLineStr''copies( ' ', SpaceLen)
-      if fChanged = 0 then
-         fChanged = 1
-      endif
-      p = pos( TabChar, rest)
+      fChanged = 1
    enddo
+
    TmpLineStr = TmpLineStr''rest
    return TmpLineStr
@@ -799 +819 @@
    getsearch savesearch
 
+   -- When fRestoreCol is 1, the line is split at the cursor into
+   -- LeftLineStr and RightLineStr. These parts are separately processed.
    if fRestoreCol then
       Maxn = 2
@@ -806 +828 @@
 
    do n = 1 to Maxn
-      if fRestoreCol then
+      if fRestoreCol then  -- means: Line = .line
+         -- Cursor is on this line. Split line at cursor.
          if n = 1 then
+            -- First part
             ThisStartCol = StartCol
             ThisEndCol   = .col - 1
          else
+            -- Second part
             ThisStartCol = ThisEndCol + 1
             ThisEndCol   = EndCol
          endif
       else
+         -- Cursor not on this line or fRestoreCol deactivated.
          ThisStartCol = StartCol
          ThisEndCol   = EndCol