@zzzen/pyright-internal 1.2.0-dev.20220703 → 1.2.0-dev.20220710

package/dist/analyzer/checker.js

@@ -51,6 +51,7 @@ const ParseTreeUtils = __importStar(require("./parseTreeUtils"));
 const parseTreeWalker_1 = require("./parseTreeWalker");
 const patternMatching_1 = require("./patternMatching");
 const scopeUtils_1 = require("./scopeUtils");
+const sourceFile_1 = require("./sourceFile");
 const sourceMapper_1 = require("./sourceMapper");
 const staticExpressions_1 = require("./staticExpressions");
 const SymbolNameUtils = __importStar(require("./symbolNameUtils"));
@@ -327,7 +328,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                 if (annotationNode && index < functionTypeResult.functionType.details.parameters.length) {
                     const paramType = functionTypeResult.functionType.details.parameters[index].type;
                     if ((0, types_1.isTypeVar)(paramType) &&
-                        paramType.details.declaredVariance === 2 /* Covariant */ &&
+                        paramType.details.declaredVariance === 3 /* Covariant */ &&
                         !paramType.details.isSynthesized &&
                         functionTypeResult.functionType.details.name !== '__init__') {
                         this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.paramTypeCovariant(), annotationNode);
@@ -1894,7 +1895,9 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
     }
     _conditionallyReportUnusedSymbol(name, symbol, scopeType) {
         const accessedSymbolSet = this._fileInfo.accessedSymbolSet;
-        if (symbol.isIgnoredForProtocolMatch() || accessedSymbolSet.has(symbol.id)) {
+        if (symbol.isIgnoredForProtocolMatch() ||
+            accessedSymbolSet.has(symbol.id) ||
+            this._fileInfo.ipythonMode === sourceFile_1.IPythonMode.CellDocs) {
             return;
         }
         // A name of "_" means "I know this symbol isn't used", so
@@ -2549,7 +2552,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                 }
                 const diag = new diagnostic_1.DiagnosticAddendum();
                 if ((0, types_1.isTypeVar)(declaredReturnType) &&
-                    declaredReturnType.details.declaredVariance === 3 /* Contravariant */) {
+                    declaredReturnType.details.declaredVariance === 4 /* Contravariant */) {
                     diag.addMessage(localize_1.Localizer.DiagnosticAddendum.typeVarIsContravariant().format({
                         name: types_1.TypeVarType.getReadableName(declaredReturnType),
                     }));
@@ -2910,26 +2913,26 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             const isDestSubtypeOfSrc = this._evaluator.assignClassToSelf(srcType, destType);
             let expectedVariance;
             if (isDestSubtypeOfSrc) {
-                expectedVariance = 2 /* Covariant */;
+                expectedVariance = 3 /* Covariant */;
             }
             else {
                 const isSrcSubtypeOfDest = this._evaluator.assignClassToSelf(destType, srcType);
                 if (isSrcSubtypeOfDest) {
-                    expectedVariance = 3 /* Contravariant */;
+                    expectedVariance = 4 /* Contravariant */;
                 }
                 else {
-                    expectedVariance = 1 /* Invariant */;
+                    expectedVariance = 2 /* Invariant */;
                 }
             }
             if (expectedVariance !== classType.details.typeParameters[paramIndex].details.declaredVariance) {
                 let message;
-                if (expectedVariance === 2 /* Covariant */) {
+                if (expectedVariance === 3 /* Covariant */) {
                     message = localize_1.Localizer.Diagnostic.protocolVarianceCovariant().format({
                         variable: param.details.name,
                         class: classType.details.name,
                     });
                 }
-                else if (expectedVariance === 3 /* Contravariant */) {
+                else if (expectedVariance === 4 /* Contravariant */) {
                     message = localize_1.Localizer.Diagnostic.protocolVarianceContravariant().format({
                         variable: param.details.name,
                         class: classType.details.name,