Merge 1.1.405

build/azuredevops/azure-pipelines-release.yml

@@ -54,6 +54,7 @@ extends:
                 signing:
                   enabled: true
                   signType: 'real'
+                  signWithProd: true
               outputs:
                 - output: pipelineArtifact
                   displayName: 'publish vsix artifact'
@@ -67,9 +68,9 @@ extends:
                 fetchTags: false
                 persistCredentials: True
               - task: NodeTool@0
-                displayName: Use Node 18.x
+                displayName: Use Node 22.x
                 inputs:
-                  versionSpec: 18.x
+                  versionSpec: 22.x
               - template: /build/templates/npmAuthenticate.yml@self
               - task: CmdLine@2
                 displayName: npm install
@@ -167,9 +168,9 @@ extends:
                 fetchTags: false
                 persistCredentials: True
               - task: NodeTool@0
-                displayName: Use Node 18.x
+                displayName: Use Node 22.x
                 inputs:
-                  versionSpec: 18.x
+                  versionSpec: 22.x
               - template: /build/templates/npmAuthenticate.yml@self
               - task: CmdLine@2
                 displayName: npm install
@@ -259,7 +260,7 @@ extends:
               - checkout: none
               - task: NodeTool@0
                 inputs:
-                  versionSpec: 18.x
+                  versionSpec: 22.x
               - task: DownloadPipelineArtifact@2
                 displayName: 'Download Artifacts from Validation Job'
                 inputs:
@@ -286,7 +287,9 @@ extends:
                     vsce publish --pat $aadToken --packagePath $(System.ArtifactsDirectory)/$(VSIX_NAME) --noVerify --manifestPath $(System.ArtifactsDirectory)/extension.manifest --signaturePath $(System.ArtifactsDirectory)/extension.signature.p7s
 
       - stage: PublishToNpm
-        dependsOn: WaitForValidation
+        dependsOn:
+          - WaitForValidation
+          - PublishToMarketplace
         jobs:
           - job: publish_package
             displayName: Publish package to NPM
@@ -312,5 +315,5 @@ extends:
                   contentSource: Folder
                   folderLocation: $(Build.StagingDirectory)/dist
                   waitForReleaseCompletion: true
-                  owners: erikd@microsoft.com
+                  owners: bschnurr@microsoft.com
                   approvers: [email protected]

docs/usage/import-resolution.md

@@ -53,6 +53,9 @@ Import hooks can provide an editable installation that is a more accurate repres
 - [compat mode](https://setuptools.pypa.io/en/latest/userguide/development_mode.html#legacy-behavior)
 - [strict mode](https://setuptools.pypa.io/en/latest/userguide/development_mode.html#strict-editable-installs)
 
+#### uv
+[uv's build backend](https://docs.astral.sh/uv/concepts/build-backend/) uses `.pth` files by default.
+
 #### Hatchling
 [Hatchling](https://hatch.pypa.io/latest/config/build/#dev-mode) uses path-based `.pth` files by
 default. It will only use import hooks if you set `dev-mode-exact` to `true`.

package.json

@@ -34,7 +34,7 @@
     "devDependencies": {
         "@detachhead/ts-helpers": "^16.2.0",
         "@types/glob": "^8.1.0",
-        "@types/node": "^22.10.5",
+        "@types/node": "^22.16.0",
         "@types/yargs": "^16.0.9",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",

packages/browser-pyright/package.json

@@ -26,7 +26,7 @@
     },
     "devDependencies": {
         "@types/copy-webpack-plugin": "^8.0.1",
-        "@types/node": "^22.10.5",
+        "@types/node": "^22.16.0",
         "copy-webpack-plugin": "^11.0.0",
         "shx": "^0.3.4",
         "ts-loader": "^9.5.1",

packages/pyright-internal/package.json

@@ -2,7 +2,7 @@
     "name": "pyright-internal",
     "displayName": "pyright",
     "description": "Type checker for the Python language",
-    "version": "1.1.404",
+    "version": "1.1.405",
     "license": "MIT",
     "private": true,
     "files": [
@@ -45,7 +45,7 @@
         "@types/fs-extra": "^11.0.4",
         "@types/jest": "^29.5.14",
         "@types/lodash": "^4.17.14",
-        "@types/node": "^22.10.5",
+        "@types/node": "^22.16.0",
         "@types/tmp": "^0.2.6",
         "copy-webpack-plugin": "^11.0.0",
         "esbuild-loader": "^3.2.0",

packages/pyright-internal/src/analyzer/binder.ts

@@ -291,8 +291,8 @@ export class Binder extends ParseTreeWalker {
                 this._addImplicitSymbolToCurrentScope('__path__', node, 'MutableSequence[str]');
                 this._addImplicitSymbolToCurrentScope('__file__', node, 'str');
                 this._addImplicitSymbolToCurrentScope('__cached__', node, 'str');
-                this._addImplicitSymbolToCurrentScope('__dict__', node, 'Dict[str, Any]');
-                this._addImplicitSymbolToCurrentScope('__annotations__', node, 'Dict[str, Any]');
+                this._addImplicitSymbolToCurrentScope('__annotations__', node, 'dict[str, Any]');
+                this._addImplicitSymbolToCurrentScope('__dict__', node, 'dict[str, Any]');
                 this._addImplicitSymbolToCurrentScope('__builtins__', node, 'Any');
                 this._addImplicitSymbolToCurrentScope('__doc__', node, 'str | None');
                 if (this._fileInfo.ipythonMode === IPythonMode.CellDocs) {
@@ -376,7 +376,7 @@ export class Binder extends ParseTreeWalker {
             return true;
         }
 
-        if (!importResult.isImportFound) {
+        if (!importResult.isImportFound && importResult.importName) {
             this._addDiagnostic(
                 DiagnosticRule.reportMissingImports,
                 LocMessage.importResolveFailure().format({
@@ -588,7 +588,7 @@ export class Binder extends ParseTreeWalker {
                 const enclosingClass = ParseTreeUtils.getEnclosingClass(node);
                 if (enclosingClass) {
                     // Add the implicit "__class__" symbol described in PEP 3135.
-                    this._addImplicitSymbolToCurrentScope('__class__', node, 'type[self]');
+                    this._addImplicitSymbolToCurrentScope('__class__', node, '__class__');
                 }
 
                 this._deferBinding(() => {

packages/pyright-internal/src/analyzer/checker.ts

@@ -4475,6 +4475,11 @@ export class Checker extends ParseTreeWalker {
             return;
         }
 
+        // Skip this for keyword argument names.
+        if (node.parent?.nodeType === ParseNodeType.Argument && node.parent.d.name === node) {
+            return;
+        }
+
         if (!AnalyzerNodeInfo.isCodeUnreachable(node)) {
             const type = this._evaluator.getType(node);
 

packages/pyright-internal/src/analyzer/constraintTracker.ts

@@ -168,7 +168,7 @@ export class ConstraintSet {
     }
 
     getScopeIds() {
-        return this._scopeIds ? [...this._scopeIds] : [];
+        return new Set(this._scopeIds);
     }
 
     hasUnificationVars() {
@@ -197,26 +197,17 @@ export class ConstraintTracker {
         return newTypeVarMap;
     }
 
-    cloneWithSignature(scopeIds: TypeVarScopeId[]): ConstraintTracker {
+    cloneWithSignature(scopeId: TypeVarScopeId): ConstraintTracker {
         const cloned = this.clone();
 
-        const nonEmptyScopeIds = scopeIds.filter((scopeId) => !!scopeId);
+        if (scopeId) {
+            const filteredSets = this._constraintSets.filter((context) => context.hasScopeId(scopeId));
 
-        if (nonEmptyScopeIds.length > 0) {
-            const filteredSets = this._constraintSets.filter((context) =>
-                nonEmptyScopeIds.every((scopeId) => context.hasScopeId(scopeId))
-            );
-
-            // If there are already some constraints that match the scopeIDs,
-            // reuse them. Otherwise, duplicate all existing constraint sets
-            // and add the new scope IDs.
             if (filteredSets.length > 0) {
                 cloned._constraintSets = filteredSets;
             } else {
                 cloned._constraintSets.forEach((context) => {
-                    nonEmptyScopeIds.forEach((scopeId) => {
-                        context.addScopeId(scopeId);
-                    });
+                    context.addScopeId(scopeId);
                 });
             }
         }

packages/pyright-internal/src/analyzer/dataClasses.ts

@@ -688,15 +688,17 @@ export function synthesizeDataClassMethods(
         }
     }
 
-    // Synthesize the __match_args__ class variable if it doesn't exist.
+    // Synthesize the __match_args__ class variable if it doesn't exist
+    // and match_args behavior is not explicitly disabled.
     const strType = evaluator.getBuiltInType(node, 'str');
     const tupleClassType = evaluator.getBuiltInType(node, 'tuple');
     if (
         tupleClassType &&
         isInstantiableClass(tupleClassType) &&
         strType &&
         isInstantiableClass(strType) &&
-        !symbolTable.has('__match_args__')
+        !symbolTable.has('__match_args__') &&
+        (classType.shared.dataClassBehaviors?.matchArgs ?? true)
     ) {
         const matchArgsNames: string[] = [];
         fullDataClassEntries.forEach((entry) => {
@@ -1436,6 +1438,12 @@ function applyDataClassBehaviorOverrideValue(
             }
             break;
 
+        case 'match_args':
+            if (argValue !== undefined) {
+                behaviors.matchArgs = argValue;
+            }
+            break;
+
         case 'frozen': {
             let hasUnfrozenBaseClass = false;
             let hasFrozenBaseClass = false;

packages/pyright-internal/src/analyzer/declaration.ts

@@ -52,8 +52,8 @@ export type IntrinsicType =
     | 'str | None'
     | 'int'
     | 'MutableSequence[str]'
-    | 'type[self]'
-    | 'Dict[str, Any]'
+    | '__class__'
+    | 'dict[str, Any]'
     | 'IPython.display.display';
 
 export interface DeclarationBase {