Add jedi_ plugin prefix for consistency.

Author: Hoblovski

CONFIGURATION.md

@@ -33,7 +33,7 @@ This server can be configured using the `workspace/didChangeConfiguration` metho
 | `pylsp.plugins.jedi_completion.resolve_at_most` | `integer` | How many labels and snippets (at most) should be resolved? | `25` |
 | `pylsp.plugins.jedi_completion.cache_for` | `array` of `string` items | Modules for which labels and snippets should be cached. | `["pandas", "numpy", "tensorflow", "matplotlib"]` |
 | `pylsp.plugins.jedi_definition.enabled` | `boolean` | Enable or disable the plugin. | `true` |
-| `pylsp.plugins.type_definition.enabled` | `boolean` | Enable or disable the plugin. | `true` |
+| `pylsp.plugins.jedi_type_definition.enabled` | `boolean` | Enable or disable the plugin. | `true` |
 | `pylsp.plugins.jedi_definition.follow_imports` | `boolean` | The goto call will follow imports. | `true` |
 | `pylsp.plugins.jedi_definition.follow_builtin_imports` | `boolean` | If follow_imports is True will decide if it follow builtin imports. | `true` |
 | `pylsp.plugins.jedi_definition.follow_builtin_definitions` | `boolean` | Follow builtin and extension definitions to stubs. | `true` |

pylsp/config/schema.json

@@ -225,11 +225,6 @@
       "default": true,
       "description": "Enable or disable the plugin."
     },
-    "pylsp.plugins.type_definition.enabled": {
-      "type": "boolean",
-      "default": true,
-      "description": "Enable or disable the plugin."
-    },
     "pylsp.plugins.jedi_definition.follow_imports": {
       "type": "boolean",
       "default": true,
@@ -275,6 +270,11 @@
       "default": true,
       "description": "If True includes symbols imported from other libraries."
     },
+    "pylsp.plugins.jedi_type_definition.enabled": {
+      "type": "boolean",
+      "default": true,
+      "description": "Enable or disable the plugin."
+    },
     "pylsp.plugins.mccabe.enabled": {
       "type": "boolean",
       "default": true,

pylsp/plugins/type_definition.py

@@ -1,11 +1,9 @@
-# Copyright 2017-2020 Palantir Technologies, Inc.
 # Copyright 2021- Python Language Server Contributors.
 
 import logging
 
 from pylsp import _utils, hookimpl
 
-
 log = logging.getLogger(__name__)
 
 

pylsp/python_lsp.py

@@ -766,7 +766,9 @@ def m_text_document__definition(self, textDocument=None, position=None, **_kwarg
             return self._cell_document__definition(document, position, **_kwargs)
         return self.definitions(textDocument["uri"], position)
 
-    def m_text_document__type_definition(self, textDocument=None, position=None, **_kwargs):
+    def m_text_document__type_definition(
+        self, textDocument=None, position=None, **_kwargs
+    ):
         return self.type_definition(textDocument["uri"], position)
 
     def m_text_document__document_highlight(

pyproject.toml

@@ -66,7 +66,7 @@ folding = "pylsp.plugins.folding"
 flake8 = "pylsp.plugins.flake8_lint"
 jedi_completion = "pylsp.plugins.jedi_completion"
 jedi_definition = "pylsp.plugins.definition"
-type_definition = "pylsp.plugins.type_definition"
+jedi_type_definition = "pylsp.plugins.type_definition"
 jedi_hover = "pylsp.plugins.hover"
 jedi_highlight = "pylsp.plugins.highlight"
 jedi_references = "pylsp.plugins.references"

test/plugins/test_type_definition.py

@@ -1,8 +1,5 @@
-# Copyright 2017-2020 Palantir Technologies, Inc.
 # Copyright 2021- Python Language Server Contributors.
 
-import os
-
 from pylsp import uris
 from pylsp.plugins.type_definition import pylsp_type_definition
 from pylsp.workspace import Document
@@ -45,7 +42,6 @@ def test_builtin_definition(config, workspace) -> None:
     cursor_pos = {"line": 8, "character": 9}
 
     doc = Document(DOC_URI, workspace, DOC)
-    orig_settings = config.settings()
 
     defns = pylsp_type_definition(config, doc, cursor_pos)
     assert len(defns) == 1
@@ -95,9 +91,6 @@ def main() -> None:
     # The position where IntPair is called in main.py
     cursor_pos = {"line": 5, "character": 14}
 
-    print("!URI", module_uri)
-    print("!URI", doc_uri)
-
     assert [{"uri": module_uri, "range": def_range}] == pylsp_type_definition(
         config, doc, cursor_pos
     )