Merge 1.1.379

build/azuredevops/azure-pipelines-release.yml

@@ -67,8 +67,15 @@ extends:
                 inputs:
                   script: |
                     npm run package
-                    move pyright-*.vsix $(VSIX_NAME)
                   workingDirectory: packages/vscode-pyright
+
+              - task: PowerShell@2
+                inputs:
+                  targetType: 'inline'
+                  script: 'Move-Item -Path "pyright-*.vsix" -Destination "$(VSIX_NAME)"'
+                  workingDirectory: packages/vscode-pyright
+                displayName: 'Move VSIX file'
+
               - task: CopyFiles@2
                 displayName: 'Copy vsix to: build_output'
                 inputs:

docs/type-inference.md

@@ -71,7 +71,7 @@ var6 = [p for p in [1, 2, 3]]   # Inferred type is list[int]
 When a symbol is assigned values in multiple places within the code, those values may have different types. The inferred type of the variable is the union of all such types.
 
 ```python
-# In this example, symbol var1 has an inferred type of `str | int`]`.
+# In this example, symbol var1 has an inferred type of `str | int`.
 class Foo:
     def __init__(self):
         self.var1 = ""

lerna.json

@@ -2,7 +2,7 @@
     "packages": [
         "packages/*"
     ],
-    "version": "1.1.378",
+    "version": "1.1.379",
     "command": {
         "version": {
             "push": false,

package.json

@@ -4,8 +4,8 @@
     "scripts": {
         "postinstall": "node ./build/skipBootstrap.js || npm run install:others",
         "clean": "lerna run --no-bail --stream clean",
-        "install:all": "npm install --force",
-        "install:others": "cross-env SKIP_LERNA_BOOTSTRAP=yes lerna exec --no-bail npm install -- --force",
+        "install:all": "npm install",
+        "install:others": "cross-env SKIP_LERNA_BOOTSTRAP=yes lerna exec --no-bail npm install",
         "update:all": "node ./build/updateDeps.js",
         "build:extension:dev": "cd packages/vscode-pyright && npm run webpack",
         "build:extension": "cd packages/vscode-pyright && npm run package",

packages/browser-pyright/package.json

@@ -47,6 +47,6 @@
         "stream-browserify": "^3.0.0",
         "util": "^0.12.5",
         "vm-browserify": "^1.1.2",
-        "vscode-languageserver": "10.0.0-next.2"
+        "vscode-languageserver": "10.0.0-next.10"
     }
 }

packages/pyright-internal/package.json

@@ -2,7 +2,7 @@
     "name": "pyright-internal",
     "displayName": "pyright",
     "description": "Type checker for the Python language",
-    "version": "1.1.378",
+    "version": "1.1.379",
     "license": "MIT",
     "private": true,
     "files": [
@@ -31,11 +31,11 @@
         "pyright-to-gitlab-ci": "^0.1.3",
         "source-map-support": "^0.5.21",
         "tmp": "^0.2.1",
-        "vscode-jsonrpc": "^9.0.0-next.2",
-        "vscode-languageserver": "10.0.0-next.2",
-        "vscode-languageserver-protocol": "^3.17.6-next.3",
+        "vscode-jsonrpc": "^9.0.0-next.5",
+        "vscode-languageserver": "10.0.0-next.10",
+        "vscode-languageserver-protocol": "^3.17.6-next.10",
         "vscode-languageserver-textdocument": "1.0.11",
-        "vscode-languageserver-types": "^3.17.6-next.3",
+        "vscode-languageserver-types": "^3.17.6-next.5",
         "vscode-uri": "^3.0.8"
     },
     "devDependencies": {

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

@@ -1608,7 +1608,7 @@ export class Checker extends ParseTreeWalker {
             return false;
         }
 
-        const decls = this._evaluator.getDeclarationsForNameNode(node.d.name);
+        const decls = this._evaluator.getDeclInfoForNameNode(node.d.name)?.decls;
         if (!decls) {
             return false;
         }
@@ -2631,7 +2631,7 @@ export class Checker extends ParseTreeWalker {
     // earlier overload. Typeshed stubs contain type: ignore comments on these
     // lines, so it is important for us to report them in the same manner.
     private _findNodeForOverload(functionNode: FunctionNode, overloadType: FunctionType): FunctionNode | undefined {
-        const decls = this._evaluator.getDeclarationsForNameNode(functionNode.d.name);
+        const decls = this._evaluator.getDeclInfoForNameNode(functionNode.d.name)?.decls;
         if (!decls) {
             return undefined;
         }
@@ -4162,7 +4162,7 @@ export class Checker extends ParseTreeWalker {
                         isSupported = false;
                     } else if (
                         subtype.props?.specialForm &&
-                        isInstantiableClass(subtype.props.specialForm) &&
+                        isClassInstance(subtype.props.specialForm) &&
                         ClassType.isBuiltIn(subtype.props.specialForm, 'Annotated')
                     ) {
                         diag.addMessage(LocAddendum.annotatedNotAllowed());
@@ -4602,8 +4602,8 @@ export class Checker extends ParseTreeWalker {
         // any variable declarations that are bound using nonlocal
         // or global explicit bindings.
         const declarations = this._evaluator
-            .getDeclarationsForNameNode(node)
-            ?.filter((decl) => decl.type !== DeclarationType.Variable || !decl.isExplicitBinding);
+            .getDeclInfoForNameNode(node)
+            ?.decls?.filter((decl) => decl.type !== DeclarationType.Variable || !decl.isExplicitBinding);
 
         let primaryDeclaration =
             declarations && declarations.length > 0 ? declarations[declarations.length - 1] : undefined;
@@ -4787,7 +4787,9 @@ export class Checker extends ParseTreeWalker {
 
         if (isTypeIs) {
             const scopeIds = getTypeVarScopeIds(functionType);
-            const typeGuardType = makeTypeVarsBound(returnType.priv.typeArgs[0], scopeIds);
+            const narrowedType = returnType.priv.typeArgs[0];
+            let typeGuardType = makeTypeVarsBound(narrowedType, scopeIds);
+            typeGuardType = TypeBase.cloneWithTypeForm(typeGuardType, typeGuardType);
 
             // Determine the type of the first parameter.
             const paramIndex = isMethod && !FunctionType.isStaticMethod(functionType) ? 1 : 0;
@@ -4805,7 +4807,7 @@ export class Checker extends ParseTreeWalker {
                         DiagnosticRule.reportGeneralTypeIssues,
                         LocMessage.typeIsReturnType().format({
                             type: this._evaluator.printType(paramType),
-                            returnType: this._evaluator.printType(typeGuardType),
+                            returnType: this._evaluator.printType(narrowedType),
                         }),
                         returnAnnotation
                     );

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

@@ -1689,6 +1689,12 @@ export function getCodeFlowEngine(
     // type, thus preventing further traversal of the code flow graph.
     function isCallNoReturn(evaluator: TypeEvaluator, flowNode: FlowCall) {
         const node = flowNode.node;
+        const fileInfo = getFileInfo(node);
+
+        // Assume that calls within a pyi file are not "NoReturn" calls.
+        if (fileInfo.isStubFile) {
+            return false;
+        }
 
         if (enablePrintCallNoReturn) {
             console.log(`isCallNoReturn@${flowNode.id} Pre depth ${noReturnAnalysisDepth}`);

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

@@ -62,6 +62,7 @@ import {
     sortTypes,
     specializeTupleClass,
     specializeWithDefaultTypeArgs,
+    stripTypeForm,
     transformExpectedType,
     transformPossibleRecursiveTypeAlias,
 } from './typeUtils';
@@ -503,7 +504,7 @@ export function addConstraintsForExpectedType(
 function stripLiteralsForLowerBound(evaluator: TypeEvaluator, typeVar: TypeVarType, lowerBound: Type) {
     return isTypeVarTuple(typeVar)
         ? stripLiteralValueForUnpackedTuple(evaluator, lowerBound)
-        : evaluator.stripLiteralValue(lowerBound);
+        : stripTypeForm(evaluator.stripLiteralValue(lowerBound));
 }
 
 function getTypeVarType(
@@ -1335,7 +1336,7 @@ function stripLiteralValueForUnpackedTuple(evaluator: TypeEvaluator, type: Type)
 
     let strippedLiteral = false;
     const tupleTypeArgs: TupleTypeArg[] = type.priv.tupleTypeArgs.map((arg) => {
-        const strippedType = evaluator.stripLiteralValue(arg.type);
+        const strippedType = stripTypeForm(evaluator.stripLiteralValue(arg.type));
 
         if (strippedType !== arg.type) {
             strippedLiteral = true;