fix: use which to detect pylsp

atom-community · Jun 9, 2021 · a2c8444 · a2c8444
1 parent 01dfc6c
commit a2c8444
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -7,3 +7,4 @@ coverage
 build
 dist
 VendorLib
+.mypy_cache
diff --git a/lib/main.js b/lib/main.js
@@ -1,5 +1,5 @@
 const { shell } = require("electron")
-const execFileSync = require("child_process").execFileSync
+const whichSync = require("which").sync
 const { AutoLanguageClient } = require("atom-languageclient")
 const { detectVirtualEnv, detectPipEnv, replacePipEnvPathVar, sanitizeConfig } = require("./utils")
 
@@ -53,10 +53,7 @@ class PythonLanguageClient extends AutoLanguageClient {
 
     let pyls = atom.config.get("ide-python.pyls") || "pylsp"
     // check if it exists
-    try {
-      execFileSync(pyls, ["--help"], { stdio: "inherit" })
-    } catch (e) {
-      console.error(e)
+    if (whichSync(pyls, { nothrow: true }) === null) {
       pyls = "pyls"
     }
     const childProcess = super.spawn(python, ["-m", pyls], {

diff --git a/package.json b/package.json
@@ -67,6 +67,7 @@
     "untildify": "3.0.2",
     "vscode-debugadapter": "1.24.0",
     "vscode-debugprotocol": "1.24.0",
+    "which": "^2.0.2",
     "xml2js": "0.4.17"
   },
   "devDependencies": {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,3 +7,4 @@ coverage @@
     build
     dist
     VendorLib
+    .mypy_cache