coc-pyright 1.1.185 → 1.1.194

package/README.md

@@ -67,6 +67,7 @@ These configurations are used by `coc-pyright`, you need to set them in your `co
 | pyright.server                              | Custom `pyright-langserver` path                                    | ''            |
 | pyright.disableCompletion                   | Disables completion from Pyright, left other LSP features work      | false         |
 | pyright.disableDiagnostics                  | Disable diagnostics from Pyright                                    | false         |
+| pyright.completion.importSupport            | Enable `python-import` completion source support                    | true          |
 | pyright.completion.snippetSupport           | Enable completion snippets support                                  | true          |
 | pyright.organizeimports.provider            | Organize imports provider, `pyright` or `isort`                     | pyright       |
 

package/lib/index.js

@@ -1212,7 +1212,7 @@ var require_lru_cache = __commonJS({
         if (this[DISPOSE] && this[LRU_LIST] && this[LRU_LIST].length) {
           this[LRU_LIST].forEach((hit) => this[DISPOSE](hit.key, hit.value));
         }
-        this[CACHE] = new Map();
+        this[CACHE] = /* @__PURE__ */ new Map();
         this[LRU_LIST] = new Yallist();
         this[LENGTH] = 0;
       }
@@ -1443,7 +1443,7 @@ var require_range = __commonJS({
         const compRe = loose ? re[t.COMPARATORLOOSE] : re[t.COMPARATOR];
         const rangeList = range.split(" ").map((comp) => parseComparator(comp, this.options)).join(" ").split(/\s+/).map((comp) => replaceGTE0(comp, this.options)).filter(this.options.loose ? (comp) => !!comp.match(compRe) : () => true).map((comp) => new Comparator(comp, this.options));
         const l = rangeList.length;
-        const rangeMap = new Map();
+        const rangeMap = /* @__PURE__ */ new Map();
         for (const comp of rangeList) {
           if (isNullSet(comp))
             return [comp];
@@ -2162,7 +2162,7 @@ var require_subset = __commonJS({
         else
           dom = [new Comparator(">=0.0.0")];
       }
-      const eqSet = new Set();
+      const eqSet = /* @__PURE__ */ new Set();
       let gt, lt2;
       for (const c of sub) {
         if (c.operator === ">" || c.operator === ">=")
@@ -16559,7 +16559,7 @@ var require_distinct = __commonJS({
     var noop_1 = require_noop();
     function distinct(keySelector, flushes) {
       return lift_1.operate(function(source, subscriber) {
-        var distinctKeys = new Set();
+        var distinctKeys = /* @__PURE__ */ new Set();
         source.subscribe(new OperatorSubscriber_1.OperatorSubscriber(subscriber, function(value) {
           var key = keySelector ? keySelector(value) : value;
           if (!distinctKeys.has(key)) {
@@ -16994,7 +16994,7 @@ var require_groupBy = __commonJS({
         } else {
           duration = elementOrOptions.duration, element = elementOrOptions.element, connector = elementOrOptions.connector;
         }
-        var groups = new Map();
+        var groups = /* @__PURE__ */ new Map();
         var notify = function(cb) {
           groups.forEach(cb);
           cb(subscriber);
@@ -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) {
@@ -21349,7 +21351,7 @@ var _PythonSettings = class {
   }
 };
 var PythonSettings = _PythonSettings;
-PythonSettings.pythonSettings = new Map();
+PythonSettings.pythonSettings = /* @__PURE__ */ new Map();
 function getPythonExecutable(pythonPath) {
   pythonPath = (0, import_untildify.default)(pythonPath);
   if (pythonPath === "python" || pythonPath.indexOf(import_path.default.sep) === -1 || import_path.default.basename(pythonPath) === import_path.default.dirname(pythonPath)) {
@@ -21387,12 +21389,6 @@ var import_coc3 = __toModule(require("coc.nvim"));
 var import_diff_match_patch = __toModule(require_diff_match_patch());
 var import_os = __toModule(require("os"));
 var NEW_LINE_LENGTH = import_os.EOL.length;
-var EditAction;
-(function(EditAction2) {
-  EditAction2[EditAction2["Delete"] = 0] = "Delete";
-  EditAction2[EditAction2["Insert"] = 1] = "Insert";
-  EditAction2[EditAction2["Replace"] = 2] = "Replace";
-})(EditAction || (EditAction = {}));
 var Edit = class {
   constructor(action, start) {
     this.action = action;
@@ -21401,11 +21397,11 @@ var Edit = class {
   }
   apply() {
     switch (this.action) {
-      case 1:
+      case 1 /* Insert */:
         return import_coc3.TextEdit.insert(this.start, this.text);
-      case 0:
+      case 0 /* Delete */:
         return import_coc3.TextEdit.del(import_coc3.Range.create(this.start, this.end));
-      case 2:
+      case 2 /* Replace */:
         return import_coc3.TextEdit.replace(import_coc3.Range.create(this.start, this.end), this.text);
       default:
         return {
@@ -21438,17 +21434,17 @@ function getTextEditsInternal(before, diffs, startLine = 0) {
     switch (diffs[i][0]) {
       case dmp.DIFF_DELETE:
         if (edit === null) {
-          edit = new Edit(0, start);
-        } else if (edit.action !== 0) {
+          edit = new Edit(0 /* Delete */, start);
+        } else if (edit.action !== 0 /* Delete */) {
           throw new Error("cannot format due to an internal error.");
         }
         edit.end = { line, character };
         break;
       case dmp.DIFF_INSERT:
         if (edit === null) {
-          edit = new Edit(1, start);
-        } else if (edit.action === 0) {
-          edit.action = 2;
+          edit = new Edit(1 /* Insert */, start);
+        } else if (edit.action === 0 /* Delete */) {
+          edit.action = 2 /* Replace */;
         }
         line = start.line;
         character = start.character;
@@ -22062,7 +22058,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 [];
     }
   }
@@ -22084,7 +22084,7 @@ var BlackdFormatter = class extends BaseFormatter {
 // src/formatProvider.ts
 var PythonFormattingEditProvider = class {
   constructor() {
-    this.formatters = new Map();
+    this.formatters = /* @__PURE__ */ new Map();
     this.disposables = [];
     this.pythonSettings = PythonSettings.getInstance();
     this.outputChannel = import_coc8.window.createOutputChannel("coc-pyright-formatting");
@@ -22178,7 +22178,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}`);
@@ -22196,8 +22201,7 @@ var import_minimatch = __toModule(require_minimatch());
 var import_path4 = __toModule(require("path"));
 
 // src/types.ts
-var Product;
-(function(Product2) {
+var Product = /* @__PURE__ */ ((Product2) => {
   Product2[Product2["pylint"] = 1] = "pylint";
   Product2[Product2["flake8"] = 2] = "flake8";
   Product2[Product2["pycodestyle"] = 3] = "pycodestyle";
@@ -22213,26 +22217,27 @@ var Product;
   Product2[Product2["darker"] = 13] = "darker";
   Product2[Product2["rope"] = 14] = "rope";
   Product2[Product2["blackd"] = 15] = "blackd";
-})(Product || (Product = {}));
-var LintMessageSeverity;
-(function(LintMessageSeverity2) {
+  return Product2;
+})(Product || {});
+var LintMessageSeverity = /* @__PURE__ */ ((LintMessageSeverity2) => {
   LintMessageSeverity2[LintMessageSeverity2["Hint"] = 0] = "Hint";
   LintMessageSeverity2[LintMessageSeverity2["Error"] = 1] = "Error";
   LintMessageSeverity2[LintMessageSeverity2["Warning"] = 2] = "Warning";
   LintMessageSeverity2[LintMessageSeverity2["Information"] = 3] = "Information";
-})(LintMessageSeverity || (LintMessageSeverity = {}));
+  return LintMessageSeverity2;
+})(LintMessageSeverity || {});
 var LinterErrors;
-(function(LinterErrors2) {
+((LinterErrors2) => {
   let pylint;
-  (function(pylint2) {
+  ((pylint2) => {
     pylint2.InvalidSyntax = "E0001";
   })(pylint = LinterErrors2.pylint || (LinterErrors2.pylint = {}));
   let prospector;
-  (function(prospector2) {
+  ((prospector2) => {
     prospector2.InvalidSyntax = "F999";
   })(prospector = LinterErrors2.prospector || (LinterErrors2.prospector = {}));
   let flake8;
-  (function(flake82) {
+  ((flake82) => {
     flake82.InvalidSyntax = "E999";
   })(flake8 = LinterErrors2.flake8 || (LinterErrors2.flake8 = {}));
 })(LinterErrors || (LinterErrors = {}));
@@ -22326,7 +22331,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 +22349,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 +22570,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);
@@ -22715,7 +22730,7 @@ var Pytype = class extends BaseLinter {
 // src/linters/lintingEngine.ts
 "use strict";
 var PYTHON = { language: "python" };
-var lintSeverityToVSSeverity = new Map();
+var lintSeverityToVSSeverity = /* @__PURE__ */ new Map();
 lintSeverityToVSSeverity.set(LintMessageSeverity.Error, import_coc20.DiagnosticSeverity.Error);
 lintSeverityToVSSeverity.set(LintMessageSeverity.Hint, import_coc20.DiagnosticSeverity.Hint);
 lintSeverityToVSSeverity.set(LintMessageSeverity.Information, import_coc20.DiagnosticSeverity.Information);
@@ -22733,7 +22748,7 @@ var DisabledLinter = class {
 };
 var LintingEngine = class {
   constructor() {
-    this.pendingLintings = new Map();
+    this.pendingLintings = /* @__PURE__ */ new Map();
     this.outputChannel = import_coc20.window.createOutputChannel("coc-pyright-linting");
     this.diagnosticCollection = import_coc20.languages.createDiagnosticCollection("python");
     this.configService = PythonSettings.getInstance();
@@ -23195,7 +23210,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 +23260,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)}`);
@@ -23433,8 +23448,11 @@ async function activate(context) {
   context.subscriptions.push(new LinterProvider(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, [" "]));
+  const importSupport = pyrightCfg.get("completion.importSupport");
+  if (importSupport) {
+    const provider = new ImportCompletionProvider();
+    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) => {
@@ -23520,7 +23538,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.185",
+  "version": "1.1.194",
   "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.3.0",
-    "@typescript-eslint/parser": "^5.3.0",
-    "coc.nvim": "^0.0.81-next.1",
+    "@typescript-eslint/eslint-plugin": "^5.6.0",
+    "@typescript-eslint/parser": "^5.6.0",
+    "coc.nvim": "^0.0.81-next.7",
     "diff-match-patch": "^1.0.5",
-    "esbuild": "^0.13.8",
-    "eslint": "^8.2.0",
+    "esbuild": "^0.14.2",
+    "eslint": "^8.4.1",
     "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.3",
     "untildify": "^4.0.0",
     "which": "^2.0.2"
   },
@@ -163,7 +163,7 @@
             "reportPropertyTypeMismatch": {
               "type": "string",
               "description": "Diagnostics for property whose setter and getter have mismatched types.",
-              "default": "error",
+              "default": "none",
               "enum": [
                 "none",
                 "information",
@@ -1271,6 +1271,11 @@
           "default": false,
           "description": "Disable diagnostics from Pyright"
         },
+        "pyright.completion.importSupport": {
+          "type": "boolean",
+          "default": true,
+          "description": "Enable `python-import` completion source, will list suggestions after input `import`"
+        },
         "pyright.completion.snippetSupport": {
           "type": "boolean",
           "default": true,
@@ -1342,6 +1347,6 @@
     ]
   },
   "dependencies": {
-    "pyright": "^1.1.185"
+    "pyright": "^1.1.194"
   }
 }

package/schemas/pyrightconfig.schema.json

@@ -141,7 +141,7 @@
       "$id": "#/properties/reportPropertyTypeMismatch",
       "$ref": "#/definitions/diagnostic",
       "title": "Controls reporting of property getter/setter type mismatches",
-      "default": "error"
+      "default": "none"
     },
     "reportFunctionMemberAccess": {
       "$id": "#/properties/reportFunctionMemberAccess",