Merge pull request #955 from jameshurst/master

Use shutil.which result to run npm
jupyter-lsp · Oct 8, 2023 · 018b8f4 · 018b8f4
2 parents 71d99c2 + ed7cb9f
commit 018b8f4
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/python_packages/jupyter_lsp/jupyter_lsp/types.py b/python_packages/jupyter_lsp/jupyter_lsp/types.py
@@ -236,10 +236,10 @@ def _default_nodejs(self):
         )
 
     @lru_cache(maxsize=1)
-    def _npm_prefix(self):
+    def _npm_prefix(self, npm: Text):
         try:
             return (
-                subprocess.run(["npm", "prefix", "-g"], check=True, capture_output=True)
+                subprocess.run([npm, "prefix", "-g"], check=True, capture_output=True)
                 .stdout.decode("utf-8")
                 .strip()
             )
@@ -274,8 +274,9 @@ def _default_node_roots(self):
         roots += [pathlib.Path(sys.prefix)]
 
         # check for custom npm prefix
-        if shutil.which("npm"):
-            prefix = self._npm_prefix()
+        npm = shutil.which("npm")
+        if npm:
+            prefix = self._npm_prefix(npm)
             if prefix:
                 roots += [  # pragma: no cover
                     pathlib.Path(prefix) / "lib",