make executable optional, invoke ruff with sys

Author: jhossbach

pylsp_ruff/plugin.py

@@ -465,13 +465,15 @@ def run_ruff(
     executable = settings.executable
     arguments = build_arguments(document_path, settings, fix, extra_arguments)
 
-    log.debug(f"Calling {executable} with args: {arguments} on '{document_path}'")
-    try:
-        cmd = [executable]
-        cmd.extend(arguments)
-        p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
-    except Exception:
-        log.debug(f"Can't execute {executable}. Trying with '{sys.executable} -m ruff'")
+    if executable is not None:
+        log.debug(f"Calling {executable} with args: {arguments} on '{document_path}'")
+        try:
+            cmd = [executable]
+            cmd.extend(arguments)
+            p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
+        except Exception:
+            log.error(f"Can't execute ruff with given executable '{executable}'.")
+    else:
         cmd = [sys.executable, "-m", "ruff"]
         cmd.extend(arguments)
         p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)

pylsp_ruff/settings.py

@@ -8,9 +8,7 @@
 @dataclass
 class PluginSettings:
     enabled: bool = True
-    executable: str = "ruff"
-    unsafe_fixes: bool = False
-
+    executable: Optional[str] = None
     config: Optional[str] = None
     line_length: Optional[int] = None
 
@@ -25,6 +23,8 @@ class PluginSettings:
 
     format: Optional[List[str]] = None
 
+    unsafe_fixes: bool = False
+
     severities: Optional[Dict[str, str]] = None
 
 

tests/test_ruff_lint.py

@@ -2,6 +2,7 @@
 # Copyright 2021- Python Language Server Contributors.
 
 import os
+import sys
 import tempfile
 from unittest.mock import Mock, patch
 
@@ -154,7 +155,6 @@ def f():
     )
 
     # Check that user config is ignored
-    assert ruff_settings.executable == "ruff"
     empty_keys = [
         "config",
         "line_length",
@@ -175,6 +175,8 @@ def f():
 
     call_args = popen_mock.call_args[0][0]
     assert call_args == [
+        str(sys.executable),
+        "-m",
         "ruff",
         "--quiet",
         "--exit-zero",