@zzzen/pyright-internal 1.2.0-dev.20231210 → 1.2.0-dev.20231224

package/dist/analyzer/binder.js

@@ -120,7 +120,6 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             // Bind implicit names.
             // List taken from https://docs.python.org/3/reference/import.html#__name__
             this._addImplicitSymbolToCurrentScope('__name__', node, 'str');
-            this._addImplicitSymbolToCurrentScope('__qualname__', node, 'str');
             this._addImplicitSymbolToCurrentScope('__loader__', node, 'Any');
             this._addImplicitSymbolToCurrentScope('__package__', node, 'str');
             this._addImplicitSymbolToCurrentScope('__spec__', node, 'Any');
@@ -244,6 +243,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             AnalyzerNodeInfo.setScope(node, this._currentScope);
             this._addImplicitSymbolToCurrentScope('__doc__', node, 'str | None');
             this._addImplicitSymbolToCurrentScope('__module__', node, 'str');
+            this._addImplicitSymbolToCurrentScope('__qualname__', node, 'str');
             this._dunderSlotsEntries = undefined;
             if (!this._moduleSymbolOnly) {
                 // Analyze the suite.
@@ -1111,7 +1111,6 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             flags: codeFlowTypes_1.FlowFlags.PreFinallyGate,
             id: this._getUniqueFlowNodeId(),
             antecedent: preFinallyReturnOrRaiseLabel,
-            isGateClosed: false,
         };
         preFinallyLabel.affectedExpressions = this._trackCodeFlowExpressions(() => {
             if (node.finallySuite) {
@@ -1460,7 +1459,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                             loadSymbolsFromPath: true,
                             range: (0, textRange_1.getEmptyRange)(),
                             usesLocalName: false,
-                            moduleName: this._formatModuleName(node.module.nameParts),
+                            moduleName: this._formatModuleName(node.module),
                             isInExceptSuite: this._isInExceptSuite,
                         };
                         // Handle the case where this is an __init__.py file and the imported
@@ -1486,7 +1485,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                         symbolName: importedName,
                         submoduleFallback,
                         range: (0, positionUtils_1.convertTextRangeToRange)(nameNode, this._fileInfo.lines),
-                        moduleName: this._formatModuleName(node.module.nameParts),
+                        moduleName: this._formatModuleName(node.module),
                         isInExceptSuite: this._isInExceptSuite,
                         isNativeLib: importInfo === null || importInfo === void 0 ? void 0 : importInfo.isNativeLib,
                     };
@@ -1796,9 +1795,8 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         }
         return true;
     }
-    _formatModuleName(nameParts) {
-        // Ignore the leading dots for purposes of module name formatting.
-        return nameParts.map((name) => name.value).join('.');
+    _formatModuleName(node) {
+        return '.'.repeat(node.leadingDots) + node.nameParts.map((part) => part.value).join('.');
     }
     _removeActiveTypeParameters(node) {
         node.parameters.forEach((typeParamNode) => {
@@ -1971,7 +1969,9 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 loadSymbolsFromPath: false,
                 range: (0, textRange_1.getEmptyRange)(),
                 usesLocalName: !!importAlias,
-                moduleName: importAlias ? this._formatModuleName(node.module.nameParts) : firstNamePartValue,
+                moduleName: importAlias
+                    ? this._formatModuleName(node.module)
+                    : '.'.repeat(node.module.leadingDots) + firstNamePartValue,
                 firstNamePart: firstNamePartValue,
                 isInExceptSuite: this._isInExceptSuite,
             };
@@ -1988,7 +1988,9 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 range: (0, textRange_1.getEmptyRange)(),
                 usesLocalName: !!importAlias,
                 moduleName: (_a = importInfo === null || importInfo === void 0 ? void 0 : importInfo.importName) !== null && _a !== void 0 ? _a : '',
-                firstNamePart: importAlias ? this._formatModuleName(node.module.nameParts) : firstNamePartValue,
+                firstNamePart: importAlias
+                    ? this._formatModuleName(node.module)
+                    : '.'.repeat(node.module.leadingDots) + firstNamePartValue,
                 isUnresolved: true,
                 isInExceptSuite: this._isInExceptSuite,
             };
@@ -3190,7 +3192,6 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             'Optional',
             'Annotated',
             'TypeAlias',
-            'OrderedDict',
             'Concatenate',
             'TypeGuard',
             'Unpack',
@@ -3198,22 +3199,25 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             'NoReturn',
             'Never',
             'LiteralString',
+            'OrderedDict',
         ]);
         const assignedName = assignedNameNode.value;
         if (!specialTypes.has(assignedName)) {
             return false;
         }
+        const specialBuiltInClassDeclaration = {
+            type: 7 /* DeclarationType.SpecialBuiltInClass */,
+            node: annotationNode,
+            uri: this._fileInfo.fileUri,
+            range: (0, positionUtils_1.convertTextRangeToRange)(annotationNode, this._fileInfo.lines),
+            moduleName: this._fileInfo.moduleName,
+            isInExceptSuite: this._isInExceptSuite,
+        };
         const symbol = this._bindNameToScope(this._currentScope, annotationNode.valueExpression);
         if (symbol) {
-            symbol.addDeclaration({
-                type: 7 /* DeclarationType.SpecialBuiltInClass */,
-                node: annotationNode,
-                uri: this._fileInfo.fileUri,
-                range: (0, positionUtils_1.convertTextRangeToRange)(annotationNode, this._fileInfo.lines),
-                moduleName: this._fileInfo.moduleName,
-                isInExceptSuite: this._isInExceptSuite,
-            });
+            symbol.addDeclaration(specialBuiltInClassDeclaration);
         }
+        AnalyzerNodeInfo.setDeclaration(node, specialBuiltInClassDeclaration);
         return true;
     }
     _deferBinding(callback) {