feat: update plugin to new api

Author: hlouzada

pylsp/plugins/_resolvers.py

@@ -7,7 +7,7 @@
 
 from jedi.api.classes import Completion
 
-from pylsp import lsp
+from lsprotocol import types as lsp
 
 log = logging.getLogger(__name__)
 

pylsp/plugins/flake8_lint.py

@@ -12,7 +12,8 @@
 
 from flake8.plugins.pyflakes import FLAKE8_PYFLAKES_CODES
 
-from pylsp import hookimpl, lsp
+from pylsp import hookimpl
+from lsprotocol import types as lsp
 from pylsp.plugins.pyflakes_lint import PYFLAKES_ERROR_MESSAGES
 
 log = logging.getLogger(__name__)
@@ -42,7 +43,7 @@ def pylsp_settings():
 
 
 @hookimpl
-def pylsp_lint(workspace, document):
+def pylsp_lint(config, workspace, document, is_saved):  # noqa: ARG001 (is_saved unused)
     with workspace.report_progress("lint: flake8"):
         config = workspace._config
         settings = config.plugin_settings("flake8", document_path=document.path)

pylsp/plugins/highlight.py

@@ -3,13 +3,14 @@
 
 import logging
 
-from pylsp import _utils, hookimpl, lsp
+from pylsp import _utils, hookimpl
+from lsprotocol import types as lsp
 
 log = logging.getLogger(__name__)
 
 
 @hookimpl
-def pylsp_document_highlight(document, position):
+def pylsp_document_highlight(config, workspace, document, position):
     code_position = _utils.position_to_jedi_linecolumn(document, position)
     usages = document.jedi_script().get_references(**code_position)
 

pylsp/plugins/jedi_completion.py

@@ -6,7 +6,8 @@
 
 import parso
 
-from pylsp import _utils, hookimpl, lsp
+from pylsp import _utils, hookimpl
+from lsprotocol import types as lsp
 from pylsp.plugins._resolvers import LABEL_RESOLVER, SNIPPET_RESOLVER
 
 log = logging.getLogger(__name__)
@@ -36,7 +37,7 @@
 
 
 @hookimpl
-def pylsp_completions(config, document, position):
+def pylsp_completions(config, workspace, document, position, ignored_names=None):
     """Get formatted completions for current code position"""
     settings = config.plugin_settings("jedi_completion", document_path=document.path)
     resolve_eagerly = settings.get("eager", False)
@@ -143,8 +144,9 @@ def pylsp_completions(config, document, position):
 @hookimpl
 def pylsp_completion_item_resolve(
     config,
-    completion_item,
+    workspace,
     document,
+    completion_item,
 ):
     """Resolve formatted completion for given non-resolved completion"""
     shared_data = document.shared_data["LAST_JEDI_COMPLETIONS"].get(

pylsp/plugins/mccabe_lint.py

@@ -6,7 +6,8 @@
 
 import mccabe
 
-from pylsp import hookimpl, lsp
+from pylsp import hookimpl
+from lsprotocol import types as lsp
 
 log = logging.getLogger(__name__)
 
@@ -15,7 +16,7 @@
 
 
 @hookimpl
-def pylsp_lint(config, workspace, document):
+def pylsp_lint(config, workspace, document, is_saved):  # noqa: ARG001 (is_saved unused)
     with workspace.report_progress("lint: mccabe"):
         threshold = config.plugin_settings("mccabe", document_path=document.path).get(
             THRESHOLD, DEFAULT_THRESHOLD

pylsp/plugins/pycodestyle_lint.py

@@ -5,7 +5,8 @@
 
 import pycodestyle
 
-from pylsp import hookimpl, lsp
+from pylsp import hookimpl
+from lsprotocol import types as lsp
 from pylsp._utils import get_eol_chars
 
 try:
@@ -24,7 +25,7 @@
 
 
 @hookimpl
-def pylsp_lint(workspace, document):
+def pylsp_lint(config, workspace, document, is_saved):  # noqa: ARG001 (is_saved unused)
     with workspace.report_progress("lint: pycodestyle"):
         config = workspace._config
         settings = config.plugin_settings("pycodestyle", document_path=document.path)

pylsp/plugins/pydocstyle_lint.py

@@ -9,7 +9,8 @@
 
 import pydocstyle
 
-from pylsp import hookimpl, lsp
+from pylsp import hookimpl
+from lsprotocol import types as lsp
 
 log = logging.getLogger(__name__)
 
@@ -28,7 +29,7 @@ def pylsp_settings():
 
 
 @hookimpl
-def pylsp_lint(config, workspace, document):
+def pylsp_lint(config, workspace, document, is_saved):  # noqa: ARG001 (is_saved unused)
     with workspace.report_progress("lint: pydocstyle"):
         settings = config.plugin_settings("pydocstyle", document_path=document.path)
         log.debug("Got pydocstyle settings: %s", settings)

pylsp/plugins/pyflakes_lint.py

@@ -4,7 +4,8 @@
 from pyflakes import api as pyflakes_api
 from pyflakes import messages
 
-from pylsp import hookimpl, lsp
+from pylsp import hookimpl
+from lsprotocol import types as lsp
 
 # Pyflakes messages that should be reported as Errors instead of Warns
 PYFLAKES_ERROR_MESSAGES = (
@@ -22,7 +23,7 @@
 
 
 @hookimpl
-def pylsp_lint(workspace, document):
+def pylsp_lint(config, workspace, document, is_saved):  # noqa: ARG001 (is_saved unused)
     with workspace.report_progress("lint: pyflakes"):
         reporter = PyflakesDiagnosticReport(document.lines)
         pyflakes_api.check(
@@ -36,7 +37,7 @@ def __init__(self, lines) -> None:
         self.lines = lines
         self.diagnostics = []
 
-    def unexpectedError(self, _filename, msg) -> None:  # pragma: no cover
+    def unexpectedError(self, _filename, msg) -> None:
         err_range = {
             "start": {"line": 0, "character": 0},
             "end": {"line": 0, "character": 0},

pylsp/plugins/pylint_lint.py

@@ -12,7 +12,9 @@
 import sys
 from subprocess import PIPE, Popen
 
-from pylsp import hookimpl, lsp
+from lsprotocol.types import DiagnosticSeverity, DiagnosticTag
+
+from pylsp import hookimpl
 
 try:
     import ujson as json
@@ -74,7 +76,7 @@ def lint(cls, document, is_saved, flags=""):
                         },
                     }
                     'message': msg,
-                    'severity': lsp.DiagnosticSeverity.*,
+                    'severity': DiagnosticSeverity.*,
                 }
         """
         if not is_saved:
@@ -160,17 +162,20 @@ def lint(cls, document, is_saved, flags=""):
             }
 
             if diag["type"] == "convention":
-                severity = lsp.DiagnosticSeverity.Information
+                severity = DiagnosticSeverity.Information
             elif diag["type"] == "information":
-                severity = lsp.DiagnosticSeverity.Information
+                severity = DiagnosticSeverity.Information
             elif diag["type"] == "error":
-                severity = lsp.DiagnosticSeverity.Error
+                severity = DiagnosticSeverity.Error
             elif diag["type"] == "fatal":
-                severity = lsp.DiagnosticSeverity.Error
+                severity = DiagnosticSeverity.Error
             elif diag["type"] == "refactor":
-                severity = lsp.DiagnosticSeverity.Hint
+                severity = DiagnosticSeverity.Hint
             elif diag["type"] == "warning":
-                severity = lsp.DiagnosticSeverity.Warning
+                severity = DiagnosticSeverity.Warning
+            else:
+                log.warning("Unknown pylint diagnostic type '%s'", diag["type"])
+                severity = DiagnosticSeverity.Error
 
             code = diag["message-id"]
 
@@ -183,9 +188,9 @@ def lint(cls, document, is_saved, flags=""):
             }
 
             if code in UNNECESSITY_CODES:
-                diagnostic["tags"] = [lsp.DiagnosticTag.Unnecessary]
+                diagnostic["tags"] = [DiagnosticTag.Unnecessary]
             if code in DEPRECATION_CODES:
-                diagnostic["tags"] = [lsp.DiagnosticTag.Deprecated]
+                diagnostic["tags"] = [DiagnosticTag.Deprecated]
 
             diagnostics.append(diagnostic)
         cls.last_diags[document.path] = diagnostics
@@ -327,12 +332,12 @@ def _parse_pylint_stdio_result(document, stdout):
         line = int(line) - 1
         character = int(character)
         severity_map = {
-            "C": lsp.DiagnosticSeverity.Information,
-            "E": lsp.DiagnosticSeverity.Error,
-            "F": lsp.DiagnosticSeverity.Error,
-            "I": lsp.DiagnosticSeverity.Information,
-            "R": lsp.DiagnosticSeverity.Hint,
-            "W": lsp.DiagnosticSeverity.Warning,
+            "C": DiagnosticSeverity.Information,
+            "E": DiagnosticSeverity.Error,
+            "F": DiagnosticSeverity.Error,
+            "I": DiagnosticSeverity.Information,
+            "R": DiagnosticSeverity.Hint,
+            "W": DiagnosticSeverity.Warning,
         }
         severity = severity_map[code[0]]
         diagnostic = {
@@ -351,9 +356,9 @@ def _parse_pylint_stdio_result(document, stdout):
             "severity": severity,
         }
         if code in UNNECESSITY_CODES:
-            diagnostic["tags"] = [lsp.DiagnosticTag.Unnecessary]
+            diagnostic["tags"] = [DiagnosticTag.Unnecessary]
         if code in DEPRECATION_CODES:
-            diagnostic["tags"] = [lsp.DiagnosticTag.Deprecated]
+            diagnostic["tags"] = [DiagnosticTag.Deprecated]
         diagnostics.append(diagnostic)
 
     return diagnostics

pylsp/plugins/rope_completion.py

@@ -5,7 +5,8 @@
 
 from rope.contrib.codeassist import code_assist, sorted_proposals
 
-from pylsp import _utils, hookimpl, lsp
+from pylsp import _utils, hookimpl
+from lsprotocol import types as lsp
 
 log = logging.getLogger(__name__)
 
@@ -28,7 +29,7 @@ def _resolve_completion(completion, data, markup_kind):
 
 
 @hookimpl
-def pylsp_completions(config, workspace, document, position):
+def pylsp_completions(config, workspace, document, position, ignored_names=None):
     settings = config.plugin_settings("rope_completion", document_path=document.path)
     resolve_eagerly = settings.get("eager", False)
 
@@ -90,7 +91,7 @@ def pylsp_completions(config, workspace, document, position):
 
 
 @hookimpl
-def pylsp_completion_item_resolve(config, completion_item, document):
+def pylsp_completion_item_resolve(config, workspace, document, completion_item):
     """Resolve formatted completion for given non-resolved completion"""
     shared_data = document.shared_data["LAST_ROPE_COMPLETIONS"].get(
         completion_item["label"]