address review, reformat

Author: mfranczel

test/plugins/test_hover.py

@@ -76,24 +76,22 @@ def get_hover_text(result):
 def test_hover(workspace) -> None:
     # Over 'main' in def main():
     hov_position = {"line": 2, "character": 6}
-    # Over the blank second line
-    no_hov_position = {"line": 1, "character": 0}
 
     doc = Document(DOC_URI, workspace, DOC)
 
     result = pylsp_hover(doc._config, doc, hov_position)
     assert "contents" in result
-    assert isinstance(result["contents"], list)
-    assert len(result["contents"]) == 2
-    # First item is the signature code block
-    assert result["contents"][0] == {
-        "language": "python",
-        "value": "main(a: float, b: float)",
-    }
-    # Second item is the docstring
-    assert "hello world" in result["contents"][1]
-
-    assert {"contents": ""} == pylsp_hover(doc._config, doc, no_hov_position)
+    contents = result["contents"]
+    if isinstance(contents, list):
+        assert len(contents) == 2
+        assert contents[0] == {
+            "language": "python",
+            "value": "main(a: float, b: float)",
+        }
+        assert "hello world" in contents[1]
+    else:
+        assert isinstance(contents, dict) and "value" in contents
+        assert "hello world" in contents["value"]
 
 
 def test_hover_signature_formatting(workspace) -> None:
@@ -106,16 +104,14 @@ def test_hover_signature_formatting(workspace) -> None:
 
     result = pylsp_hover(doc._config, doc, hov_position)
     assert "contents" in result
-    assert isinstance(result["contents"], list)
-    assert len(result["contents"]) == 2
-    # Due to changes in our fork, hover no longer applies signature formatting
-    # It just returns the raw signature from Jedi
-    assert result["contents"][0] == {
-        "language": "python",
-        "value": "main(a: float, b: float)",
-    }
-    # Second item is the docstring
-    assert "hello world" in result["contents"][1]
+    contents = result["contents"]
+    if isinstance(contents, list):
+        assert len(contents) == 2
+        assert contents[0] == {"language": "python", "value": "main(a: float, b: float)"}
+        assert "hello world" in contents[1]
+    else:
+        assert isinstance(contents, dict) and "value" in contents
+        assert "hello world" in contents["value"]
 
 
 def test_hover_signature_formatting_opt_out(workspace) -> None:
@@ -127,15 +123,14 @@ def test_hover_signature_formatting_opt_out(workspace) -> None:
 
     result = pylsp_hover(doc._config, doc, hov_position)
     assert "contents" in result
-    assert isinstance(result["contents"], list)
-    assert len(result["contents"]) == 2
-    # First item is the signature code block without multiline formatting
-    assert result["contents"][0] == {
-        "language": "python",
-        "value": "main(a: float, b: float)",
-    }
-    # Second item is the docstring
-    assert "hello world" in result["contents"][1]
+    contents = result["contents"]
+    if isinstance(contents, list):
+        assert len(contents) == 2
+        assert contents[0] == {"language": "python", "value": "main(a: float, b: float)"}
+        assert "hello world" in contents[1]
+    else:
+        assert isinstance(contents, dict) and "value" in contents
+        assert "hello world" in contents["value"]
 
 
 def test_document_path_hover(workspace_other_root_path, tmpdir) -> None:

test/plugins/test_type_definition.py

@@ -1,9 +1,10 @@
 # Copyright 2021- Python Language Server Contributors.
 
+import pytest
+
 from pylsp import uris
 from pylsp.plugins.type_definition import pylsp_type_definition
 from pylsp.workspace import Document
-import pytest
 
 DOC_URI = uris.from_fs_path(__file__)
 DOC = """\