coc-pyright 1.1.164 → 1.1.171

package/README.md

@@ -1,5 +1,10 @@
 # coc-pyright
 
+<!-- markdownlint-disable no-inline-html -->
+<a href="https://github.com/sponsors/fannheyward"><img src="https://user-images.githubusercontent.com/345274/133218454-014a4101-b36a-48c6-a1f6-342881974938.png" alt="GitHub Sponsors" /></a>
+<a href="https://patreon.com/fannheyward"><img src="https://c5.patreon.com/external/logo/become_a_patron_button.png" alt="Patreon donate button" /></a>
+<a href="https://paypal.me/fannheyward"><img src="https://user-images.githubusercontent.com/345274/104303610-41149f00-5505-11eb-88b2-5a95c53187b4.png" alt="PayPal donate button" /></a>
+
 [Pyright](https://github.com/microsoft/pyright) extension for coc.nvim
 
 <!-- markdownlint-disable-next-line -->
@@ -59,6 +64,7 @@ These configurations are used by `coc-pyright`, you need to set them in your `co
 | python.linting.pylintEnabled                | Whether to lint with pylint                                         | false         |
 | python.sortImports.path                     | Path to isort script, default using inner version                   | ''            |
 | python.sortImports.args                     | Arguments passed to isort                                           | []            |
+| pyright.server                              | Custom `pyright-langserver` path                                    | ''            |
 | pyright.disableDiagnostics                  | Disable diagnostics from Pyright                                    | false         |
 | pyright.completion.snippetSupport           | Enable completion snippets support                                  | true          |
 | pyright.organizeimports.provider            | Organize imports provider, `pyright` or `isort`                     | pyright       |
@@ -101,14 +107,6 @@ This way python from your currently activated environment will be used
 3. install modules with pip and work with Pyright
 4. `deactivate`
 
-## Supporting
-
-If this extension is helpful to you, please support me via Patreon or PayPal:
-
-<!-- markdownlint-disable no-inline-html -->
-<a href="https://patreon.com/fannheyward"><img src="https://c5.patreon.com/external/logo/become_a_patron_button.png" alt="Patreon donate button" /></a>
-<a href="https://paypal.me/fannheyward"><img src="https://user-images.githubusercontent.com/345274/104303610-41149f00-5505-11eb-88b2-5a95c53187b4.png" alt="PayPal donate button" /></a>
-
 ## License
 
 MIT

package/lib/index.js

@@ -19,7 +19,10 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
-var __commonJS = (cb, mod) => function __require() {
+var __require = typeof require !== "undefined" ? require : (x) => {
+  throw new Error('Dynamic require of "' + x + '" is not supported');
+};
+var __commonJS = (cb, mod) => function __require2() {
   return mod || (0, cb[Object.keys(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
 var __export = (target, all) => {
@@ -21886,14 +21889,22 @@ var BaseFormatter = class {
     this.outputChannel.appendLine(`moduleName: ${executionInfo.moduleName}`);
     this.outputChannel.appendLine(`args:       ${executionInfo.args}`);
     const pythonToolsExecutionService = new PythonExecutionService();
-    const promise = pythonToolsExecutionService.exec(executionInfo, { cwd, throwOnStdErr: false, token }).then((output) => output.stdout).then((data) => {
+    const promise = pythonToolsExecutionService.exec(executionInfo, { cwd, throwOnStdErr: false, token }).then((output) => {
+      if (output.stderr) {
+        throw new Error(output.stderr);
+      }
+      return output.stdout;
+    }).then((data) => {
       this.outputChannel.appendLine("");
       this.outputChannel.appendLine(`${"#".repeat(10)} ${this.Id} output:`);
       this.outputChannel.appendLine(data);
       if (this.checkCancellation(filepath, tempFile, token)) {
         return [];
       }
-      return getTextEditsFromPatch(document.getText(), data);
+      const edits = getTextEditsFromPatch(document.getText(), data);
+      if (edits.length)
+        import_coc4.window.showMessage(`Formatted with ${this.Id}`);
+      return edits;
     }).catch((error) => {
       if (this.checkCancellation(filepath, tempFile, token)) {
         return [];
@@ -21901,12 +21912,7 @@ var BaseFormatter = class {
       this.handleError(this.Id, error).catch(() => {
       });
       return [];
-    });
-    promise.then(() => {
-      this.deleteTempFile(filepath, tempFile).catch(() => {
-      });
-      import_coc4.window.showMessage(`Formatted with ${this.Id}`);
-    }, () => {
+    }).finally(() => {
       this.deleteTempFile(filepath, tempFile).catch(() => {
       });
     });
@@ -23427,6 +23433,9 @@ async function provideHover(document, position, token, next) {
   }
   return hover;
 }
+async function handleDiagnostics(uri, diagnostics, next) {
+  next(uri, diagnostics.filter((d) => d.message !== '"__" is not accessed'));
+}
 async function activate(context) {
   const pyrightCfg = import_coc24.workspace.getConfiguration("pyright");
   const isEnable = pyrightCfg.get("enable", true);
@@ -23441,10 +23450,13 @@ async function activate(context) {
     import_coc24.window.showMessage(`Pyright needs Node.js v12+ to work, your Node.js is ${process.version}.`, "error");
     return;
   }
-  const module2 = context.asAbsolutePath("node_modules/pyright/langserver.index.js");
-  if (!(0, import_fs.existsSync)(module2)) {
-    import_coc24.window.showMessage(`Pyright file doesn't exist, please reinstall coc-pyright`, "error");
-    return;
+  let module2 = pyrightCfg.get("server");
+  if (!module2) {
+    module2 = (0, import_path5.join)(context.extensionPath, "node_modules", "pyright", "langserver.index.js");
+    if (!(0, import_fs.existsSync)(module2)) {
+      import_coc24.window.showMessage(`Pyright file doesn't exist, please reinstall coc-pyright`, "error");
+      return;
+    }
   }
   const serverOptions = {
     module: module2,
@@ -23469,6 +23481,7 @@ async function activate(context) {
         configuration
       },
       provideHover,
+      handleDiagnostics,
       provideCompletionItem,
       resolveCompletionItem
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coc-pyright",
-  "version": "1.1.164",
+  "version": "1.1.171",
   "description": "Pyright extension for coc.nvim, static type checker for Python",
   "author": "Heyward Fann <fannheyward@gmail.com>",
   "license": "MIT",
@@ -42,11 +42,11 @@
     "@types/node": "10.12.0",
     "@types/semver": "^7.3.6",
     "@types/which": "^2.0.0",
-    "@typescript-eslint/eslint-plugin": "^4.23.0",
-    "@typescript-eslint/parser": "^4.23.0",
+    "@typescript-eslint/eslint-plugin": "^4.30.0",
+    "@typescript-eslint/parser": "^4.30.0",
     "coc.nvim": "^0.0.81-next.1",
     "diff-match-patch": "^1.0.5",
-    "esbuild": "^0.12.0",
+    "esbuild": "^0.12.25",
     "eslint": "^7.26.0",
     "fs-extra": "^10.0.0",
     "iconv-lite": "^0.6.2",
@@ -424,6 +424,17 @@
                 "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.",
+              "default": "error",
+              "enum": [
+                "none",
+                "information",
+                "warning",
+                "error"
+              ]
+            },
             "reportConstantRedefinition": {
               "type": "string",
               "description": "Diagnostics for attempts to redefine variables whose names are all-caps with underscores and numerals.",
@@ -1263,6 +1274,11 @@
             "isort"
           ]
         },
+        "pyright.server": {
+          "type": "string",
+          "default": "",
+          "description": "Custom pyright-langserver path"
+        },
         "pyright.trace.server": {
           "type": "string",
           "scope": "window",
@@ -1315,6 +1331,6 @@
     ]
   },
   "dependencies": {
-    "pyright": "^1.1.163"
+    "pyright": "^1.1.171"
   }
 }

package/schemas/pyrightconfig.schema.json

@@ -281,6 +281,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"
     },
+    "reportPrivateImportUsage": {
+      "$id": "#/properties/reportPrivateImportUsage",
+      "$ref": "#/definitions/diagnostic",
+      "title": "Controls reporting of improper usage of symbol imported from a \"py.typed\" module that is not re-exported from that module",
+      "default": "error"
+    },
     "reportConstantRedefinition": {
       "$id": "#/properties/reportConstantRedefinition",
       "$ref": "#/definitions/diagnostic",