Use diff minimising logic for pyright (#173)

Author: hauntsaninja

mypy_primer/model.py

@@ -222,15 +222,6 @@ async def run_mypy(
                 if not line.startswith(str(typeshed_dir / "stubs"))
             )
 
-        # Redact "note" lines which contain base_dir
-        # Avoids noisy diffs when e.g., mypy points to a stub definition
-        base_dir_re = (
-            f"({re.escape(str(ctx.get().base_dir))}"
-            f"|{re.escape(str(ctx.get().base_dir.resolve()))})"
-            ".*: note:"
-        )
-        output = re.sub(base_dir_re, "note:", output)
-
         # Avoids some noise in tracebacks
         if "error: INTERNAL ERROR" in output:
             output = re.sub('File ".*/mypy', 'File "', output)
@@ -524,6 +515,21 @@ def _get_diff(self) -> str:
         old_output = self.old_result.output
         new_output = self.new_result.output
 
+        # Redact lines which contain essentially "{base_dir}.*" before a colon
+        # Avoids noisy diffs when e.g. a type checker points to a stub definition
+        base_dir_re = (
+            r"^(?P<header>[^:]*?)"
+            f"(?:{re.escape(str(ctx.get().base_dir.resolve()))}"
+            f"|{re.escape(str(ctx.get().base_dir))})"
+            "[^:]*(?P<trailer>(:|$))"
+        )
+        old_output = re.sub(
+            base_dir_re, r"\g<header>...\g<trailer>", old_output, flags=re.MULTILINE
+        )
+        new_output = re.sub(
+            base_dir_re, r"\g<header>...\g<trailer>", new_output, flags=re.MULTILINE
+        )
+
         old_lines = old_output.splitlines()
         new_lines = new_output.splitlines()