coc-pyright 1.1.180 → 1.1.190

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) {
@@ -22062,7 +22064,11 @@ var BlackdFormatter = class extends BaseFormatter {
       import_coc7.window.showErrorMessage("blackd request error");
       this.outputChannel.appendLine("");
       this.outputChannel.appendLine(`${"#".repeat(10)} blackd request error:`);
-      this.outputChannel.appendLine(e);
+      if (typeof e === "string") {
+        this.outputChannel.appendLine(e);
+      } else if (e instanceof Error) {
+        this.outputChannel.appendLine(e.message);
+      }
       return [];
     }
   }
@@ -22178,7 +22184,12 @@ async function sortImports(extensionRoot, outputChannel) {
     const edits = getTextEditsFromPatch(doc.getDocumentContent(), patch);
     await doc.applyEdits(edits);
   } catch (err) {
-    const message = typeof err === "string" ? err : err.message ? err.message : err;
+    let message = "";
+    if (typeof err === "string") {
+      message = err;
+    } else if (err instanceof Error) {
+      message = err.message;
+    }
     outputChannel.appendLine(`${"#".repeat(10)} isort Output ${"#".repeat(10)}`);
     outputChannel.appendLine(`Error from isort:
 ${message}`);
@@ -22326,7 +22337,9 @@ var BaseLinter = class {
       return await this.parseMessages(result.stdout, document, cancellation, regEx);
     } catch (error) {
       this.outputChannel.appendLine(`Linting with ${this.info.id} failed:`);
-      this.outputChannel.appendLine(error.message.toString());
+      if (error instanceof Error) {
+        this.outputChannel.appendLine(error.message.toString());
+      }
       return [];
     }
   }
@@ -22342,10 +22355,14 @@ var BaseLinter = class {
             break;
           }
         }
-      } catch (ex) {
+      } catch (err) {
         this.outputChannel.appendLine(`${"#".repeat(10)} Linter ${this.info.id} failed to parse the line:`);
         this.outputChannel.appendLine(line);
-        this.outputChannel.appendLine(ex);
+        if (typeof err === "string") {
+          this.outputChannel.appendLine(err);
+        } else if (err instanceof Error) {
+          this.outputChannel.appendLine(err.message);
+        }
       }
     }
     return messages;
@@ -22559,9 +22576,13 @@ var PyDocStyle = class extends BaseLinter {
           type: "",
           provider: this.info.id
         };
-      } catch (ex) {
+      } catch (err) {
         this.outputChannel.appendLine(`Failed to parse pydocstyle line '${line}'`);
-        this.outputChannel.appendLine(ex.message);
+        if (typeof err === "string") {
+          this.outputChannel.appendLine(err);
+        } else if (err instanceof Error) {
+          this.outputChannel.appendLine(err.message);
+        }
         return;
       }
     }).filter((item) => item !== void 0).map((item) => item);
@@ -23195,7 +23216,7 @@ async function applyImports(doc, resp, outputChannel) {
     if (typeof error === "string") {
       errorMessage = error;
     }
-    if (typeof error === "object" && error.message) {
+    if (error instanceof Error) {
       errorMessage = error.message;
     }
     outputChannel.appendLine(`${"#".repeat(10)}Rope Output${"#".repeat(10)}`);
@@ -23245,7 +23266,7 @@ async function extractName(textEditor, newName, renameResponse, outputChannel) {
     if (typeof error === "string") {
       errorMessage = error;
     }
-    if (typeof error === "object" && error.message) {
+    if (error instanceof Error) {
       errorMessage = error.message;
     }
     outputChannel.appendLine(`${"#".repeat(10)}Refactor Output${"#".repeat(10)}`);
@@ -23337,9 +23358,11 @@ async function provideCompletionItem(document, position, context, token, next) {
   const result = await next(document, position, context, token);
   if (!result)
     return;
+  const items = Array.isArray(result) ? result : result.items;
+  items.map((x) => delete x.sortText);
+  items.sort((a, b) => a.kind && b.kind ? a.kind - b.kind : 0);
   const snippetSupport = import_coc24.workspace.getConfiguration("pyright").get("completion.snippetSupport");
   if (snippetSupport) {
-    const items = Array.isArray(result) ? result : result.items;
     for (const item of items) {
       if ((_a = item.data) == null ? void 0 : _a.funcParensDisabled)
         continue;
@@ -23349,7 +23372,7 @@ async function provideCompletionItem(document, position, context, token, next) {
       }
     }
   }
-  return result;
+  return Array.isArray(result) ? items : { items, isIncomplete: result.isIncomplete };
 }
 async function resolveCompletionItem(item, token, next) {
   const result = await next(item, token);
@@ -23432,7 +23455,7 @@ async function activate(context) {
   const codeActionProvider = new PythonCodeActionProvider();
   context.subscriptions.push(import_coc24.languages.registerCodeActionProvider(documentSelector, codeActionProvider, "Pyright"));
   const provider = new ImportCompletionProvider();
-  context.subscriptions.push(import_coc24.languages.registerCompletionItemProvider("python-import", "PY", "python", provider, [" "]));
+  context.subscriptions.push(import_coc24.languages.registerCompletionItemProvider("python-import", "PY", ["python"], provider, [" "]));
   const textEditorCommands = ["pyright.organizeimports", "pyright.addoptionalforparam"];
   textEditorCommands.forEach((commandName) => {
     context.subscriptions.push(import_coc24.commands.registerCommand(commandName, async (offset) => {
@@ -23518,7 +23541,7 @@ var ImportCompletionProvider = class {
       return [];
     const items = [];
     for (const o of result.items) {
-      items.push({ label: o.word, sortText: o.sortText });
+      items.push({ label: o.word, sortText: o.sortText, kind: import_coc24.CompletionItemKind.Module, filterText: o.filterText });
     }
     return items;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coc-pyright",
-  "version": "1.1.180",
+  "version": "1.1.190",
   "description": "Pyright extension for coc.nvim, static type checker for Python",
   "author": "Heyward Fann <fannheyward@gmail.com>",
   "license": "MIT",
@@ -39,15 +39,15 @@
     "@types/fs-extra": "^9.0.2",
     "@types/md5": "^2.2.0",
     "@types/minimatch": "^3.0.3",
-    "@types/node": "10.12.0",
+    "@types/node": "12.12",
     "@types/semver": "^7.3.9",
     "@types/which": "^2.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.1.0",
-    "@typescript-eslint/parser": "^5.1.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.0.1",
+    "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.180"
+    "pyright": "^1.1.190"
   }
 }