Replace .srcCharCode[*] with .srcCharCodeAt(*) using regex

Author: hukkin

markdown_it/helpers/parse_link_label.py

@@ -18,7 +18,7 @@ def parseLinkLabel(state: StateInline, start: int, disableNested: bool = False)
     level = 1
 
     while state.pos < state.posMax:
-        marker = state.srcCharCode[state.pos]
+        marker = state.srcCharCodeAt(state.pos)
         if marker == 0x5D:  # /* ] */)
             level -= 1
             if level == 0:

markdown_it/rules_block/blockquote.py

@@ -23,7 +23,7 @@ def blockquote(state: StateBlock, startLine: int, endLine: int, silent: bool):
         return False
 
     # check the block quote marker
-    if state.srcCharCode[pos] != 0x3E:  # /* > */
+    if state.srcCharCodeAt(pos) != 0x3E:  # /* > */
         return False
     pos += 1
 
@@ -36,7 +36,7 @@ def blockquote(state: StateBlock, startLine: int, endLine: int, silent: bool):
     initial = offset = state.sCount[startLine] + 1
 
     try:
-        second_char_code: Optional[int] = state.srcCharCode[pos]
+        second_char_code: Optional[int] = state.srcCharCodeAt(pos)
     except IndexError:
         second_char_code = None
 
@@ -72,7 +72,7 @@ def blockquote(state: StateBlock, startLine: int, endLine: int, silent: bool):
     state.bMarks[startLine] = pos
 
     while pos < max:
-        ch = state.srcCharCode[pos]
+        ch = state.srcCharCodeAt(pos)
 
         if isSpace(ch):
             if ch == 0x09:  # / tab /
@@ -146,7 +146,7 @@ def blockquote(state: StateBlock, startLine: int, endLine: int, silent: bool):
             # Case 1: line is not inside the blockquote, and this line is empty.
             break
 
-        evaluatesTrue = state.srcCharCode[pos] == 0x3E and not isOutdented  # /* > */
+        evaluatesTrue = state.srcCharCodeAt(pos) == 0x3E and not isOutdented  # /* > */
         pos += 1
         if evaluatesTrue:
             # This line is inside the blockquote.
@@ -155,7 +155,7 @@ def blockquote(state: StateBlock, startLine: int, endLine: int, silent: bool):
             initial = offset = state.sCount[nextLine] + 1
 
             try:
-                next_char: Optional[int] = state.srcCharCode[pos]
+                next_char: Optional[int] = state.srcCharCodeAt(pos)
             except IndexError:
                 next_char = None
 
@@ -191,7 +191,7 @@ def blockquote(state: StateBlock, startLine: int, endLine: int, silent: bool):
             state.bMarks[nextLine] = pos
 
             while pos < max:
-                ch = state.srcCharCode[pos]
+                ch = state.srcCharCodeAt(pos)
 
                 if isSpace(ch):
                     if ch == 0x09:

markdown_it/rules_block/fence.py

@@ -21,7 +21,7 @@ def fence(state: StateBlock, startLine: int, endLine: int, silent: bool):
     if pos + 3 > maximum:
         return False
 
-    marker = state.srcCharCode[pos]
+    marker = state.srcCharCodeAt(pos)
 
     # /* ~ */  /* ` */
     if marker != 0x7E and marker != 0x60:
@@ -67,7 +67,7 @@ def fence(state: StateBlock, startLine: int, endLine: int, silent: bool):
             #  test
             break
 
-        if state.srcCharCode[pos] != marker:
+        if state.srcCharCodeAt(pos) != marker:
             continue
 
         if state.sCount[nextLine] - state.blkIndent >= 4:

markdown_it/rules_block/heading.py

@@ -19,7 +19,7 @@ def heading(state: StateBlock, startLine: int, endLine: int, silent: bool):
     if state.sCount[startLine] - state.blkIndent >= 4:
         return False
 
-    ch: Optional[int] = state.srcCharCode[pos]
+    ch: Optional[int] = state.srcCharCodeAt(pos)
 
     # /* # */
     if ch != 0x23 or pos >= maximum:
@@ -29,15 +29,15 @@ def heading(state: StateBlock, startLine: int, endLine: int, silent: bool):
     level = 1
     pos += 1
     try:
-        ch = state.srcCharCode[pos]
+        ch = state.srcCharCodeAt(pos)
     except IndexError:
         ch = None
     # /* # */
     while ch == 0x23 and pos < maximum and level <= 6:
         level += 1
         pos += 1
         try:
-            ch = state.srcCharCode[pos]
+            ch = state.srcCharCodeAt(pos)
         except IndexError:
             ch = None
 
@@ -51,7 +51,7 @@ def heading(state: StateBlock, startLine: int, endLine: int, silent: bool):
 
     maximum = state.skipSpacesBack(maximum, pos)
     tmp = state.skipCharsBack(maximum, 0x23, pos)  # #
-    if tmp > pos and isSpace(state.srcCharCode[tmp - 1]):
+    if tmp > pos and isSpace(state.srcCharCodeAt(tmp - 1)):
         maximum = tmp
 
     state.line = startLine + 1

markdown_it/rules_block/hr.py

@@ -22,7 +22,7 @@ def hr(state: StateBlock, startLine: int, endLine: int, silent: bool):
     if state.sCount[startLine] - state.blkIndent >= 4:
         return False
 
-    marker = state.srcCharCode[pos]
+    marker = state.srcCharCodeAt(pos)
     pos += 1
 
     # Check hr marker: /* * */ /* - */ /* _ */
@@ -33,7 +33,7 @@ def hr(state: StateBlock, startLine: int, endLine: int, silent: bool):
 
     cnt = 1
     while pos < maximum:
-        ch = state.srcCharCode[pos]
+        ch = state.srcCharCodeAt(pos)
         pos += 1
         if ch != marker and not isSpace(ch):
             return False

markdown_it/rules_block/html_block.py

@@ -44,7 +44,7 @@ def html_block(state: StateBlock, startLine: int, endLine: int, silent: bool):
     if not state.md.options.get("html", None):
         return False
 
-    if state.srcCharCode[pos] != 0x3C:  # /* < */
+    if state.srcCharCodeAt(pos) != 0x3C:  # /* < */
         return False
 
     lineText = state.src[pos:maximum]

markdown_it/rules_block/lheading.py

@@ -37,7 +37,7 @@ def lheading(state: StateBlock, startLine: int, endLine: int, silent: bool):
             maximum = state.eMarks[nextLine]
 
             if pos < maximum:
-                marker = state.srcCharCode[pos]
+                marker = state.srcCharCodeAt(pos)
 
                 # /* - */  /* = */
                 if marker == 0x2D or marker == 0x3D:
@@ -74,6 +74,7 @@ def lheading(state: StateBlock, startLine: int, endLine: int, silent: bool):
     state.line = nextLine + 1
 
     token = state.push("heading_open", "h" + str(level), 1)
+    assert marker is not None
     token.markup = chr(marker)
     token.map = [startLine, state.line]
 

markdown_it/rules_block/list.py

@@ -14,14 +14,14 @@ def skipBulletListMarker(state: StateBlock, startLine: int):
     pos = state.bMarks[startLine] + state.tShift[startLine]
     maximum = state.eMarks[startLine]
 
-    marker = state.srcCharCode[pos]
+    marker = state.srcCharCodeAt(pos)
     pos += 1
     # Check bullet /* * */ /* - */ /* + */
     if marker != 0x2A and marker != 0x2D and marker != 0x2B:
         return -1
 
     if pos < maximum:
-        ch = state.srcCharCode[pos]
+        ch = state.srcCharCodeAt(pos)
 
         if not isSpace(ch):
             # " -test " - is not a list item
@@ -42,7 +42,8 @@ def skipOrderedListMarker(state: StateBlock, startLine: int):
     if pos + 1 >= maximum:
         return -1
 
-    ch = state.srcCharCode[pos]
+    ch = state.srcCharCodeAt(pos)
+    assert ch is not None
     pos += 1
 
     # /* 0 */  /* 9 */
@@ -54,7 +55,8 @@ def skipOrderedListMarker(state: StateBlock, startLine: int):
         if pos >= maximum:
             return -1
 
-        ch = state.srcCharCode[pos]
+        ch = state.srcCharCodeAt(pos)
+        assert ch is not None
         pos += 1
 
         # /* 0 */  /* 9 */
@@ -74,7 +76,7 @@ def skipOrderedListMarker(state: StateBlock, startLine: int):
         return -1
 
     if pos < maximum:
-        ch = state.srcCharCode[pos]
+        ch = state.srcCharCodeAt(pos)
 
         if not isSpace(ch):
             # " 1.test " - is not a list item
@@ -156,7 +158,8 @@ def list_block(state: StateBlock, startLine: int, endLine: int, silent: bool):
             return False
 
     # We should terminate list on style change. Remember first one to compare.
-    markerCharCode = state.srcCharCode[posAfterMarker - 1]
+    markerCharCode = state.srcCharCodeAt(posAfterMarker - 1)
+    assert markerCharCode is not None
 
     # For validation mode we can terminate immediately
     if silent:
@@ -198,7 +201,7 @@ def list_block(state: StateBlock, startLine: int, endLine: int, silent: bool):
         )
 
         while pos < maximum:
-            ch = state.srcCharCode[pos]
+            ch = state.srcCharCodeAt(pos)
 
             if ch == 0x09:  # \t
                 offset += 4 - (offset + state.bsCount[nextLine]) % 4
@@ -318,7 +321,7 @@ def list_block(state: StateBlock, startLine: int, endLine: int, silent: bool):
             if posAfterMarker < 0:
                 break
 
-        if markerCharCode != state.srcCharCode[posAfterMarker - 1]:
+        if markerCharCode != state.srcCharCodeAt(posAfterMarker - 1):
             break
 
     # Finalize list

markdown_it/rules_block/reference.py

@@ -22,17 +22,17 @@ def reference(state: StateBlock, startLine, _endLine, silent):
     if state.sCount[startLine] - state.blkIndent >= 4:
         return False
 
-    if state.srcCharCode[pos] != 0x5B:  # /* [ */
+    if state.srcCharCodeAt(pos) != 0x5B:  # /* [ */
         return False
 
     # Simple check to quickly interrupt scan on [link](url) at the start of line.
     # Can be useful on practice: https:#github.com/markdown-it/markdown-it/issues/54
     while pos < maximum:
         # /* ] */  /* \ */  /* : */
-        if state.srcCharCode[pos] == 0x5D and state.srcCharCode[pos - 1] != 0x5C:
+        if state.srcCharCodeAt(pos) == 0x5D and state.srcCharCodeAt(pos - 1) != 0x5C:
             if pos + 1 == maximum:
                 return False
-            if state.srcCharCode[pos + 1] != 0x3A:
+            if state.srcCharCodeAt(pos + 1) != 0x3A:
                 return False
             break
         pos += 1

markdown_it/rules_block/state_block.py

@@ -153,7 +153,7 @@ def skipEmptyLines(self, from_pos: int) -> int:
     def skipSpaces(self, pos: int) -> int:
         """Skip spaces from given position."""
         while pos < len(self.src):
-            if not isSpace(self.srcCharCode[pos]):
+            if not isSpace(self.srcCharCodeAt(pos)):
                 break
             pos += 1
         return pos
@@ -164,14 +164,14 @@ def skipSpacesBack(self, pos: int, minimum: int) -> int:
             return pos
         while pos > minimum:
             pos -= 1
-            if not isSpace(self.srcCharCode[pos]):
+            if not isSpace(self.srcCharCodeAt(pos)):
                 return pos + 1
         return pos
 
     def skipChars(self, pos: int, code: int) -> int:
         """Skip char codes from given position."""
         while pos < len(self.src):
-            if self.srcCharCode[pos] != code:
+            if self.srcCharCodeAt(pos) != code:
                 break
             pos += 1
         return pos
@@ -182,7 +182,7 @@ def skipCharsBack(self, pos: int, code: int, minimum: int) -> int:
             return pos
         while pos > minimum:
             pos -= 1
-            if code != self.srcCharCode[pos]:
+            if code != self.srcCharCodeAt(pos):
                 return pos + 1
         return pos
 
@@ -204,7 +204,7 @@ def getLines(self, begin: int, end: int, indent: int, keepLastLF: bool) -> str:
                 last = self.eMarks[line]
 
             while (first < last) and (lineIndent < indent):
-                ch = self.srcCharCode[first]
+                ch = self.srcCharCodeAt(first)
                 if isSpace(ch):
                     if ch == 0x09:
                         lineIndent += 4 - (lineIndent + self.bsCount[line]) % 4

markdown_it/rules_block/table.py

@@ -71,14 +71,14 @@ def table(state: StateBlock, startLine: int, endLine: int, silent: bool):
     pos = state.bMarks[nextLine] + state.tShift[nextLine]
     if pos >= state.eMarks[nextLine]:
         return False
-    first_ch = state.srcCharCode[pos]
+    first_ch = state.srcCharCodeAt(pos)
     pos += 1
     if first_ch not in {0x7C, 0x2D, 0x3A}:  # not in {"|", "-", ":"}
         return False
 
     if pos >= state.eMarks[nextLine]:
         return False
-    second_ch = state.srcCharCode[pos]
+    second_ch = state.srcCharCodeAt(pos)
     pos += 1
     # not in {"|", "-", ":"} and not space
     if second_ch not in {0x7C, 0x2D, 0x3A} and not isSpace(second_ch):
@@ -90,7 +90,7 @@ def table(state: StateBlock, startLine: int, endLine: int, silent: bool):
         return False
 
     while pos < state.eMarks[nextLine]:
-        ch = state.srcCharCode[pos]
+        ch = state.srcCharCodeAt(pos)
 
         # /* | */  /* - */ /* : */
         if ch not in {0x7C, 0x2D, 0x3A} and not isSpace(ch):

markdown_it/rules_inline/autolink.py

@@ -12,7 +12,7 @@ def autolink(state: StateInline, silent: bool) -> bool:
 
     pos = state.pos
 
-    if state.srcCharCode[pos] != 0x3C:  # /* < */
+    if state.srcCharCodeAt(pos) != 0x3C:  # /* < */
         return False
 
     start = state.pos
@@ -23,7 +23,7 @@ def autolink(state: StateInline, silent: bool) -> bool:
         if pos >= maximum:
             return False
 
-        ch = state.srcCharCode[pos]
+        ch = state.srcCharCodeAt(pos)
 
         if ch == 0x3C:  # /* < */
             return False

markdown_it/rules_inline/backticks.py

@@ -9,7 +9,7 @@
 def backtick(state: StateInline, silent: bool) -> bool:
 
     pos = state.pos
-    ch = state.srcCharCode[pos]
+    ch = state.srcCharCodeAt(pos)
 
     # /* ` */
     if ch != 0x60:
@@ -20,7 +20,7 @@ def backtick(state: StateInline, silent: bool) -> bool:
     maximum = state.posMax
 
     # scan marker length
-    while pos < maximum and (state.srcCharCode[pos] == 0x60):  # /* ` */
+    while pos < maximum and (state.srcCharCodeAt(pos) == 0x60):  # /* ` */
         pos += 1
 
     marker = state.src[start:pos]
@@ -43,7 +43,7 @@ def backtick(state: StateInline, silent: bool) -> bool:
         matchEnd = matchStart + 1
 
         # scan marker length
-        while matchEnd < maximum and (state.srcCharCode[matchEnd] == 0x60):  # /* ` */
+        while matchEnd < maximum and (state.srcCharCodeAt(matchEnd) == 0x60):  # /* ` */
             matchEnd += 1
 
         closerLength = matchEnd - matchStart

markdown_it/rules_inline/emphasis.py

@@ -7,7 +7,7 @@
 def tokenize(state: StateInline, silent: bool):
     """Insert each marker as a separate text token, and add it to delimiter list"""
     start = state.pos
-    marker = state.srcCharCode[start]
+    marker = state.srcCharCodeAt(start)
 
     if silent:
         return False

markdown_it/rules_inline/entity.py

@@ -14,11 +14,11 @@ def entity(state: StateInline, silent: bool):
     pos = state.pos
     maximum = state.posMax
 
-    if state.srcCharCode[pos] != 0x26:  # /* & */
+    if state.srcCharCodeAt(pos) != 0x26:  # /* & */
         return False
 
     if (pos + 1) < maximum:
-        ch = state.srcCharCode[pos + 1]
+        ch = state.srcCharCodeAt(pos + 1)
 
         if ch == 0x23:  # /* # */
             match = DIGITAL_RE.search(state.src[pos:])