Merge pull request #50 from kaste/merge-notes

fredcallaway · web-flow · commit 1066cacf0ac9 · 2022-08-29T20:23:33.000-04:00
Small iteration on the plugin
diff --git a/linter.py b/linter.py
@@ -21,13 +21,13 @@
 import threading
 import getpass
 
-from SublimeLinter.lint import PythonLinter
+from SublimeLinter.lint import LintMatch, PythonLinter
 from SublimeLinter.lint.linter import PermanentError
 
 
 MYPY = False
 if MYPY:
-    from typing import Dict, DefaultDict, Optional, Protocol
+    from typing import Dict, DefaultDict, Iterator, List, Optional, Protocol
 
     class TemporaryDirectory(Protocol):
         name = None  # type: str
@@ -53,7 +53,7 @@ class Mypy(PythonLinter):
 
     regex = (
         r'^(?P<filename>.+?):(?P<line>\d+):((?P<col>\d+):)?\s*'
-        r'(?P<error_type>[^:]+):\s*(?P<message>.+?)(\s\s\[(?P<code>.+)\])?$'
+        r'(?P<error_type>[^:]+):\s(?P<message>.+?)(\s\s\[(?P<code>.+)\])?$'
     )
     line_col_base = (1, 1)
     tempfile_suffix = 'py'
@@ -77,6 +77,7 @@ def cmd(self):
             '${args}',
             '--show-column-numbers',
             '--hide-error-context',
+            '--no-error-summary',
         ]
         if self.filename:
             cmd.extend([
@@ -120,6 +121,29 @@ def run(self, cmd, code):
         with locks[self.get_working_dir()]:
             return super().run(cmd, code)
 
+    def find_errors(self, output):
+        # type: (str) -> Iterator[LintMatch]
+        errors = []  # type: List[LintMatch]
+        for error in super().find_errors(output):
+            # `"x" defined here` notes are unsorted and not helpful
+            # See: https://github.com/python/mypy/issues/10480
+            # Introduced: https://github.com/python/mypy/pull/926
+            if error.message.endswith(' defined here'):
+                continue
+
+            if error.error_type == 'note':
+                try:
+                    previous = errors[-1]
+                except IndexError:
+                    pass
+                else:
+                    if previous.line == error.line and previous.col == error.col:
+                        previous['message'] += '\n{}'.format(error.message)
+                        continue
+
+            errors.append(error)
+        yield from errors
+
 
 class FakeTemporaryDirectory:
     def __init__(self, name):
