Fixes

Author: krassowski

pylsp/_utils.py

@@ -7,6 +7,8 @@
 import os
 import pathlib
 import re
+import subprocess
+import sys
 import threading
 import time
 from typing import Callable, List, Optional
@@ -245,22 +247,22 @@ def _is_available_via_cli(self) -> bool:
                 ],
             )
             return True
-        except CalledProcessError:
+        except subprocess.CalledProcessError:
             return False
 
 
-class RuffFormatter:
+class RuffFormatter(Formatter):
     command = ["ruff", "format"]
 
 
-class BlackFormatter:
+class BlackFormatter(Formatter):
     command = ["black"]
 
 
 formatters = {"ruff": RuffFormatter(), "black": BlackFormatter()}
 
 
-def format_signature(signature: str, signature_formatter: str) -> str:
+def format_signature(signature: str, config: dict, signature_formatter: str) -> str:
     """Formats signature using ruff or black if either is available."""
     as_func = f"def {signature.strip()}:\n    pass"
     line_length = config.get("line_length", 88)
@@ -286,7 +288,10 @@ def convert_signatures_to_markdown(signatures: List[str], config: dict) -> str:
     signature_formatter = config.get("format", "black")
     if signature_formatter:
         signatures = [
-            format_signature(signature, config=config) for signature in signatures
+            format_signature(
+                signature, signature_formatter=signature_formatter, config=config
+            )
+            for signature in signatures
         ]
     return wrap_signature("\n".join(signatures))
 

pylsp/plugins/hover.py

@@ -10,7 +10,7 @@
 
 @hookimpl
 def pylsp_hover(config, document, position):
-    signature_config = config.settings.get("signatures", {})
+    signature_config = config.settings().get("signature", {})
     code_position = _utils.position_to_jedi_linecolumn(document, position)
     definitions = document.jedi_script(use_document_path=True).infer(**code_position)
     word = document.word_at_position(position)

pylsp/plugins/jedi_completion.py

@@ -41,7 +41,7 @@ def pylsp_completions(config, document, position):
     """Get formatted completions for current code position"""
     settings = config.plugin_settings("jedi_completion", document_path=document.path)
     resolve_eagerly = settings.get("eager", False)
-    signature_config = config.settings.get("signatures", {})
+    signature_config = config.settings().get("signature", {})
 
     code_position = _utils.position_to_jedi_linecolumn(document, position)
     code_position["fuzzy"] = settings.get("fuzzy", False)
@@ -165,7 +165,7 @@ def pylsp_completion_item_resolve(
             completion,
             data,
             markup_kind=preferred_markup_kind,
-            signature_config=config.settings.get("signatures", {}),
+            signature_config=config.settings().get("signature", {}),
         )
     return completion_item
 

test/plugins/test_hover.py

@@ -23,8 +23,6 @@ def main(a: float, b: float):
 
 """
 
-pylsp_hover = partial(pylsp_hover, signatures_to_markdown=None)
-
 
 def test_numpy_hover(workspace) -> None:
     # Over the blank line
@@ -92,15 +90,17 @@ def test_hover(workspace) -> None:
     assert {"contents": ""} == pylsp_hover(doc._config, doc, no_hov_position)
 
 
-def test_hover_custom_signature(workspace) -> None:
+def test_hover_signature_formatting(workspace) -> None:
     # Over 'main' in def main():
     hov_position = {"line": 2, "character": 6}
 
     doc = Document(DOC_URI, workspace, DOC)
+    # setting low line length should trigger reflow to multiple lines
+    doc._config.update({"signature": {"line_length": 10}})
 
     contents = {
         "kind": "markdown",
-        "value": "```python\nmain(\n    a: float,\n    b: float\n)\n```\n\n\nhello world",
+        "value": "```python\nmain(\n    a: float,\n    b: float,\n)\n```\n\n\nhello world",
     }
 
     assert {"contents": contents} == pylsp_hover(doc._config, doc, hov_position)