From a3fe20b565ab2e6bfe90cc7c29bdd832dd760857 Mon Sep 17 00:00:00 2001
From: Kyle King <KyleKing@users.noreply.github.com>
Date: Tue, 21 Nov 2023 21:11:01 -0500
Subject: [PATCH] fix: add ptw and resolve test failures

---
 CONTRIBUTING.md           | 10 +++++++++
 mdformat_mkdocs/plugin.py | 47 ++++++++++++++++++++++-----------------
 pyproject.toml            |  7 ++++++
 tox.ini                   |  6 ++---
 4 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 837dcab..523118e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -41,6 +41,16 @@ To run the pre-commit hook test:
 tox -e py37-hook
 ```
 
+## `ptw` testing
+
+See configuration in `pyproject.toml` for `[tool.pytest-watcher]`
+
+```sh
+pipx install pytest-watcher
+
+ptw .
+```
+
 ## Publish to PyPi
 
 Either use flit directly:
diff --git a/mdformat_mkdocs/plugin.py b/mdformat_mkdocs/plugin.py
index 937c91a..e01c9d2 100644
--- a/mdformat_mkdocs/plugin.py
+++ b/mdformat_mkdocs/plugin.py
@@ -71,42 +71,47 @@ def add_bullet(self, line: str) -> str:
         """Add bullet to the line."""
         match = _RE_INDENT.match(line)
         assert match is not None  # for pylint
-        list_match = _RE_LIST_ITEM.match(match["content"])
-        assert list_match is not None  # for pylint
-
         self.this_indent = match["indent"]
-        self.is_numbered = list_match["bullet"] not in {"-", "*"}
-        self.is_semantic_indent = True
+        list_match = _RE_LIST_ITEM.match(match["content"])
         self.is_list_match = bool(list_match)
-
-        new_bullet = f"{self._number()}." if self.is_numbered else "-"
-        return f'{new_bullet} {list_match["item"]}'
+        new_line = line
+        if list_match:
+            self.is_numbered = list_match["bullet"] not in {"-", "*"}
+            new_bullet = f"{self._number()}." if self.is_numbered else "-"
+            new_line = f'{new_bullet} {list_match["item"]}'
+            self.is_semantic_indent = True
+        elif not new_line:
+            self.is_semantic_indent = False  # on line break, use non-semantic indents
+        return new_line
 
 
 class _MarkdownIndent:
     """Track Markdown Indent."""
 
-    last_indent = ""
-    counter = 0
-    lookup: Dict[str, int] = {}
+    _last_indent = ""
+    _counter = 0
+    _lookup: Dict[str, int] = {}
+
+    def __init__(self) -> None:
+        self._lookup = {}
 
     def calculate(self, this_indent: str) -> str:
         """Calculate the new indent."""
         if this_indent:
-            diff = len(this_indent) - len(self.last_indent)
+            diff = len(this_indent) - len(self._last_indent)
             if not diff:
                 ...
             elif diff > 0:
-                self.counter += 1
-                self.lookup[this_indent] = self.counter
-            elif this_indent in self.lookup:
-                self.counter = self.lookup[this_indent]
+                self._counter += 1
+                self._lookup[this_indent] = self._counter
+            elif this_indent in self._lookup:
+                self._counter = self._lookup[this_indent]
             else:
                 raise NotImplementedError("No indentation")
         else:
-            self.counter = 0
-        self.last_indent = this_indent
-        return _DEFAULT_INDENT * self.counter
+            self._counter = 0
+        self._last_indent = this_indent
+        return _DEFAULT_INDENT * self._counter
 
 
 def _normalize_list(text: str, node: RenderTreeNode, context: RenderContext) -> str:
@@ -114,7 +119,8 @@ def _normalize_list(text: str, node: RenderTreeNode, context: RenderContext) ->
     eol = "\n"
 
     rendered = ""
-    md_list = _MarkdownList(increment_number_mode=context.options["mdformat"]["number"])
+    number_mode = bool(context.options["mdformat"].get("number"))
+    md_list = _MarkdownList(increment_number_mode=number_mode)
     md_indent = _MarkdownIndent()
     for line in text.split(eol):
         new_line = md_list.add_bullet(line)
@@ -131,6 +137,7 @@ def _normalize_list(text: str, node: RenderTreeNode, context: RenderContext) ->
         ):
             removed_indents = -1 if md_list.is_numbered else -2
             new_indent = new_indent[:removed_indents]
+
         new_line = new_line.replace(f"{FILLER_CHAR} ", "").replace(FILLER_CHAR, "")
         rendered += f"{new_indent}{new_line.strip()}{eol}"
     return rendered.rstrip()
diff --git a/pyproject.toml b/pyproject.toml
index 59e7d7e..aaa05ef 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -66,3 +66,10 @@ known_first_party = ["mdformat_mkdocs", "tests"]
 
 # Settings for Black compatibility
 profile = "black"
+
+[tool.pytest-watcher]
+now = true
+runner = "tox"
+runner_args = ["-e", "py37-recommended"]
+patterns = ["*.py"]
+ignore_patterns = []
diff --git a/tox.ini b/tox.ini
index 5a39d27..09a656b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@ skip_missing_interpreters = False
 
 [testenv:py{310}]
 extras = test
-commands = pytest {posargs} --ff -vv
+commands = pytest {posargs} --ff --nf -vv
 
 [testenv:py{310}-cov]
 extras = test
@@ -17,7 +17,7 @@ commands = pytest --cov={envsitepackagesdir}/mdformat_mkdocs {posargs}
 
 [testenv:py{37}-recommended]
 extras = recommended,test
-commands = pytest {posargs} --ff -vv
+commands = pytest {posargs} --ff --nf -vv --exitfirst
 
 [testenv:py{310}-pre-commit]
 extras = dev
@@ -31,4 +31,4 @@ commands = pre-commit run --config .pre-commit-test.yaml {posargs:--all-files --
 max-line-length = 88
 max-complexity = 10
 # These checks violate PEP8 so let's ignore them
-extend-ignore = E203
+extend-ignore = E203,W503