missing end loop, dtc

Author: mcspr

tests/restyle.py

@@ -5,9 +5,10 @@
 import sys
 import pathlib
 import subprocess
-import collections
 import contextlib
 
+from dataclasses import dataclass
+
 GIT_ROOT = pathlib.Path(
     subprocess.check_output(
         ["git", "rev-parse", "--show-toplevel"], universal_newlines=True
@@ -79,7 +80,20 @@ def find_arduino_files():
 }
 
 
-Changed = collections.namedtuple("changed", "file hunk lines")
+@dataclass
+class Changed:
+    file: str
+    hunk: list[str]
+    lines: list[str]
+
+
+@dataclass
+class Context:
+    append_hunk: bool
+    deleted: bool
+    file: str
+    hunk: list[str]
+    markers: list[str]
 
 
 # naive git-diff parser for clang-format aftercare
@@ -94,41 +108,49 @@ def changed_files():
         universal_newlines=True,
     )
 
-    out = []
+    def reset_context(line):
+        if line:
+            hunk = [line]
+        else:
+            hunk = []
+
+        return Context(
+            append_hunk=False,
+            deleted=False,
+            file="",
+            hunk=hunk,
+            markers=[],
+        )
 
-    deleted = False
-    file = ""
-    lines = []
+    def pop(out, context, line):
+        if ctx.file and ctx.hunk and ctx.markers:
+            out.append(Changed(ctx.file, "\n".join(ctx.hunk), ", ".join(ctx.markers)))
 
-    append_hunk = False
-    hunk = []
+        context = reset_context(line)
+
+    out = []
+    ctx = reset_context(None)
 
     for line in proc.stdout.split("\n"):
         # '--- a/path/to/changed/file' most likely
         if line.startswith("---"):
-            if file and hunk and lines:
-                out.append(Changed(file, "\n".join(hunk), ", ".join(lines)))
-
-            deleted = False
-            file = ""
-            lines = []
-
-            append_hunk = False
-            hunk = [line]
+            pop(out, ctx, line)
 
         # '+++ b/path/to/changed/file' most likely
         # '+++ /dev/null' aka removed file
         elif line.startswith("+++"):
-            hunk.append(line)
+            ctx.hunk.append(line)
 
             _, file = line.split(" ")
             deleted = "/dev/null" in file
             if not deleted:
-                file = file[2:]
+                ctx.file = file[2:]
+            else:
+                ctx.file = file
 
         # @@ from-file-line-numbers to-file-line-numbers @@
-        elif not deleted and line.startswith("@@"):
-            hunk.append(line)
+        elif not ctx.deleted and line.startswith("@@"):
+            ctx.hunk.append(line)
 
             _, _, numbers, _ = line.split(" ", 3)
             if "," in numbers:
@@ -137,12 +159,14 @@ def changed_files():
             numbers = numbers.replace("+", "")
             numbers = numbers.replace("-", "")
 
-            lines.append(numbers)
-            append_hunk = True
+            ctx.markers.append(numbers)
+            ctx.append_hunk = True
 
         # capture diff for the summary
-        elif append_hunk and line.startswith(("+", "-", " ")):
-            hunk.append(line)
+        elif ctx.append_hunk and line.startswith(("+", "-", " ")):
+            ctx.hunk.append(line)
+
+    pop(out, ctx, line)
 
     return out