Make annotator functional.

Author: kaste

PyTest.py

@@ -9,7 +9,6 @@
 from . import settings
 
 
-Annotator = annotator.Annotator()
 Settings = settings.Settings('PyTest')
 
 
@@ -218,7 +217,7 @@ def on_modified_async(self, view):
 
 class PytestMarkCurrentViewCommand(sublime_plugin.EventListener):
     def on_activated_async(self, view):
-        Annotator.annotate(view, **State)
+        annotator.annotate(view, **State)
 
 
 class PytestStart(sublime_plugin.WindowCommand):
@@ -255,7 +254,7 @@ def run(self, errors):
             'phantom_sets': {},
         })
 
-        Annotator.annotate_visible_views(**State)
+        annotator.annotate_visible_views(**State)
 
 
 class PytestWillFail(sublime_plugin.WindowCommand):

annotator.py

@@ -36,96 +36,96 @@
 
 PHANTOMS_MARKER = 'PyTestRunner'
 
-class Annotator:
 
-    def annotate(self, view, errors={}, mode='auto', running=False,
-                 drawn_views=set(), phantom_sets={}, **kwargs_):
+def annotate(view, errors={}, mode='auto', running=False,
+             drawn_views=set(), phantom_sets={}, **kwargs_):
 
-        buffer_id = view.buffer_id()
-        if buffer_id in drawn_views:
-            return
+    buffer_id = view.buffer_id()
+    if buffer_id in drawn_views:
+        return
 
-        errs = get_errors_for_view(view, errors)
-        if errs is None:
-            # As long the tests are still running, we just don't know if
-            # the view really is clean. To reduce visual clutter, we return
-            # immediately.
-            if running:
-                return
-            view.erase_regions(REGIONS_MARKER)
-            drawn_views.add(buffer_id)
+    errs = get_errors_for_view(view, errors)
+    if errs is None:
+        # As long the tests are still running, we just don't know if
+        # the view really is clean. To reduce visual clutter, we return
+        # immediately.
+        if running:
             return
-
-        self._draw_regions(view, errs)
-        self._draw_phantoms(view, errs, mode, phantom_sets)
+        view.erase_regions(REGIONS_MARKER)
         drawn_views.add(buffer_id)
+        return
+
+    _draw_regions(view, errs)
+    _draw_phantoms(view, errs, mode, phantom_sets)
+    drawn_views.add(buffer_id)
+
+def annotate_visible_views(**kwargs):
+    window = sublime.active_window()
 
-    def _draw_regions(self, view, errs):
-        regions = [view.full_line(view.text_point(tbck['line'] - 1, 0))
-                   for tbck in errs]
+    views = [window.active_view_in_group(group)
+             for group in range(window.num_groups())]
 
-        view.add_regions(REGIONS_MARKER, regions,
-                         REGIONS_STYLE,
-                         REGIONS_ICON,
-                         sublime.DRAW_OUTLINED)
+    for view in views:
+        annotate(view, **kwargs)
 
-    def _draw_phantoms(self, view, errs, mode='auto', phantom_sets=set()):
-        formatter = formatters.TB_MODES[mode]
-        phantoms = []
 
-        show_focus_links = len(errs) > 1
-        for tbck in errs:
-            line = tbck['line']
-            text = tbck['text']
-            testcase = tbck.get('testcase')
+def _draw_regions(view, errs):
+    regions = [view.full_line(view.text_point(tbck['line'] - 1, 0))
+               for tbck in errs]
 
-            if text == '':
-                continue
+    view.add_regions(REGIONS_MARKER, regions,
+                     REGIONS_STYLE,
+                     REGIONS_ICON,
+                     sublime.DRAW_OUTLINED)
 
-            pt = view.text_point(line - 1, 0)
-            indentation = get_indentation_at(view, pt)
-            text = formatter.format_text(text, indentation)
+def _draw_phantoms(view, errs, mode, phantom_sets):
+    formatter = formatters.TB_MODES[mode]
+    phantoms = []
 
-            if show_focus_links and testcase:
-                focus_link = (
-                    ' <a href="focus:{}">focus test</a>'.format(testcase))
+    show_focus_links = len(errs) > 1
+    for tbck in errs:
+        line = tbck['line']
+        text = tbck['text']
+        testcase = tbck.get('testcase')
 
-                lines = text.split('<br />')
-                text = '<br />'.join([lines[0] + focus_link] + lines[1:])
+        if text == '':
+            continue
 
-            phantoms.append(sublime.Phantom(
-                sublime.Region(pt, view.line(pt).b),
-                ('<body id=inline-error>' + STYLESHEET +
-                    '<div class="error">' +
-                    '<span class="message">' + text + '</span>' +
-                    '</div>' +
-                    '</body>'),
-                sublime.LAYOUT_BELOW, self._on_navigate))
+        pt = view.text_point(line - 1, 0)
+        indentation = get_indentation_at(view, pt)
+        text = formatter.format_text(text, indentation)
 
-        buffer_id = view.buffer_id()
-        if buffer_id not in phantom_sets:
-            phantom_set = sublime.PhantomSet(view, PHANTOMS_MARKER)
-            phantom_sets[buffer_id] = phantom_set
-        else:
-            phantom_set = phantom_sets[buffer_id]
+        if show_focus_links and testcase:
+            focus_link = (
+                ' <a href="focus:{}">focus test</a>'.format(testcase))
 
-        phantom_set.update(phantoms)
+            lines = text.split('<br />')
+            text = '<br />'.join([lines[0] + focus_link] + lines[1:])
 
-    def _on_navigate(self, url):
-        # split off 'focus:'
-        testcase = url[6:]
-        sublime.active_window().run_command(
-            "pytest_auto_run", {'target': testcase})
+        phantoms.append(sublime.Phantom(
+            sublime.Region(pt, view.line(pt).b),
+            ('<body id=inline-error>' + STYLESHEET +
+                '<div class="error">' +
+                '<span class="message">' + text + '</span>' +
+                '</div>' +
+                '</body>'),
+            sublime.LAYOUT_BELOW, _on_navigate))
 
+    buffer_id = view.buffer_id()
+    if buffer_id not in phantom_sets:
+        phantom_set = sublime.PhantomSet(view, PHANTOMS_MARKER)
+        phantom_sets[buffer_id] = phantom_set
+    else:
+        phantom_set = phantom_sets[buffer_id]
 
-    def annotate_visible_views(self, **kwargs):
-        window = sublime.active_window()
+    phantom_set.update(phantoms)
 
-        views = [window.active_view_in_group(group)
-                 for group in range(window.num_groups())]
+def _on_navigate(url):
+    # split off 'focus:'
+    testcase = url[6:]
+    sublime.active_window().run_command(
+        "pytest_auto_run", {'target': testcase})
 
-        for view in views:
-            self.annotate(view, **kwargs)
 
 
 def get_errors_for_view(view, errors_by_view):