Simplify hook usage, do not use default args

as these are not supported by pluggy

Author: krassowski

pylsp/_utils.py

@@ -209,6 +209,10 @@ def choose_markup_kind(client_supported_markup_kinds: List[str]):
     return "markdown"
 
 
+def convert_signatures_to_markdown(signatures: List[str]) -> str:
+    return wrap_signature("\n".join(signatures))
+
+
 def format_docstring(
     contents: str,
     markup_kind: str,
@@ -235,11 +239,11 @@ def format_docstring(
             value = escape_markdown(contents)
 
         if signatures:
-            if signatures_to_markdown is None:
-                wrapped_signatures = wrap_signature("\n".join(signatures))
-            else:
-                wrapped_signatures = signatures_to_markdown(signatures)
-
+            wrapped_signatures = (
+                signatures_to_markdown(signatures)
+                if signatures_to_markdown
+                else convert_signatures_to_markdown(signatures)
+            )
             value = wrapped_signatures + "\n\n" + value
 
         return {"kind": "markdown", "value": value}

pylsp/plugins/hover.py

@@ -9,7 +9,7 @@
 
 
 @hookimpl
-def pylsp_hover(config, document, position, signatures_to_markdown=None):
+def pylsp_hover(config, document, position, signatures_to_markdown):
     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

@@ -37,7 +37,7 @@
 
 
 @hookimpl
-def pylsp_completions(config, document, position, signatures_to_markdown=None):
+def pylsp_completions(config, document, position, signatures_to_markdown):
     """Get formatted completions for current code position"""
     settings = config.plugin_settings("jedi_completion", document_path=document.path)
     resolve_eagerly = settings.get("eager", False)
@@ -142,7 +142,7 @@ def pylsp_completions(config, document, position, signatures_to_markdown=None):
 
 @hookimpl
 def pylsp_completion_item_resolve(
-    config, completion_item, document, signatures_to_markdown=None
+    config, completion_item, document, signatures_to_markdown
 ):
     """Resolve formatted completion for given non-resolved completion"""
     shared_data = document.shared_data["LAST_JEDI_COMPLETIONS"].get(

pylsp/python_lsp.py

@@ -900,13 +900,10 @@ def m_workspace__did_change_watched_files(self, changes=None, **_kwargs):
     def m_workspace__execute_command(self, command=None, arguments=None):
         return self.execute_command(command, arguments)
 
-    @property
-    def _signatures_to_markdown(self):
-        if not hasattr(self, "_signatures_to_markdown_hook"):
-            self._signatures_to_markdown_hook = self._hook(
-                "pylsp_signatures_to_markdown"
-            )
-        return self._signatures_to_markdown_hook
+    def _signatures_to_markdown(self, signatures):
+        return self._hook(
+            "pylsp_signatures_to_markdown", signatures=signatures
+        ) or _utils.convert_signatures_to_markdown(signatures=signatures)
 
 
 def flatten(list_of_lists):