@zzzen/pyright-internal 1.2.0-dev.20240602 → 1.2.0-dev.20240616

package/dist/analyzer/binder.d.ts

@@ -1,8 +1,10 @@
+import { DocStringService } from '../common/docStringService';
 import { AssertNode, AssignmentExpressionNode, AssignmentNode, AugmentedAssignmentNode, AwaitNode, BinaryOperationNode, BreakNode, CallNode, ClassNode, ComprehensionNode, ContinueNode, DelNode, ExceptNode, ForNode, FunctionNode, GlobalNode, IfNode, ImportAsNode, ImportFromNode, IndexNode, LambdaNode, MatchNode, MemberAccessNode, ModuleNameNode, ModuleNode, NameNode, NonlocalNode, ParseNode, PatternAsNode, PatternCaptureNode, PatternMappingExpandEntryNode, RaiseNode, ReturnNode, SuiteNode, TernaryNode, TryNode, TypeAliasNode, TypeAnnotationNode, TypeParameterListNode, UnaryOperationNode, WhileNode, WithNode, YieldFromNode, YieldNode } from '../parser/parseNodes';
 import { AnalyzerFileInfo } from './analyzerFileInfo';
 import { ParseTreeWalker } from './parseTreeWalker';
 import { Scope } from './scope';
 export declare class Binder extends ParseTreeWalker {
+    private _docStringService;
     private _moduleSymbolOnly;
     private readonly _fileInfo;
     private _deferredBindingTasks;
@@ -32,7 +34,7 @@ export declare class Binder extends ParseTreeWalker {
     private _potentialHiddenSymbols;
     private _potentialPrivateSymbols;
     private _codeFlowComplexity;
-    constructor(fileInfo: AnalyzerFileInfo, _moduleSymbolOnly?: boolean);
+    constructor(fileInfo: AnalyzerFileInfo, _docStringService: DocStringService, _moduleSymbolOnly?: boolean);
     bindModule(node: ModuleNode): void;
     visitModule(node: ModuleNode): boolean;
     visitSuite(node: SuiteNode): boolean;

package/dist/analyzer/binder.js

@@ -65,8 +65,9 @@ const symbolNameUtils_1 = require("./symbolNameUtils");
 // flow nodes. This number is somewhat arbitrary and is tuned empirically.
 const flowNodeComplexityContribution = 0.05;
 class Binder extends parseTreeWalker_1.ParseTreeWalker {
-    constructor(fileInfo, _moduleSymbolOnly = false) {
+    constructor(fileInfo, _docStringService, _moduleSymbolOnly = false) {
         super();
+        this._docStringService = _docStringService;
         this._moduleSymbolOnly = _moduleSymbolOnly;
         // A queue of deferred analysis operations.
         this._deferredBindingTasks = [];
@@ -196,7 +197,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             return true;
         }
         if (!importResult.isImportFound) {
-            this._addDiagnostic(this._fileInfo.diagnosticRuleSet.reportMissingImports, diagnosticRules_1.DiagnosticRule.reportMissingImports, localize_1.LocMessage.importResolveFailure().format({
+            this._addDiagnostic(diagnosticRules_1.DiagnosticRule.reportMissingImports, localize_1.LocMessage.importResolveFailure().format({
                 importName: importResult.importName,
                 venv: this._fileInfo.executionEnvironment.name,
             }), node);
@@ -206,7 +207,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.LocMessage.stubFileMissing().format({ importName: importResult.importName }), node);
+            const diagnostic = this._addDiagnostic(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 = {
@@ -495,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.LocMessage.unsupportedDunderAllOperation(), node);
+                this._addDiagnostic(diagnosticRules_1.DiagnosticRule.reportUnsupportedDunderAll, localize_1.LocMessage.unsupportedDunderAllOperation(), node);
             }
         }
         return false;
@@ -576,7 +577,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             this._addTypeDeclarationForVariable(node.leftExpression, node.typeAnnotationComment);
         }
         if (node.chainedTypeAnnotationComment) {
-            this._addDiagnostic(this._fileInfo.diagnosticRuleSet.reportInvalidTypeForm, diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, localize_1.LocMessage.annotationNotSupported(), node.chainedTypeAnnotationComment);
+            this._addDiagnostic(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
@@ -652,7 +653,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 }
                 if (emitDunderAllWarning) {
                     this._usesUnsupportedDunderAllForm = true;
-                    this._addDiagnostic(this._fileInfo.diagnosticRuleSet.reportUnsupportedDunderAll, diagnosticRules_1.DiagnosticRule.reportUnsupportedDunderAll, localize_1.LocMessage.unsupportedDunderAllOperation(), node);
+                    this._addDiagnostic(diagnosticRules_1.DiagnosticRule.reportUnsupportedDunderAll, localize_1.LocMessage.unsupportedDunderAllOperation(), node);
                 }
             }
         }
@@ -779,7 +780,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             }
             if (emitDunderAllWarning) {
                 this._usesUnsupportedDunderAllForm = true;
-                this._addDiagnostic(this._fileInfo.diagnosticRuleSet.reportUnsupportedDunderAll, diagnosticRules_1.DiagnosticRule.reportUnsupportedDunderAll, localize_1.LocMessage.unsupportedDunderAllOperation(), node);
+                this._addDiagnostic(diagnosticRules_1.DiagnosticRule.reportUnsupportedDunderAll, localize_1.LocMessage.unsupportedDunderAllOperation(), node);
             }
         }
         return false;
@@ -2647,8 +2648,13 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 if (this._currentScope.type === 4 /* ScopeType.Module */ || this._currentScope.type === 5 /* ScopeType.Builtin */) {
                     if ((0, symbolNameUtils_1.isPrivateOrProtectedName)(name)) {
                         if ((0, symbolNameUtils_1.isPrivateName)(name)) {
-                            // Private names are obscured, so they are always externally hidden.
-                            symbol.setIsExternallyHidden();
+                            // Private names within classes are mangled, so they are always externally hidden.
+                            if (scope.type === 3 /* ScopeType.Class */) {
+                                symbol.setIsExternallyHidden();
+                            }
+                            else {
+                                this._potentialPrivateSymbols.set(name, symbol);
+                            }
                         }
                         else if (this._fileInfo.isStubFile || this._fileInfo.isInPyTypedPackage) {
                             if (this._currentScope.type === 5 /* ScopeType.Builtin */) {
@@ -2968,7 +2974,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             }
         }
         if (!declarationHandled) {
-            this._addDiagnostic(this._fileInfo.diagnosticRuleSet.reportInvalidTypeForm, diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, localize_1.LocMessage.annotationNotSupported(), typeAnnotation);
+            this._addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, localize_1.LocMessage.annotationNotSupported(), typeAnnotation);
         }
     }
     // Determines whether the expression refers to a type exported by the typing
@@ -3031,6 +3037,11 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             if (this._isTypingAnnotation(typeAnnotation, 'Final')) {
                 isFinal = true;
             }
+            else if (typeAnnotation.nodeType === 27 /* ParseNodeType.Index */ &&
+                typeAnnotation.items.length > 0 &&
+                this._isTypingAnnotation(typeAnnotation.baseExpression, 'Annotated')) {
+                return this._isAnnotationFinal(typeAnnotation.items[0].valueExpression);
+            }
             else if (typeAnnotation.nodeType === 27 /* ParseNodeType.Index */ && typeAnnotation.items.length === 1) {
                 // Recursively call to see if the base expression is "Final".
                 const finalInfo = this._isAnnotationFinal(typeAnnotation.baseExpression);
@@ -3286,7 +3297,8 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         this._codeFlowComplexity += flowNodeComplexityContribution;
         return (0, codeFlowTypes_1.getUniqueFlowNodeId)();
     }
-    _addDiagnostic(diagLevel, rule, message, textRange) {
+    _addDiagnostic(rule, message, textRange) {
+        const diagLevel = this._fileInfo.diagnosticRuleSet[rule];
         let diagnostic;
         switch (diagLevel) {
             case 'error':