Merge branch 'master' into markdown-renderer-docs

chrisjsewell · web-flow · commit 533865f388db · 2023-02-22T05:32:12.000+01:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,19 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    commit-message:
+      prefix: ⬆️
+    schedule:
+      interval: weekly
+  - package-ecosystem: pip
+    directory: /
+    commit-message:
+      prefix: ⬆️
+    schedule:
+      interval: weekly
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -12,12 +12,12 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Set up Python 3.8
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: 3.8
 
     - name: install pandoc
-      uses: r-lib/actions/setup-pandoc@v1
+      uses: r-lib/actions/setup-pandoc@v2
       with:
         pandoc-version: '2.6'
 
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -21,10 +21,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python 3.8
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: '3.8'
-    - uses: pre-commit/action@v2.0.0
+    - uses: pre-commit/action@v3.0.0
 
   tests:
 
@@ -36,7 +36,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -48,7 +48,7 @@ jobs:
         pytest tests/ --cov=markdown_it --cov-report=xml --cov-report=term-missing
     - name: Upload to Codecov
       if: matrix.python-version == '3.7' && github.repository == 'executablebooks/markdown-it-py'
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v3
       with:
         name: markdown-it-py-pytests-py3.7
         flags: pytests
@@ -64,7 +64,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install markdown-it-py
@@ -85,7 +85,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Set up Python 3.8
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: '3.8'
 
@@ -98,7 +98,7 @@ jobs:
       run: tox -e py38-bench-core -- --benchmark-json bench-core.json
 
     - name: Upload data
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: bench-core
         path: bench-core.json
@@ -114,7 +114,7 @@ jobs:
     - name: Checkout source
       uses: actions/checkout@v2
     - name: Set up Python 3.8
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: '3.8'
     - name: install flit
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -16,31 +16,31 @@ exclude: >
 repos:
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
     - id: check-json
     - id: check-yaml
     - id: end-of-file-fixer
     - id: trailing-whitespace
 
   - repo: https://github.com/pycqa/isort
-    rev: 5.10.1
+    rev: 5.12.0
     hooks:
     - id: isort
 
   - repo: https://github.com/psf/black
-    rev: 22.6.0
+    rev: 23.1.0
     hooks:
     - id: black
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 5.0.2
+    rev: 6.0.0
     hooks:
     - id: flake8
       additional_dependencies: [flake8-bugbear~=22.7]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.971
+    rev: v1.0.1
     hooks:
     - id: mypy
       additional_dependencies: [mdurl]
diff --git a/docs/using.md b/docs/using.md
@@ -330,7 +330,7 @@ md = MarkdownIt("commonmark", renderer_cls=MyRenderer)
 md.render("*a*")
 ```
 
-Plugins can support multiple render types, using the `__ouput__` attribute (this is currently a Python only feature).
+Plugins can support multiple render types, using the `__output__` attribute (this is currently a Python only feature).
 
 ```{code-cell} python
 from markdown_it.renderer import RendererHTML
diff --git a/markdown_it/common/utils.py b/markdown_it/common/utils.py
@@ -56,7 +56,6 @@ def arrayReplaceAt(src: list, pos: int, newElements: list) -> list:
 
 
 def isValidEntityCode(c: int) -> bool:
-
     # broken sequence
     if c >= 0xD800 and c <= 0xDFFF:
         return False
diff --git a/markdown_it/helpers/parse_link_label.py b/markdown_it/helpers/parse_link_label.py
@@ -9,7 +9,6 @@
 
 
 def parseLinkLabel(state: StateInline, start: int, disableNested: bool = False) -> int:
-
     labelEnd = -1
     oldPos = state.pos
     found = False
diff --git a/markdown_it/renderer.py b/markdown_it/renderer.py
@@ -18,7 +18,7 @@ class Renderer
 try:
     from typing import Protocol
 except ImportError:  # Python <3.8 doesn't have `Protocol` in the stdlib
-    from typing_extensions import Protocol  # type: ignore[misc]
+    from typing_extensions import Protocol  # type: ignore
 
 
 class RendererProtocol(Protocol):
@@ -82,7 +82,6 @@ def render(
         result = ""
 
         for i, token in enumerate(tokens):
-
             if token.type == "inline":
                 assert token.children is not None
                 result += self.renderInline(token.children, options, env)
diff --git a/markdown_it/rules_block/blockquote.py b/markdown_it/rules_block/blockquote.py
@@ -10,7 +10,6 @@
 
 
 def blockquote(state: StateBlock, startLine: int, endLine: int, silent: bool):
-
     LOGGER.debug(
         "entering blockquote: %s, %s, %s, %s", state, startLine, endLine, silent
     )
@@ -129,7 +128,6 @@ def blockquote(state: StateBlock, startLine: int, endLine: int, silent: bool):
     # for (nextLine = startLine + 1; nextLine < endLine; nextLine++) {
     nextLine = startLine + 1
     while nextLine < endLine:
-
         # check if it's outdented, i.e. it's inside list item and indented
         # less than said list item:
         #
diff --git a/markdown_it/rules_block/code.py b/markdown_it/rules_block/code.py
@@ -7,7 +7,6 @@
 
 
 def code(state: StateBlock, startLine: int, endLine: int, silent: bool = False):
-
     LOGGER.debug("entering code: %s, %s, %s, %s", state, startLine, endLine, silent)
 
     if state.sCount[startLine] - state.blkIndent < 4:
diff --git a/markdown_it/rules_block/fence.py b/markdown_it/rules_block/fence.py
@@ -7,7 +7,6 @@
 
 
 def fence(state: StateBlock, startLine: int, endLine: int, silent: bool):
-
     LOGGER.debug("entering fence: %s, %s, %s, %s", state, startLine, endLine, silent)
 
     haveEndMarker = False
diff --git a/markdown_it/rules_block/heading.py b/markdown_it/rules_block/heading.py
@@ -10,7 +10,6 @@
 
 
 def heading(state: StateBlock, startLine: int, endLine: int, silent: bool):
-
     LOGGER.debug("entering heading: %s, %s, %s, %s", state, startLine, endLine, silent)
 
     pos = state.bMarks[startLine] + state.tShift[startLine]
diff --git a/markdown_it/rules_block/hr.py b/markdown_it/rules_block/hr.py
@@ -11,7 +11,6 @@
 
 
 def hr(state: StateBlock, startLine: int, endLine: int, silent: bool):
-
     LOGGER.debug("entering hr: %s, %s, %s, %s", state, startLine, endLine, silent)
 
     pos = state.bMarks[startLine] + state.tShift[startLine]
diff --git a/markdown_it/rules_block/lheading.py b/markdown_it/rules_block/lheading.py
@@ -8,7 +8,6 @@
 
 
 def lheading(state: StateBlock, startLine: int, endLine: int, silent: bool):
-
     LOGGER.debug("entering lheading: %s, %s, %s, %s", state, startLine, endLine, silent)
 
     level = None
diff --git a/markdown_it/rules_block/list.py b/markdown_it/rules_block/list.py
@@ -10,7 +10,6 @@
 # Search `[-+*][\n ]`, returns next pos after marker on success
 # or -1 on fail.
 def skipBulletListMarker(state: StateBlock, startLine: int):
-
     pos = state.bMarks[startLine] + state.tShift[startLine]
     maximum = state.eMarks[startLine]
 
@@ -33,7 +32,6 @@ def skipBulletListMarker(state: StateBlock, startLine: int):
 # Search `\d+[.)][\n ]`, returns next pos after marker on success
 # or -1 on fail.
 def skipOrderedListMarker(state: StateBlock, startLine: int):
-
     start = state.bMarks[startLine] + state.tShift[startLine]
     pos = start
     maximum = state.eMarks[startLine]
@@ -59,7 +57,6 @@ def skipOrderedListMarker(state: StateBlock, startLine: int):
 
         # /* 0 */  /* 9 */
         if ch >= 0x30 and ch <= 0x39:
-
             # List marker should have no more than 9 digits
             # (prevents integer overflow in browsers)
             if pos - start >= 10:
@@ -97,7 +94,6 @@ def markTightParagraphs(state: StateBlock, idx: int):
 
 
 def list_block(state: StateBlock, startLine: int, endLine: int, silent: bool):
-
     LOGGER.debug("entering list: %s, %s, %s, %s", state, startLine, endLine, silent)
 
     isTerminatingParagraph = False
diff --git a/markdown_it/rules_block/paragraph.py b/markdown_it/rules_block/paragraph.py
@@ -8,7 +8,6 @@
 
 
 def paragraph(state: StateBlock, startLine: int, endLine: int, silent: bool = False):
-
     LOGGER.debug(
         "entering paragraph: %s, %s, %s, %s", state, startLine, endLine, silent
     )
diff --git a/markdown_it/rules_block/reference.py b/markdown_it/rules_block/reference.py
@@ -7,7 +7,6 @@
 
 
 def reference(state: StateBlock, startLine, _endLine, silent):
-
     LOGGER.debug(
         "entering reference: %s, %s, %s, %s", state, startLine, _endLine, silent
     )
diff --git a/markdown_it/rules_block/state_block.py b/markdown_it/rules_block/state_block.py
@@ -19,7 +19,6 @@ def __init__(
         tokens: list[Token],
         srcCharCode: tuple[int, ...] | None = None,
     ):
-
         if srcCharCode is not None:
             self._src = src
             self.srcCharCode = srcCharCode
diff --git a/markdown_it/rules_core/block.py b/markdown_it/rules_core/block.py
@@ -3,7 +3,6 @@
 
 
 def block(state: StateCore) -> None:
-
     if state.inlineMode:
         token = Token("inline", "", 0)
         token.content = state.src
diff --git a/markdown_it/rules_core/normalize.py b/markdown_it/rules_core/normalize.py
@@ -9,7 +9,6 @@
 
 
 def normalize(state: StateCore) -> None:
-
     # Normalize newlines
     string = NEWLINES_RE.sub("\n", state.src)
 
diff --git a/markdown_it/rules_core/smartquotes.py b/markdown_it/rules_core/smartquotes.py
@@ -195,7 +195,6 @@ def smartquotes(state: StateCore) -> None:
         return
 
     for token in state.tokens:
-
         if token.type != "inline" or not QUOTE_RE.search(token.content):
             continue
         assert token.children is not None
diff --git a/markdown_it/rules_inline/autolink.py b/markdown_it/rules_inline/autolink.py
@@ -10,7 +10,6 @@
 
 
 def autolink(state: StateInline, silent: bool) -> bool:
-
     pos = state.pos
 
     if state.srcCharCode[pos] != 0x3C:  # /* < */
diff --git a/markdown_it/rules_inline/backticks.py b/markdown_it/rules_inline/backticks.py
@@ -7,7 +7,6 @@
 
 
 def backtick(state: StateInline, silent: bool) -> bool:
-
     pos = state.pos
     ch = state.srcCharCode[pos]
 
diff --git a/markdown_it/rules_inline/balance_pairs.py b/markdown_it/rules_inline/balance_pairs.py
@@ -4,7 +4,6 @@
 
 
 def processDelimiters(state: StateInline, delimiters, *args):
-
     openersBottom = {}
     maximum = len(delimiters)
 
@@ -50,7 +49,6 @@ def processDelimiters(state: StateInline, delimiters, *args):
                 continue
 
             if opener.open and opener.end < 0:
-
                 isOddMatch = False
 
                 # from spec:
diff --git a/markdown_it/rules_inline/emphasis.py b/markdown_it/rules_inline/emphasis.py
@@ -39,7 +39,6 @@ def tokenize(state: StateInline, silent: bool):
 
 
 def _postProcess(state, delimiters):
-
     i = len(delimiters) - 1
     while i >= 0:
         startDelim = delimiters[i]
diff --git a/markdown_it/rules_inline/entity.py b/markdown_it/rules_inline/entity.py
@@ -10,7 +10,6 @@
 
 
 def entity(state: StateInline, silent: bool):
-
     pos = state.pos
     maximum = state.posMax
 
diff --git a/markdown_it/rules_inline/html_inline.py b/markdown_it/rules_inline/html_inline.py
@@ -10,7 +10,6 @@ def isLetter(ch: int):
 
 
 def html_inline(state: StateInline, silent: bool):
-
     pos = state.pos
 
     if not state.md.options.get("html", None):
diff --git a/markdown_it/rules_inline/image.py b/markdown_it/rules_inline/image.py
@@ -7,7 +7,6 @@
 
 
 def image(state: StateInline, silent: bool):
-
     label = None
     href = ""
     oldPos = state.pos
diff --git a/markdown_it/rules_inline/link.py b/markdown_it/rules_inline/link.py
@@ -5,7 +5,6 @@
 
 
 def link(state: StateInline, silent: bool):
-
     href = ""
     title = ""
     label = None
diff --git a/markdown_it/rules_inline/strikethrough.py b/markdown_it/rules_inline/strikethrough.py
diff --git a/markdown_it/token.py b/markdown_it/token.py
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/tests/test_port/test_references.py b/tests/test_port/test_references.py

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`
`11`	`11`
`12`	`12`	`def blockquote(state: StateBlock, startLine: int, endLine: int, silent: bool):`
`13`		`-`
`14`	`13`	`LOGGER.debug(`
`15`	`14`	`"entering blockquote: %s, %s, %s, %s", state, startLine, endLine, silent`
`16`	`15`	`)`
`@@ -129,7 +128,6 @@ def blockquote(state: StateBlock, startLine: int, endLine: int, silent: bool):`
`129`	`128`	`# for (nextLine = startLine + 1; nextLine < endLine; nextLine++) {`
`130`	`129`	`nextLine = startLine + 1`
`131`	`130`	`while nextLine < endLine:`
`132`		`-`
`133`	`131`	`# check if it's outdented, i.e. it's inside list item and indented`
`134`	`132`	`# less than said list item:`
`135`	`133`	`#`