🐛 FIX: skipSpacesBack and skipCharsBack methods (#86)

Author: hukkinj1

markdown_it/rules_block/heading.py

@@ -42,18 +42,10 @@ def heading(state: StateBlock, startLine: int, endLine: int, silent: bool):
 
     # Let's cut tails like '    ###  ' from the end of string
 
-    # maximum = state.skipSpacesBack(maximum, pos)
-    # tmp = state.skipCharsBack(maximum, 0x23, pos)  # #
-    # if tmp > pos and isSpace(state.srcCharCode[tmp - 1]):
-    #     maximum = tmp
-    # TODO the code above doesn't seem to work, but this does
-    # we should check why the code above doesn't work though
-    _max = len(state.src[:maximum].rstrip().rstrip(chr(0x23)))
-    try:
-        if isSpace(state.srcCharCode[_max - 1]):
-            maximum = _max
-    except IndexError:
-        pass
+    maximum = state.skipSpacesBack(maximum, pos)
+    tmp = state.skipCharsBack(maximum, 0x23, pos)  # #
+    if tmp > pos and isSpace(state.srcCharCode[tmp - 1]):
+        maximum = tmp
 
     state.line = startLine + 1
 

markdown_it/rules_block/state_block.py

@@ -128,7 +128,7 @@ def isEmpty(self, line):
         """."""
         return (self.bMarks[line] + self.tShift[line]) >= self.eMarks[line]
 
-    def skipEmptyLines(self, from_pos):
+    def skipEmptyLines(self, from_pos: int) -> int:
         """."""
         while from_pos < self.lineMax:
             try:
@@ -142,40 +142,40 @@ def skipEmptyLines(self, from_pos):
             from_pos += 1
         return from_pos
 
-    def skipSpaces(self, pos: int):
+    def skipSpaces(self, pos: int) -> int:
         """Skip spaces from given position."""
         while pos < len(self.src):
             if not isSpace(self.srcCharCode[pos]):
                 break
             pos += 1
         return pos
 
-    def skipSpacesBack(self, pos: int, minimum: int):
+    def skipSpacesBack(self, pos: int, minimum: int) -> int:
         """Skip spaces from given position in reverse."""
         if pos <= minimum:
             return pos
         while pos > minimum:
+            pos -= 1
             if not isSpace(self.srcCharCode[pos]):
                 return pos + 1
-            pos -= 1
         return pos
 
-    def skipChars(self, pos: int, code: int):
+    def skipChars(self, pos: int, code: int) -> int:
         """Skip char codes from given position."""
         while pos < len(self.src):
             if self.srcCharCode[pos] != code:
                 break
             pos += 1
         return pos
 
-    def skipCharsBack(self, pos, code, minimum):
+    def skipCharsBack(self, pos: int, code: int, minimum: int) -> int:
         """Skip char codes reverse from given position - 1."""
         if pos <= minimum:
             return pos
         while pos > minimum:
+            pos -= 1
             if code != self.srcCharCode[pos]:
                 return pos + 1
-            pos -= 1
         return pos
 
     def getLines(self, begin: int, end: int, indent, keepLastLF):