coc-pyright 1.1.185 → 1.1.189

package/lib/index.js

@@ -21206,7 +21206,6 @@ var SystemVariables = class extends AbstractSystemVariables {
 // src/configSettings.ts
 var _PythonSettings = class {
   constructor() {
-    this.isWindows = process.platform === "win32";
     this.disposables = [];
     this._pythonPath = "";
     this.workspaceRoot = import_coc2.workspace.root ? import_coc2.workspace.root : __dirname;
@@ -21231,6 +21230,9 @@ var _PythonSettings = class {
     this.disposables = [];
   }
   resolvePythonFromVENV() {
+    function pythonBinFromPath(p) {
+      return process.platform === "win32" ? import_path.default.join(p, "Scripts", "python.exe") : import_path.default.join(p, "bin", "python");
+    }
     try {
       let p = import_path.default.join(this.workspaceRoot, ".python-version");
       if (import_fs_extra.default.existsSync(p)) {
@@ -21255,20 +21257,20 @@ var _PythonSettings = class {
           info = item;
         }
         if (info) {
-          if (this.isWindows) {
-            return import_path.default.join(info, "Scripts", "python.exe");
-          }
-          return import_path.default.join(info, "bin", "python");
+          return pythonBinFromPath(info);
         }
       }
+      if (process.env.VIRTUAL_ENV && import_fs_extra.default.existsSync(import_path.default.join(process.env.VIRTUAL_ENV, "pyvenv.cfg"))) {
+        return pythonBinFromPath(process.env.VIRTUAL_ENV);
+      }
+      if (process.env.CONDA_PREFIX) {
+        return pythonBinFromPath(process.env.CONDA_PREFIX);
+      }
       const files = import_fs_extra.default.readdirSync(this.workspaceRoot);
       for (const file of files) {
-        const p2 = import_path.default.join(this.workspaceRoot, file);
-        if (import_fs_extra.default.existsSync(import_path.default.join(p2, "pyvenv.cfg"))) {
-          if (this.isWindows) {
-            return import_path.default.join(p2, "Scripts", "python.exe");
-          }
-          return import_path.default.join(p2, "bin", "python");
+        const x = import_path.default.join(this.workspaceRoot, file);
+        if (import_fs_extra.default.existsSync(import_path.default.join(x, "pyvenv.cfg"))) {
+          return pythonBinFromPath(x);
         }
       }
     } catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coc-pyright",
-  "version": "1.1.185",
+  "version": "1.1.189",
   "description": "Pyright extension for coc.nvim, static type checker for Python",
   "author": "Heyward Fann <fannheyward@gmail.com>",
   "license": "MIT",
@@ -42,12 +42,12 @@
     "@types/node": "10.12.0",
     "@types/semver": "^7.3.9",
     "@types/which": "^2.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.3.0",
-    "@typescript-eslint/parser": "^5.3.0",
-    "coc.nvim": "^0.0.81-next.1",
+    "@typescript-eslint/eslint-plugin": "^5.4.0",
+    "@typescript-eslint/parser": "^5.4.0",
+    "coc.nvim": "^0.0.81-next.7",
     "diff-match-patch": "^1.0.5",
-    "esbuild": "^0.13.8",
-    "eslint": "^8.2.0",
+    "esbuild": "^0.13.15",
+    "eslint": "^8.3.0",
     "fs-extra": "^10.0.0",
     "iconv-lite": "^0.6.2",
     "md5": "^2.3.0",
@@ -57,7 +57,7 @@
     "rxjs-compat": "^6.6.7",
     "semver": "^7.3.2",
     "tree-kill": "^1.2.2",
-    "typescript": "^4.4.4",
+    "typescript": "^4.5.2",
     "untildify": "^4.0.0",
     "which": "^2.0.2"
   },
@@ -1342,6 +1342,6 @@
     ]
   },
   "dependencies": {
-    "pyright": "^1.1.185"
+    "pyright": "^1.1.189"
   }
 }