@zzzen/pyright-internal 1.2.0-dev.20240114 → 1.2.0-dev.20240128

package/dist/analyzer/binder.d.ts

@@ -137,9 +137,7 @@ export declare class Binder extends ParseTreeWalker {
     private _bindYield;
     private _getUniqueFlowNodeId;
     private _addDiagnostic;
-    private _addError;
-    private _addWarning;
-    private _addInformation;
+    private _addSyntaxError;
 }
 export declare class YieldFinder extends ParseTreeWalker {
     private _containsYield;

package/dist/analyzer/binder.js

@@ -198,7 +198,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             return true;
         }
         if (!importResult.isImportFound) {
-            this._addDiagnostic(this._fileInfo.diagnosticRuleSet.reportMissingImports, diagnosticRules_1.DiagnosticRule.reportMissingImports, localize_1.Localizer.Diagnostic.importResolveFailure().format({
+            this._addDiagnostic(this._fileInfo.diagnosticRuleSet.reportMissingImports, diagnosticRules_1.DiagnosticRule.reportMissingImports, localize_1.LocMessage.importResolveFailure().format({
                 importName: importResult.importName,
                 venv: this._fileInfo.executionEnvironment.name,
             }), node);
@@ -208,7 +208,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         if (!importResult.isStubFile &&
             importResult.importType === 1 /* ImportType.ThirdParty */ &&
             !importResult.pyTypedInfo) {
-            const diagnostic = this._addDiagnostic(this._fileInfo.diagnosticRuleSet.reportMissingTypeStubs, diagnosticRules_1.DiagnosticRule.reportMissingTypeStubs, localize_1.Localizer.Diagnostic.stubFileMissing().format({ importName: importResult.importName }), node);
+            const diagnostic = this._addDiagnostic(this._fileInfo.diagnosticRuleSet.reportMissingTypeStubs, diagnosticRules_1.DiagnosticRule.reportMissingTypeStubs, localize_1.LocMessage.stubFileMissing().format({ importName: importResult.importName }), node);
             if (diagnostic) {
                 // Add a diagnostic action for resolving this diagnostic.
                 const createTypeStubAction = {
@@ -496,7 +496,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             }
             if (emitDunderAllWarning) {
                 this._usesUnsupportedDunderAllForm = true;
-                this._addDiagnostic(this._fileInfo.diagnosticRuleSet.reportUnsupportedDunderAll, diagnosticRules_1.DiagnosticRule.reportUnsupportedDunderAll, localize_1.Localizer.Diagnostic.unsupportedDunderAllOperation(), node);
+                this._addDiagnostic(this._fileInfo.diagnosticRuleSet.reportUnsupportedDunderAll, diagnosticRules_1.DiagnosticRule.reportUnsupportedDunderAll, localize_1.LocMessage.unsupportedDunderAllOperation(), node);
             }
         }
         return false;
@@ -522,7 +522,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             AnalyzerNodeInfo.setDeclaration(name, paramDeclaration);
             AnalyzerNodeInfo.setTypeParameterSymbol(name, symbol);
             if (this._activeTypeParams.has(name.value)) {
-                this._addError(localize_1.Localizer.Diagnostic.typeParameterExistingTypeParameter().format({ name: name.value }), name);
+                this._addSyntaxError(localize_1.LocMessage.typeParameterExistingTypeParameter().format({ name: name.value }), name);
             }
             else {
                 this._activeTypeParams.set(name.value, { symbol, scope: this._currentScope });
@@ -573,7 +573,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             this._addTypeDeclarationForVariable(node.leftExpression, node.typeAnnotationComment);
         }
         if (node.chainedTypeAnnotationComment) {
-            this._addDiagnostic(this._fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.annotationNotSupported(), node.chainedTypeAnnotationComment);
+            this._addDiagnostic(this._fileInfo.diagnosticRuleSet.reportInvalidTypeForm, diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, localize_1.LocMessage.annotationNotSupported(), node.chainedTypeAnnotationComment);
         }
         // If the assignment target base expression is potentially a
         // TypedDict, add the base expression to the flow expressions set
@@ -649,7 +649,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 }
                 if (emitDunderAllWarning) {
                     this._usesUnsupportedDunderAllForm = true;
-                    this._addDiagnostic(this._fileInfo.diagnosticRuleSet.reportUnsupportedDunderAll, diagnosticRules_1.DiagnosticRule.reportUnsupportedDunderAll, localize_1.Localizer.Diagnostic.unsupportedDunderAllOperation(), node);
+                    this._addDiagnostic(this._fileInfo.diagnosticRuleSet.reportUnsupportedDunderAll, diagnosticRules_1.DiagnosticRule.reportUnsupportedDunderAll, localize_1.LocMessage.unsupportedDunderAllOperation(), node);
                 }
             }
         }
@@ -708,7 +708,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         });
         const evaluationNode = ParseTreeUtils.getEvaluationNodeForAssignmentExpression(node);
         if (!evaluationNode) {
-            this._addError(localize_1.Localizer.Diagnostic.assignmentExprContext(), node);
+            this._addSyntaxError(localize_1.LocMessage.assignmentExprContext(), node);
             this.walk(node.name);
         }
         else {
@@ -724,7 +724,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             while (curScope && curScope !== containerScope) {
                 const localSymbol = curScope.lookUpSymbol(node.name.value);
                 if (localSymbol) {
-                    this._addError(localize_1.Localizer.Diagnostic.assignmentExprComprehension().format({ name: node.name.value }), node.name);
+                    this._addSyntaxError(localize_1.LocMessage.assignmentExprComprehension().format({ name: node.name.value }), node.name);
                     break;
                 }
                 curScope = curScope.parent;
@@ -776,7 +776,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             }
             if (emitDunderAllWarning) {
                 this._usesUnsupportedDunderAllForm = true;
-                this._addDiagnostic(this._fileInfo.diagnosticRuleSet.reportUnsupportedDunderAll, diagnosticRules_1.DiagnosticRule.reportUnsupportedDunderAll, localize_1.Localizer.Diagnostic.unsupportedDunderAllOperation(), node);
+                this._addDiagnostic(this._fileInfo.diagnosticRuleSet.reportUnsupportedDunderAll, diagnosticRules_1.DiagnosticRule.reportUnsupportedDunderAll, localize_1.LocMessage.unsupportedDunderAllOperation(), node);
             }
         }
         return false;
@@ -854,7 +854,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         if (node.asyncToken && !this._fileInfo.ipythonMode) {
             const enclosingFunction = ParseTreeUtils.getEnclosingFunction(node);
             if (!enclosingFunction || !enclosingFunction.isAsync) {
-                this._addError(localize_1.Localizer.Diagnostic.asyncNotInAsyncFunction(), node.asyncToken);
+                this._addSyntaxError(localize_1.LocMessage.asyncNotInAsyncFunction(), node.asyncToken);
             }
         }
         return false;
@@ -897,14 +897,14 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
     }
     visitYield(node) {
         if (this._isInListComprehension(node, /* ignoreOutermostIterable */ true)) {
-            this._addError(localize_1.Localizer.Diagnostic.yieldWithinListCompr(), node);
+            this._addSyntaxError(localize_1.LocMessage.yieldWithinListCompr(), node);
         }
         this._bindYield(node);
         return false;
     }
     visitYieldFrom(node) {
         if (this._isInListComprehension(node, /* ignoreOutermostIterable */ true)) {
-            this._addError(localize_1.Localizer.Diagnostic.yieldWithinListCompr(), node);
+            this._addSyntaxError(localize_1.LocMessage.yieldWithinListCompr(), node);
         }
         this._bindYield(node);
         return false;
@@ -1201,7 +1201,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             // generator expressions is deferred and therefore can be
             // run within the context of an async function later.
             if (((_a = node.parent) === null || _a === void 0 ? void 0 : _a.nodeType) !== 32 /* ParseNodeType.ListComprehension */) {
-                this._addError(localize_1.Localizer.Diagnostic.awaitNotInAsync(), node);
+                this._addSyntaxError(localize_1.LocMessage.awaitNotInAsync(), node);
             }
         }
         return true;
@@ -1212,12 +1212,12 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             const nameValue = name.value;
             // Is the binding inconsistent?
             if (this._currentScope.getBindingType(nameValue) === 0 /* NameBindingType.Nonlocal */) {
-                this._addError(localize_1.Localizer.Diagnostic.nonLocalRedefinition().format({ name: nameValue }), name);
+                this._addSyntaxError(localize_1.LocMessage.nonLocalRedefinition().format({ name: nameValue }), name);
             }
             const valueWithScope = this._currentScope.lookUpSymbolRecursive(nameValue);
             // Was the name already assigned within this scope before it was declared global?
             if (valueWithScope && valueWithScope.scope === this._currentScope) {
-                this._addError(localize_1.Localizer.Diagnostic.globalReassignment().format({ name: nameValue }), name);
+                this._addSyntaxError(localize_1.LocMessage.globalReassignment().format({ name: nameValue }), name);
             }
             // Add it to the global scope if it's not already added.
             this._bindNameToScope(globalScope, name);
@@ -1230,22 +1230,22 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
     visitNonlocal(node) {
         const globalScope = this._currentScope.getGlobalScope().scope;
         if (this._currentScope === globalScope) {
-            this._addError(localize_1.Localizer.Diagnostic.nonLocalInModule(), node);
+            this._addSyntaxError(localize_1.LocMessage.nonLocalInModule(), node);
         }
         else {
             node.nameList.forEach((name) => {
                 const nameValue = name.value;
                 // Is the binding inconsistent?
                 if (this._currentScope.getBindingType(nameValue) === 1 /* NameBindingType.Global */) {
-                    this._addError(localize_1.Localizer.Diagnostic.globalRedefinition().format({ name: nameValue }), name);
+                    this._addSyntaxError(localize_1.LocMessage.globalRedefinition().format({ name: nameValue }), name);
                 }
                 const valueWithScope = this._currentScope.lookUpSymbolRecursive(nameValue);
                 // Was the name already assigned within this scope before it was declared nonlocal?
                 if (valueWithScope && valueWithScope.scope === this._currentScope) {
-                    this._addError(localize_1.Localizer.Diagnostic.nonLocalReassignment().format({ name: nameValue }), name);
+                    this._addSyntaxError(localize_1.LocMessage.nonLocalReassignment().format({ name: nameValue }), name);
                 }
                 else if (!valueWithScope || valueWithScope.scope === globalScope) {
-                    this._addError(localize_1.Localizer.Diagnostic.nonLocalNoBinding().format({ name: nameValue }), name);
+                    this._addSyntaxError(localize_1.LocMessage.nonLocalNoBinding().format({ name: nameValue }), name);
                 }
                 if (valueWithScope) {
                     this._currentScope.setBindingType(nameValue, 0 /* NameBindingType.Nonlocal */);
@@ -1336,7 +1336,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         }
         if (node.isWildcardImport) {
             if (ParseTreeUtils.getEnclosingClass(node) || ParseTreeUtils.getEnclosingFunction(node)) {
-                this._addError(localize_1.Localizer.Diagnostic.wildcardInFunction(), node);
+                this._addSyntaxError(localize_1.LocMessage.wildcardInFunction(), node);
             }
             if (importInfo) {
                 const names = [];
@@ -1573,7 +1573,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 // Top level async with is allowed in ipython mode.
                 const enclosingFunction = ParseTreeUtils.getEnclosingFunction(node);
                 if (!enclosingFunction || !enclosingFunction.isAsync) {
-                    this._addError(localize_1.Localizer.Diagnostic.asyncNotInAsyncFunction(), node.asyncToken);
+                    this._addSyntaxError(localize_1.LocMessage.asyncNotInAsyncFunction(), node.asyncToken);
                 }
             }
         });
@@ -1675,7 +1675,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                             // generator expressions is deferred and therefore can be
                             // run within the context of an async function later.
                             if (((_a = node.parent) === null || _a === void 0 ? void 0 : _a.nodeType) === 31 /* ParseNodeType.List */) {
-                                this._addError(localize_1.Localizer.Diagnostic.asyncNotInAsyncFunction(), compr.asyncToken);
+                                this._addSyntaxError(localize_1.LocMessage.asyncNotInAsyncFunction(), compr.asyncToken);
                             }
                         }
                     }
@@ -2963,7 +2963,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             }
         }
         if (!declarationHandled) {
-            this._addDiagnostic(this._fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.annotationNotSupported(), typeAnnotation);
+            this._addDiagnostic(this._fileInfo.diagnosticRuleSet.reportInvalidTypeForm, diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, localize_1.LocMessage.annotationNotSupported(), typeAnnotation);
         }
     }
     // Determines whether the expression refers to a type exported by the typing
@@ -3252,13 +3252,13 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         const functionNode = ParseTreeUtils.getEnclosingFunction(node);
         if (!functionNode) {
             if (!ParseTreeUtils.getEnclosingLambda(node)) {
-                this._addError(localize_1.Localizer.Diagnostic.yieldOutsideFunction(), node);
+                this._addSyntaxError(localize_1.LocMessage.yieldOutsideFunction(), node);
             }
         }
         else if (functionNode.isAsync && node.nodeType === 61 /* ParseNodeType.YieldFrom */) {
             // PEP 525 indicates that 'yield from' is not allowed in an
             // async function.
-            this._addError(localize_1.Localizer.Diagnostic.yieldFromOutsideAsync(), node);
+            this._addSyntaxError(localize_1.LocMessage.yieldFromOutsideAsync(), node);
         }
         if (this._targetFunctionDeclaration) {
             if (!this._targetFunctionDeclaration.yieldStatements) {
@@ -3280,13 +3280,9 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         let diagnostic;
         switch (diagLevel) {
             case 'error':
-                diagnostic = this._addError(message, textRange);
-                break;
             case 'warning':
-                diagnostic = this._addWarning(message, textRange);
-                break;
             case 'information':
-                diagnostic = this._addInformation(message, textRange);
+                diagnostic = this._fileInfo.diagnosticSink.addDiagnosticWithTextRange(diagLevel, message, textRange);
                 break;
             case 'none':
                 break;
@@ -3298,15 +3294,9 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         }
         return diagnostic;
     }
-    _addError(message, textRange) {
+    _addSyntaxError(message, textRange) {
         return this._fileInfo.diagnosticSink.addDiagnosticWithTextRange('error', message, textRange);
     }
-    _addWarning(message, textRange) {
-        return this._fileInfo.diagnosticSink.addDiagnosticWithTextRange('warning', message, textRange);
-    }
-    _addInformation(message, textRange) {
-        return this._fileInfo.diagnosticSink.addDiagnosticWithTextRange('information', message, textRange);
-    }
 }
 exports.Binder = Binder;
 // Flow node that is used for unreachable code.