add shutils in case -m fails

Author: jhossbach

pylsp_ruff/plugin.py

@@ -2,8 +2,9 @@
 import json
 import logging
 import re
-import sys
 import shutil
+import sys
+from functools import cache
 from pathlib import PurePath
 from subprocess import PIPE, Popen
 from typing import Dict, Generator, List, Optional
@@ -117,7 +118,6 @@ def pylsp_format_document(workspace: Workspace, document: Document) -> Generator
         Document to apply ruff on.
 
     """
-
     log.debug(f"textDocument/formatting: {document}")
     outcome = yield
     result = outcome.get_result()
@@ -179,7 +179,6 @@ def pylsp_lint(workspace: Workspace, document: Document) -> List[Dict]:
     List of dicts containing the diagnostics.
 
     """
-
     with workspace.report_progress("lint: ruff"):
         settings = load_settings(workspace, document.path)
         checks = run_ruff_check(document=document, settings=settings)
@@ -488,6 +487,24 @@ def run_ruff_format(
     )
 
 
+@cache
+def find_executable(executable):
+    if executable is not None:
+        cmd = [executable]
+        try:
+            Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate()
+        except Exception:
+            log.error(f"Can't execute ruff with given executable '{executable}'.")
+        finally:
+            return cmd
+    else:
+        cmd = [sys.executable, "-m", "ruff"]
+        (_, stderr) = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate()
+        if "No module named ruff" in stderr.decode():
+            cmd = [shutil.which("ruff")]
+        return cmd
+
+
 def run_ruff(
     settings: PluginSettings,
     document_path: str,
@@ -519,27 +536,35 @@ def run_ruff(
     String containing the result in json format.
 
     """
-    executable = settings.executable or shutil.which("ruff")
+    executable = settings.executable
 
     arguments = subcommand.build_args(document_path, settings, fix, extra_arguments)
 
-    p = None
-    if executable is not None:
-        log.debug(f"Calling {executable} with args: {arguments} on '{document_path}'")
-        try:
-            cmd = [executable, str(subcommand)]
-            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}'.")
-    if p is None:
-        log.debug(
-            f"Calling ruff via '{sys.executable} -m ruff'"
-            f" with args: {arguments} on '{document_path}'"
-        )
-        cmd = [sys.executable, "-m", "ruff", str(subcommand)]
-        cmd.extend(arguments)
-        p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
+    # p = None
+    # if executable is not None:
+    #     log.debug(f"Calling {executable} with args: {arguments} on '{document_path}'")
+    #     try:
+    #         cmd = [executable, str(subcommand)]
+    #         cmd.extend(arguments)
+    #         p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
+    #         (stdout, stderr) = p.communicate(document_source.encode())
+    #     except Exception:
+    #         log.error(f"Can't execute ruff with given executable '{executable}'.")
+    # else:
+    #     cmd = [sys.executable, "-m", "ruff", str(subcommand)]
+    #     cmd.extend(arguments)
+    #     p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
+    #     (stdout, stderr) = p.communicate(document_source.encode())
+    #     if "No module named ruff" in stderr.decode():
+    #         cmd = [shutil.which("ruff"), str(subcommand)]
+    #
+    #     p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
+    #     (stdout, stderr) = p.communicate(document_source.encode())
+    cmd = find_executable(executable)
+    cmd.extend([str(subcommand), *arguments])
+
+    log.debug(f"Calling {cmd} on '{document_path}'")
+    p = Popen(cmd, stdin=PIPE, stdout=PIPE)
     (stdout, stderr) = p.communicate(document_source.encode())
 
     if p.returncode != 0: