Drop hookimpl

Author: rupert

pyls_black/plugin.py

@@ -1,59 +1,38 @@
-from typing import NamedTuple
-
 import black
 from pyls import hookimpl
 
 
-@hookimpl(hookwrapper=True)
+@hookimpl
 def pyls_format_document(document):
     return format_document(document)
 
 
-@hookimpl(hookwrapper=True)
+@hookimpl
 def pyls_format_range(document, range):
-    selection = Selection(start=range["start"]["line"], end=range["end"]["line"] + 1)
-    return format_document(document, selection)
-
-
-class Selection(NamedTuple):
-    start: int
-    end: int
-
-    def to_range(self):
-        return {
-            "start": {"line": self.start, "character": 0},
-            "end": {"line": self.end, "character": 0},
-        }
-
-
-def format_document(document, selection=None):
-    outcome = yield
+    range["start"]["character"] = 0
+    range["end"]["line"] += 1
+    range["end"]["character"] = 0
+    return format_document(document, range)
 
-    result = outcome.get_result()
 
-    if result:
-        text = result[0]["newText"]
+def format_document(document, range=None):
+    if range:
+        start = range["start"]["line"]
+        end = range["end"]["line"]
+        text = "".join(document.lines[start:end])
     else:
         text = document.source
-
-    if selection:
-        text = select_text(text, selection)
-    else:
-        selection = Selection(0, len(document.lines))
+        range = {
+            "start": {"line": 0, "character": 0},
+            "end": {"line": len(document.lines), "character": 0},
+        }
 
     try:
         formatted_text = format_text(text)
     except (ValueError, black.NothingChanged):
-        return
-
-    new_result = [{"range": selection.to_range(), "newText": formatted_text}]
-
-    outcome.force_result(new_result)
-
+        return []
 
-def select_text(text, selection):
-    lines = text.splitlines(True)
-    return "".join(lines[selection.start : selection.end])
+    return [{"range": range, "newText": formatted_text}]
 
 
 def format_text(text):

setup.py

@@ -20,6 +20,6 @@
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.6",
         "License :: OSI Approved :: MIT License",
-        "Operating System :: OS Independent"
+        "Operating System :: OS Independent",
     ),
 )

tests/test_plugin.py

@@ -30,79 +30,36 @@ def invalid_document():
     return Document(uri)
 
 
-def run(g, outcome):
-    next(g)
-
-    with pytest.raises(StopIteration):
-        g.send(outcome)
-
-
 def test_pyls_format_document(unformatted_document, formatted_document):
     mock = Mock()
     mock.get_result.return_value = None
 
-    g = pyls_format_document(unformatted_document)
-    run(g, mock)
-
-    mock.force_result.assert_called_once_with(
-        [
-            {
-                "range": {
-                    "start": {"line": 0, "character": 0},
-                    "end": {"line": 2, "character": 0},
-                },
-                "newText": formatted_document.source,
-            }
-        ]
-    )
+    result = pyls_format_document(unformatted_document)
 
-
-def test_pyls_format_document_with_result(unformatted_document):
-    mock = Mock()
-    mock.get_result.return_value = [
+    assert result == [
         {
             "range": {
                 "start": {"line": 0, "character": 0},
-                "end": {"line": 1, "character": 0},
+                "end": {"line": 2, "character": 0},
             },
-            "newText": "x = 1+2\n",
+            "newText": formatted_document.source,
         }
     ]
 
-    g = pyls_format_document(unformatted_document)
-    run(g, mock)
-
-    mock.force_result.assert_called_once_with(
-        [
-            {
-                "range": {
-                    "start": {"line": 0, "character": 0},
-                    "end": {"line": 2, "character": 0},
-                },
-                "newText": "x = 1 + 2\n",
-            }
-        ]
-    )
-
 
 def test_pyls_format_document_unchanged(formatted_document):
     mock = Mock()
     mock.get_result.return_value = None
 
-    g = pyls_format_document(formatted_document)
-    run(g, mock)
-
-    mock.force_result.assert_not_called()
+    result = pyls_format_document(formatted_document)
 
+    assert result == []
 
-def test_pyls_format_document_supresses_syntax_errors(invalid_document):
-    mock = Mock()
-    mock.get_result.return_value = None
 
-    g = pyls_format_document(invalid_document)
-    run(g, mock)
+def test_pyls_format_document_syntax_error(invalid_document):
+    result = pyls_format_document(invalid_document)
 
-    mock.force_result.assert_not_called()
+    assert result == []
 
 
 @pytest.mark.parametrize(
@@ -115,62 +72,30 @@ def test_pyls_format_range(unformatted_document, start, end, expected):
         "end": {"line": end, "character": 0},
     }
 
-    mock = Mock()
-    mock.get_result.return_value = None
-
-    g = pyls_format_range(unformatted_document, range=range)
-    run(g, mock)
+    result = pyls_format_range(unformatted_document, range=range)
 
-    mock.force_result.assert_called_once_with(
-        [
-            {
-                "range": {
-                    "start": {"line": start, "character": 0},
-                    "end": {"line": end + 1, "character": 0},
-                },
-                "newText": expected,
-            }
-        ]
-    )
-
-
-def test_pyls_format_range_with_result(unformatted_document):
-    range = {"start": {"line": 0, "character": 0}, "end": {"line": 0, "character": 0}}
-
-    mock = Mock()
-    mock.get_result.return_value = [
+    assert result == [
         {
             "range": {
-                "start": {"line": 0, "character": 0},
-                "end": {"line": 2, "character": 0},
+                "start": {"line": start, "character": 0},
+                "end": {"line": end + 1, "character": 0},
             },
-            "newText": "x = 1+2\ny = 3+4\n",
+            "newText": expected,
         }
     ]
 
-    g = pyls_format_range(unformatted_document, range=range)
-    run(g, mock)
-
-    mock.force_result.assert_called_once_with(
-        [
-            {
-                "range": {
-                    "start": {"line": 0, "character": 0},
-                    "end": {"line": 1, "character": 0},
-                },
-                "newText": "x = 1 + 2\n",
-            }
-        ]
-    )
-
 
 def test_pyls_format_range_unchanged(formatted_document):
     range = {"start": {"line": 0, "character": 0}, "end": {"line": 1, "character": 0}}
 
-    mock = Mock()
-    mock.get_result.return_value = None
+    result = pyls_format_range(formatted_document, range=range)
+
+    assert result == []
+
+
+def test_pyls_format_range_syntax_error(invalid_document):
+    range = {"start": {"line": 0, "character": 0}, "end": {"line": 1, "character": 0}}
 
-    g = pyls_format_range(formatted_document, range=range)
-    run(g, mock)
+    result = pyls_format_range(invalid_document, range=range)
 
-    mock.force_result.assert_not_called()
+    assert result == []