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

package/dist/localization/package.nls.en-us.json

@@ -68,6 +68,8 @@
         "concatenateTypeArgsMissing": "\"Concatenate\" requires at least two type arguments",
         "constantRedefinition": "\"{name}\" is constant (because it is uppercase) and cannot be redefined",
         "constructorParametersMismatch": "Mismatch between signature of __new__ and __init__ in class \"{classType}\"",
+        "containmentAlwaysFalse": "Expression will always evaluate to False since the types \"{leftType}\" and \"{rightType}\" have no overlap",
+        "containmentAlwaysTrue": "Expression will always evaluate to True since the types \"{leftType}\" and \"{rightType}\" have no overlap",
         "continueInFinally": "\"continue\" cannot be used within a finally clause",
         "continueOutsideLoop": "\"continue\" can be used only within a loop",
         "constructorNoArgs": "Expected no arguments to \"{type}\" constructor",
@@ -493,6 +495,7 @@
         "unusedCoroutine": "Result of async function call is not used; use \"await\" or assign result to variable",
         "unusedExpression": "Expression value is unused",
         "varAnnotationIllegal": "Type annotations for variables requires Python 3.6 or newer; use type comment for compatibility with previous versions",
+        "variableFinalOverride": "Variable \"{name}\" is marked Final and overrides non-Final variable of same name in class \"{className}\"",
         "variadicTypeArgsTooMany": "Type argument list can have at most one unpacked TypeVarTuple or Tuple",
         "variadicTypeParamTooManyAlias": "Type alias can have at most one TypeVarTuple type parameter but received multiple ({names})",
         "variadicTypeParamTooManyClass": "Generic class can have at most one TypeVarTuple type parameter but received multiple ({names})",
@@ -565,6 +568,7 @@
         "overloadWithImplementation": "The body of a function overload should be \"...\"",
         "overriddenMethod": "Overridden method",
         "overriddenSymbol": "Overridden symbol",
+        "overrideNoOverloadMatches": "No overload signature in override is compatible with base method",
         "overrideNotClassMethod": "Base method is declared as a classmethod but override is not",
         "overrideNotInstanceMethod": "Base method is declared as an instance method but override is not",
         "overrideNotStaticMethod": "Base method is declared as a staticmethod but override is not",

package/dist/parser/parser.js

@@ -39,6 +39,7 @@ const diagnostic_1 = require("../common/diagnostic");
 const diagnosticSink_1 = require("../common/diagnosticSink");
 const positionUtils_1 = require("../common/positionUtils");
 const pythonVersion_1 = require("../common/pythonVersion");
+const textRange_1 = require("../common/textRange");
 const timing_1 = require("../common/timing");
 const localize_1 = require("../localization/localize");
 const parseNodes_1 = require("./parseNodes");
@@ -3002,12 +3003,19 @@ class Parser {
     // child node can be passed to help the completion provider determine
     // what to do.
     _handleExpressionParseError(category, errorMsg, targetToken, childNode, additionalStopTokens) {
+        var _a;
         this._addError(errorMsg, targetToken !== null && targetToken !== void 0 ? targetToken : this._peekToken());
-        const expr = parseNodes_1.ErrorNode.create(this._peekToken(), category, childNode);
         const stopTokens = [2 /* NewLine */];
         if (additionalStopTokens) {
             (0, collectionUtils_1.appendArray)(stopTokens, additionalStopTokens);
         }
+        // Using token that is not consumed by error node will mess up spans in parse node.
+        // Sibling nodes in parse tree shouldn't overlap each other.
+        const nextToken = this._peekToken();
+        const initialRange = stopTokens.some((k) => nextToken.type === k)
+            ? (_a = targetToken !== null && targetToken !== void 0 ? targetToken : childNode) !== null && _a !== void 0 ? _a : textRange_1.TextRange.create(nextToken.start, /* length */ 0)
+            : nextToken;
+        const expr = parseNodes_1.ErrorNode.create(initialRange, category, childNode);
         this._consumeTokensUntilType(stopTokens);
         return expr;
     }