coc-pyright 1.1.250 → 1.1.253

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.disableProgressNotifications        | Disable the initialization and workdone progress notifications      | 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

@@ -20241,11 +20241,15 @@ var require_minimatch = __commonJS({
   "node_modules/minimatch/minimatch.js"(exports, module2) {
     module2.exports = minimatch;
     minimatch.Minimatch = Minimatch2;
-    var path10 = { sep: "/" };
-    try {
-      path10 = require("path");
-    } catch (er) {
-    }
+    var path10 = function() {
+      try {
+        return require("path");
+      } catch (e) {
+      }
+    }() || {
+      sep: "/"
+    };
+    minimatch.sep = path10.sep;
     var GLOBSTAR = minimatch.GLOBSTAR = Minimatch2.GLOBSTAR = {};
     var expand = require_brace_expansion();
     var plTypes = {
@@ -20275,58 +20279,68 @@ var require_minimatch = __commonJS({
       };
     }
     function ext(a, b) {
-      a = a || {};
       b = b || {};
       var t = {};
-      Object.keys(b).forEach(function(k) {
-        t[k] = b[k];
-      });
       Object.keys(a).forEach(function(k) {
         t[k] = a[k];
       });
+      Object.keys(b).forEach(function(k) {
+        t[k] = b[k];
+      });
       return t;
     }
     minimatch.defaults = function(def) {
-      if (!def || !Object.keys(def).length)
+      if (!def || typeof def !== "object" || !Object.keys(def).length) {
         return minimatch;
+      }
       var orig = minimatch;
       var m = function minimatch2(p, pattern, options) {
-        return orig.minimatch(p, pattern, ext(def, options));
+        return orig(p, pattern, ext(def, options));
       };
       m.Minimatch = function Minimatch3(pattern, options) {
         return new orig.Minimatch(pattern, ext(def, options));
       };
+      m.Minimatch.defaults = function defaults(options) {
+        return orig.defaults(ext(def, options)).Minimatch;
+      };
+      m.filter = function filter2(pattern, options) {
+        return orig.filter(pattern, ext(def, options));
+      };
+      m.defaults = function defaults(options) {
+        return orig.defaults(ext(def, options));
+      };
+      m.makeRe = function makeRe2(pattern, options) {
+        return orig.makeRe(pattern, ext(def, options));
+      };
+      m.braceExpand = function braceExpand2(pattern, options) {
+        return orig.braceExpand(pattern, ext(def, options));
+      };
+      m.match = function(list, pattern, options) {
+        return orig.match(list, pattern, ext(def, options));
+      };
       return m;
     };
     Minimatch2.defaults = function(def) {
-      if (!def || !Object.keys(def).length)
-        return Minimatch2;
       return minimatch.defaults(def).Minimatch;
     };
     function minimatch(p, pattern, options) {
-      if (typeof pattern !== "string") {
-        throw new TypeError("glob pattern string required");
-      }
+      assertValidPattern(pattern);
       if (!options)
         options = {};
       if (!options.nocomment && pattern.charAt(0) === "#") {
         return false;
       }
-      if (pattern.trim() === "")
-        return p === "";
       return new Minimatch2(pattern, options).match(p);
     }
     function Minimatch2(pattern, options) {
       if (!(this instanceof Minimatch2)) {
         return new Minimatch2(pattern, options);
       }
-      if (typeof pattern !== "string") {
-        throw new TypeError("glob pattern string required");
-      }
+      assertValidPattern(pattern);
       if (!options)
         options = {};
       pattern = pattern.trim();
-      if (path10.sep !== "/") {
+      if (!options.allowWindowsEscape && path10.sep !== "/") {
         pattern = pattern.split(path10.sep).join("/");
       }
       this.options = options;
@@ -20336,14 +20350,13 @@ var require_minimatch = __commonJS({
       this.negate = false;
       this.comment = false;
       this.empty = false;
+      this.partial = !!options.partial;
       this.make();
     }
     Minimatch2.prototype.debug = function() {
     };
     Minimatch2.prototype.make = make;
     function make() {
-      if (this._made)
-        return;
       var pattern = this.pattern;
       var options = this.options;
       if (!options.nocomment && pattern.charAt(0) === "#") {
@@ -20357,7 +20370,9 @@ var require_minimatch = __commonJS({
       this.parseNegate();
       var set = this.globSet = this.braceExpand();
       if (options.debug)
-        this.debug = console.error;
+        this.debug = function debug() {
+          console.error.apply(console, arguments);
+        };
       this.debug(this.pattern, set);
       set = this.globParts = set.map(function(s) {
         return s.split(slashSplit);
@@ -20402,23 +20417,32 @@ var require_minimatch = __commonJS({
         }
       }
       pattern = typeof pattern === "undefined" ? this.pattern : pattern;
-      if (typeof pattern === "undefined") {
-        throw new TypeError("undefined pattern");
-      }
-      if (options.nobrace || !pattern.match(/\{.*\}/)) {
+      assertValidPattern(pattern);
+      if (options.nobrace || !/\{(?:(?!\{).)*\}/.test(pattern)) {
         return [pattern];
       }
       return expand(pattern);
     }
+    var MAX_PATTERN_LENGTH = 1024 * 64;
+    var assertValidPattern = function(pattern) {
+      if (typeof pattern !== "string") {
+        throw new TypeError("invalid pattern");
+      }
+      if (pattern.length > MAX_PATTERN_LENGTH) {
+        throw new TypeError("pattern is too long");
+      }
+    };
     Minimatch2.prototype.parse = parse;
     var SUBPARSE = {};
     function parse(pattern, isSub) {
-      if (pattern.length > 1024 * 64) {
-        throw new TypeError("pattern is too long");
-      }
+      assertValidPattern(pattern);
       var options = this.options;
-      if (!options.noglobstar && pattern === "**")
-        return GLOBSTAR;
+      if (pattern === "**") {
+        if (!options.noglobstar)
+          return GLOBSTAR;
+        else
+          pattern = "*";
+      }
       if (pattern === "")
         return "";
       var re = "";
@@ -20459,8 +20483,9 @@ var require_minimatch = __commonJS({
           continue;
         }
         switch (c) {
-          case "/":
+          case "/": {
             return false;
+          }
           case "\\":
             clearStateChar();
             escaping = true;
@@ -20544,17 +20569,15 @@ var require_minimatch = __commonJS({
               escaping = false;
               continue;
             }
-            if (inClass) {
-              var cs = pattern.substring(classStart + 1, i);
-              try {
-                RegExp("[" + cs + "]");
-              } catch (er) {
-                var sp = this.parse(cs, SUBPARSE);
-                re = re.substr(0, reClassStart) + "\\[" + sp[0] + "\\]";
-                hasMagic = hasMagic || sp[1];
-                inClass = false;
-                continue;
-              }
+            var cs = pattern.substring(classStart + 1, i);
+            try {
+              RegExp("[" + cs + "]");
+            } catch (er) {
+              var sp = this.parse(cs, SUBPARSE);
+              re = re.substr(0, reClassStart) + "\\[" + sp[0] + "\\]";
+              hasMagic = hasMagic || sp[1];
+              inClass = false;
+              continue;
             }
             hasMagic = true;
             inClass = false;
@@ -20596,8 +20619,8 @@ var require_minimatch = __commonJS({
       }
       var addPatternStart = false;
       switch (re.charAt(0)) {
-        case ".":
         case "[":
+        case ".":
         case "(":
           addPatternStart = true;
       }
@@ -20684,8 +20707,9 @@ var require_minimatch = __commonJS({
       }
       return list;
     };
-    Minimatch2.prototype.match = match;
-    function match(f, partial) {
+    Minimatch2.prototype.match = function match(f, partial) {
+      if (typeof partial === "undefined")
+        partial = this.partial;
       this.debug("match", f, this.pattern);
       if (this.comment)
         return false;
@@ -20724,7 +20748,7 @@ var require_minimatch = __commonJS({
       if (options.flipNegate)
         return false;
       return this.negate;
-    }
+    };
     Minimatch2.prototype.matchOne = function(file, pattern, partial) {
       var options = this.options;
       this.debug("matchOne", { "this": this, file, pattern });
@@ -20772,11 +20796,7 @@ var require_minimatch = __commonJS({
         }
         var hit;
         if (typeof p === "string") {
-          if (options.nocase) {
-            hit = f.toLowerCase() === p.toLowerCase();
-          } else {
-            hit = f === p;
-          }
+          hit = f === p;
           this.debug("string match", p, f, hit);
         } else {
           hit = f.match(p);
@@ -20790,8 +20810,7 @@ var require_minimatch = __commonJS({
       } else if (fi === fl) {
         return partial;
       } else if (pi === pl) {
-        var emptyFileEnd = fi === fl - 1 && file[fi] === "";
-        return emptyFileEnd;
+        return fi === fl - 1 && file[fi] === "";
       }
       throw new Error("wtf?");
     };
@@ -21927,7 +21946,7 @@ var BaseFormatter = class {
       }
       const edits = getTextEditsFromPatch(document.getText(), data);
       if (edits.length)
-        import_coc4.window.showMessage(`Formatted with ${this.Id}`);
+        import_coc4.window.showInformationMessage(`Formatted with ${this.Id}`);
       return edits;
     }).catch((error) => {
       this.handleError(this.Id, error).catch(() => {
@@ -21949,7 +21968,7 @@ var BaseFormatter = class {
     if (isNotInstalledError(error)) {
       customError = `${customError}: ${this.Id} module is not installed.`;
     }
-    import_coc4.window.showMessage(customError, "warning");
+    import_coc4.window.showWarningMessage(customError);
   }
   createTempFile(document) {
     return getTempFileWithDocumentContents(document);
@@ -22005,7 +22024,7 @@ var BlackFormatter = class extends BaseFormatter {
     if (formatSelection) {
       const errorMessage = async () => {
         this.outputChannel.appendLine('Black does not support the "Format Selection" command');
-        import_coc5.window.showMessage('Black does not support the "Format Selection" command', "error");
+        import_coc5.window.showErrorMessage('Black does not support the "Format Selection" command');
         return [];
       };
       return errorMessage();
@@ -22268,16 +22287,16 @@ var PythonFormattingEditProvider = class {
   }
   async _provideEdits(document, options, token, range) {
     const provider = this.pythonSettings.formatting.provider;
-    const formater = this.formatters.get(provider);
-    if (!formater) {
-      import_coc8.window.showMessage(`No formatter is set. You need to set "python.formatting.provider" in your coc-settings.json`);
+    const formatter = this.formatters.get(provider);
+    if (!formatter) {
+      import_coc8.window.showWarningMessage(`No formatter is set. You need to set "python.formatting.provider" in your coc-settings.json`);
       this.outputChannel.appendLine(`${"#".repeat(10)} Error: python.formatting.provider is ${provider}, which is not supported`);
       return [];
     }
     this.outputChannel.appendLine(`Using python from ${this.pythonSettings.pythonPath}
 `);
-    this.outputChannel.appendLine(`${"#".repeat(10)} active formattor: ${formater.Id}`);
-    return await formater.formatDocument(document, options, token, range);
+    this.outputChannel.appendLine(`${"#".repeat(10)} active formattor: ${formatter.Id}`);
+    return await formatter.formatDocument(document, options, token, range);
   }
   provideDocumentFormattingEdits(document, options, token) {
     return this._provideEdits(document, options, token);
@@ -22344,7 +22363,7 @@ async function sortImports(extensionRoot, outputChannel) {
     outputChannel.appendLine(`${"#".repeat(10)} isort Output ${"#".repeat(10)}`);
     outputChannel.appendLine(`Error from isort:
 ${message}`);
-    import_coc9.window.showMessage(`Failed to format import by isort`, "error");
+    import_coc9.window.showErrorMessage(`Failed to format import by isort`);
   }
 }
 
@@ -23266,7 +23285,7 @@ async function checkDocument(doc) {
     return false;
   const modified = await doc.buffer.getOption("modified");
   if (modified != 0) {
-    import_coc23.window.showMessage("Buffer not saved, please save the buffer first!", "warning");
+    import_coc23.window.showWarningMessage("Buffer not saved, please save the buffer first!");
     return false;
   }
   return true;
@@ -23289,7 +23308,7 @@ async function extractVariable(root, document, range, outputChannel) {
   const pythonToolsExecutionService = new PythonExecutionService();
   const rope = await pythonToolsExecutionService.isModuleInstalled("rope");
   if (!rope) {
-    import_coc23.window.showMessage(`Module rope not installed`, "warning");
+    import_coc23.window.showWarningMessage(`Module rope not installed`);
     return;
   }
   const workspaceFolder = import_coc23.workspace.getWorkspaceFolder(doc.uri);
@@ -23312,7 +23331,7 @@ async function extractMethod(root, document, range, outputChannel) {
   const pythonToolsExecutionService = new PythonExecutionService();
   const rope = await pythonToolsExecutionService.isModuleInstalled("rope");
   if (!rope) {
-    import_coc23.window.showMessage(`Module rope not installed`, "warning");
+    import_coc23.window.showWarningMessage(`Module rope not installed`);
     return;
   }
   const workspaceFolder = import_coc23.workspace.getWorkspaceFolder(doc.uri);
@@ -23335,7 +23354,7 @@ async function addImport(root, document, name, parent, outputChannel) {
   const pythonToolsExecutionService = new PythonExecutionService();
   const rope = await pythonToolsExecutionService.isModuleInstalled("rope");
   if (!rope) {
-    import_coc23.window.showMessage(`Module rope not installed`, "warning");
+    import_coc23.window.showWarningMessage(`Module rope not installed`);
     return;
   }
   let parentModule = "";
@@ -23371,7 +23390,7 @@ async function applyImports(doc, resp, outputChannel) {
     outputChannel.appendLine(`Error in add import:
 ${errorMessage}`);
     outputChannel.appendLine("");
-    import_coc23.window.showMessage(`Cannot perform addImport using selected element(s).`, "error");
+    import_coc23.window.showErrorMessage(`Cannot perform addImport using selected element(s).`);
     return await Promise.reject(error);
   }
 }
@@ -23421,7 +23440,7 @@ async function extractName(textEditor, newName, renameResponse, outputChannel) {
     outputChannel.appendLine(`Error in refactoring:
 ${errorMessage}`);
     outputChannel.appendLine("");
-    import_coc23.window.showMessage(`Cannot perform refactoring using selected element(s).`, "error");
+    import_coc23.window.showErrorMessage(`Cannot perform refactoring using selected element(s).`);
     return await Promise.reject(error);
   }
 }
@@ -23546,11 +23565,11 @@ async function activate(context) {
     return;
   const state = import_coc24.extensions.getExtensionState("coc-python");
   if (state.toString() === "activated") {
-    import_coc24.window.showMessage(`coc-python is installed and activated, coc-pyright will be disabled`, "warning");
+    import_coc24.window.showWarningMessage(`coc-python is installed and activated, coc-pyright will be disabled`);
     return;
   }
   if ((0, import_semver2.lt)(process.versions.node, "12.0.0")) {
-    import_coc24.window.showMessage(`Pyright needs Node.js v12+ to work, your Node.js is ${process.version}.`, "error");
+    import_coc24.window.showErrorMessage(`Pyright needs Node.js v12+ to work, your Node.js is ${process.version}.`);
     return;
   }
   let module2 = pyrightCfg.get("server");
@@ -23560,7 +23579,7 @@ async function activate(context) {
     module2 = (0, import_path5.join)(context.extensionPath, "node_modules", "pyright", "langserver.index.js");
   }
   if (!(0, import_fs.existsSync)(module2)) {
-    import_coc24.window.showMessage(`Pyright langserver doesn't exist, please reinstall coc-pyright`, "error");
+    import_coc24.window.showErrorMessage(`Pyright langserver doesn't exist, please reinstall coc-pyright`);
     return;
   }
   const runOptions = { execArgv: [`--max-old-space-size=${defaultHeapSize}`] };
@@ -23576,6 +23595,9 @@ async function activate(context) {
   if (pyrightCfg.get("disableDiagnostics")) {
     disabledFeatures.push("diagnostics");
   }
+  const disableProgress = pyrightCfg.get("disableProgressNotifications");
+  if (disableProgress)
+    disabledFeatures.push("progress");
   const outputChannel = import_coc24.window.createOutputChannel("Pyright");
   const pythonSettings = PythonSettings.getInstance();
   outputChannel.appendLine(`Workspace: ${import_coc24.workspace.root}`);
@@ -23588,7 +23610,7 @@ async function activate(context) {
     },
     outputChannel,
     disabledFeatures,
-    progressOnInitialization: true,
+    progressOnInitialization: !disableProgress,
     middleware: {
       workspace: {
         configuration
@@ -23632,7 +23654,7 @@ async function activate(context) {
   command = "pyright.createtypestub";
   disposable = import_coc24.commands.registerCommand(command, async (...args) => {
     if (!args.length) {
-      import_coc24.window.showMessage(`Module name is missing`, "warning");
+      import_coc24.window.showWarningMessage(`Module name is missing`);
       return;
     }
     const doc = await import_coc24.workspace.document;
@@ -23673,7 +23695,7 @@ async function activate(context) {
     const pyrightPackage = JSON.parse((0, import_fs.readFileSync)(pyrightJSON, "utf8"));
     const cocPyrightJSON = (0, import_path5.join)(context.extensionPath, "package.json");
     const cocPyrightPackage = JSON.parse((0, import_fs.readFileSync)(cocPyrightJSON, "utf8"));
-    import_coc24.window.showMessage(`coc-pyright ${cocPyrightPackage.version} with Pyright ${pyrightPackage.version}`);
+    import_coc24.window.showInformationMessage(`coc-pyright ${cocPyrightPackage.version} with Pyright ${pyrightPackage.version}`);
   });
   context.subscriptions.push(disposable);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coc-pyright",
-  "version": "1.1.250",
+  "version": "1.1.253",
   "description": "Pyright extension for coc.nvim, static type checker for Python",
   "author": "Heyward Fann <fannheyward@gmail.com>",
   "license": "MIT",
@@ -1327,6 +1327,11 @@
           "default": false,
           "description": "Disable diagnostics from Pyright"
         },
+        "pyright.disableProgressNotifications": {
+          "type": "boolean",
+          "default": false,
+          "description": "Disable the initialization and workdone progress notifications"
+        },
         "pyright.completion.importSupport": {
           "type": "boolean",
           "default": true,
@@ -1403,6 +1408,6 @@
     ]
   },
   "dependencies": {
-    "pyright": "^1.1.250"
+    "pyright": "^1.1.253"
   }
 }