coc-pyright 1.1.252 → 1.1.260

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

@@ -1,26 +1,10 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
@@ -3448,7 +3432,7 @@ var require_make_dir = __commonJS({
       const defaults = { mode: 511 };
       if (typeof options === "number")
         return options;
-      return __spreadValues(__spreadValues({}, defaults), options).mode;
+      return { ...defaults, ...options }.mode;
     };
     module2.exports.makeDir = async (dir, options) => {
       checkPath(dir);
@@ -5090,7 +5074,18 @@ var require_move2 = __commonJS({
 var require_lib = __commonJS({
   "node_modules/fs-extra/lib/index.js"(exports, module2) {
     "use strict";
-    module2.exports = __spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues({}, require_fs()), require_copy2()), require_empty()), require_ensure()), require_json()), require_mkdirs()), require_move2()), require_output_file()), require_path_exists()), require_remove());
+    module2.exports = {
+      ...require_fs(),
+      ...require_copy2(),
+      ...require_empty(),
+      ...require_ensure(),
+      ...require_json(),
+      ...require_mkdirs(),
+      ...require_move2(),
+      ...require_output_file(),
+      ...require_path_exists(),
+      ...require_remove()
+    };
   }
 });
 
@@ -21828,7 +21823,7 @@ var ProcessService = class {
     return deferred.promise;
   }
   getDefaultOptions(options) {
-    const defaultOptions = __spreadValues({}, options);
+    const defaultOptions = { ...options };
     const execOptions = defaultOptions;
     if (execOptions) {
       const encoding = execOptions.encoding = typeof execOptions.encoding === "string" && execOptions.encoding.length > 0 ? execOptions.encoding : DEFAULT_ENCODING;
@@ -21836,9 +21831,9 @@ var ProcessService = class {
       execOptions.encoding = encoding;
     }
     if (!defaultOptions.env || Object.keys(defaultOptions.env).length === 0) {
-      defaultOptions.env = __spreadValues({}, process.env);
+      defaultOptions.env = { ...process.env };
     } else {
-      defaultOptions.env = __spreadValues({}, defaultOptions.env);
+      defaultOptions.env = { ...defaultOptions.env };
     }
     defaultOptions.env.PYTHONUNBUFFERED = "1";
     if (!defaultOptions.env.PYTHONIOENCODING) {
@@ -21856,11 +21851,11 @@ var PythonExecutionService = class {
     return this.procService.exec(this.pythonSettings.pythonPath, ["-c", `import ${moduleName}`], { throwOnStdErr: true }).then(() => true).catch(() => false);
   }
   execObservable(args, options) {
-    const opts = __spreadValues({}, options);
+    const opts = { ...options };
     return this.procService.execObservable(this.pythonSettings.pythonPath, args, opts);
   }
   async exec(executionInfo, options) {
-    const opts = __spreadValues({}, options);
+    const opts = { ...options };
     const { execPath, moduleName, args } = executionInfo;
     if (moduleName && moduleName.length > 0) {
       const result = await this.procService.exec(this.pythonSettings.pythonPath, ["-m", moduleName, ...args], opts);
@@ -21946,7 +21941,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(() => {
@@ -21968,7 +21963,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);
@@ -22024,7 +22019,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();
@@ -22181,12 +22176,12 @@ async function getPorts(options) {
       if (exclude.has(port)) {
         continue;
       }
-      let availablePort = await getAvailablePort(__spreadProps(__spreadValues({}, options), { port }), hosts);
+      let availablePort = await getAvailablePort({ ...options, port }, hosts);
       while (lockedPorts.old.has(availablePort) || lockedPorts.young.has(availablePort)) {
         if (port !== 0) {
           throw new Locked(port);
         }
-        availablePort = await getAvailablePort(__spreadProps(__spreadValues({}, options), { port }), hosts);
+        availablePort = await getAvailablePort({ ...options, port }, hosts);
       }
       lockedPorts.young.add(availablePort);
       return availablePort;
@@ -22287,16 +22282,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);
@@ -22363,7 +22358,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`);
   }
 }
 
@@ -23285,7 +23280,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;
@@ -23308,7 +23303,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);
@@ -23331,7 +23326,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);
@@ -23354,7 +23349,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 = "";
@@ -23390,7 +23385,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);
   }
 }
@@ -23440,7 +23435,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);
   }
 }
@@ -23565,11 +23560,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");
@@ -23579,7 +23574,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}`] };
@@ -23595,6 +23590,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}`);
@@ -23607,7 +23605,7 @@ async function activate(context) {
     },
     outputChannel,
     disabledFeatures,
-    progressOnInitialization: true,
+    progressOnInitialization: !disableProgress,
     middleware: {
       workspace: {
         configuration
@@ -23651,7 +23649,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;
@@ -23692,7 +23690,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.252",
+  "version": "1.1.260",
   "description": "Pyright extension for coc.nvim, static type checker for Python",
   "author": "Heyward Fann <fannheyward@gmail.com>",
   "license": "MIT",
@@ -425,6 +425,17 @@
                 "error"
               ]
             },
+            "reportTypeCommentUsage": {
+              "type": "string",
+              "description": "Diagnostics for usage of deprecated type comments.",
+              "default": "none",
+              "enum": [
+                "none",
+                "information",
+                "warning",
+                "error"
+              ]
+            },
             "reportPrivateImportUsage": {
               "type": "string",
               "description": "Diagnostics for incorrect usage of symbol imported from a \"py.typed\" module that is not re-exported from that module.",
@@ -1327,6 +1338,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 +1419,6 @@
     ]
   },
   "dependencies": {
-    "pyright": "^1.1.251"
+    "pyright": "^1.1.260"
   }
 }

package/schemas/pyrightconfig.schema.json

@@ -67,6 +67,17 @@
         "pattern": "^(.*)$"
       }
     },
+    "defineConstant": {
+      "$id": "#/properties/defineConstant",
+      "type": "object",
+      "title": "Identifiers that should be treated as constants",
+      "properties": {
+      },
+      "additionalProperties": {
+          "type": ["string", "boolean"],
+          "title": "Value of constant (boolean or string)"
+      }
+    },
     "typeCheckingMode": {
       "$id": "#/properties/typeCheckingMode",
       "type": "string",
@@ -281,6 +292,12 @@
       "title": "Controls reporting of private variables and functions used outside of the owning class or module and usage of protected members outside of subclasses",
       "default": "none"
     },
+    "reportTypeCommentUsage": {
+      "$id": "#/properties/reportTypeCommentUsage",
+      "$ref": "#/definitions/diagnostic",
+      "title": "Controls reporting of deprecated type comment usage",
+      "default": "none"
+    },
     "reportPrivateImportUsage": {
       "$id": "#/properties/reportPrivateImportUsage",
       "$ref": "#/definitions/diagnostic",