Added some changes from another branch. (#8445)

Added some changes from another branch.
microsoft · Jul 16, 2024 · f5edd2b · f5edd2b
1 parent 5d6b96b
commit f5edd2b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/packages/pyright-internal/src/analyzer/checker.ts b/packages/pyright-internal/src/analyzer/checker.ts
@@ -964,7 +964,7 @@ export class Checker extends ParseTreeWalker {
                             declaredReturnType,
                             returnType,
                             diagAddendum,
-                            /* destTypeVarContext */ undefined,
+                            /* destTypeVarContext */ new TypeVarContext(),
                             /* srcTypeVarContext */ undefined,
                             AssignTypeFlags.AllowBoolTypeGuard
                         )

diff --git a/packages/pyright-internal/src/analyzer/parseTreeUtils.ts b/packages/pyright-internal/src/analyzer/parseTreeUtils.ts
@@ -799,6 +799,24 @@ export function getEnclosingClassOrFunction(node: ParseNode): FunctionNode | Cla
     return undefined;
 }
 
+export function getEnclosingClassOrFunctionSuite(node: ParseNode): SuiteNode | undefined {
+    let curNode = node.parent;
+    while (curNode) {
+        if (curNode.nodeType === ParseNodeType.Suite) {
+            if (
+                curNode.parent?.nodeType === ParseNodeType.Function ||
+                curNode.parent?.nodeType === ParseNodeType.Class
+            ) {
+                return curNode;
+            }
+        }
+
+        curNode = curNode.parent;
+    }
+
+    return undefined;
+}
+
 export function getEnclosingSuiteOrModule(
     node: ParseNode,
     stopAtFunction = false,

diff --git a/packages/pyright-internal/src/analyzer/typeEvaluator.ts b/packages/pyright-internal/src/analyzer/typeEvaluator.ts
@@ -24018,6 +24018,10 @@ export function createTypeEvaluator(
                 // Is the destination a callback protocol (defined in PEP 544)?
                 const destCallbackType = getCallbackProtocolType(destType, recursionCount);
                 if (destCallbackType) {
+                    if (destTypeVarContext) {
+                        destTypeVarContext.addSolveForScope(getTypeVarScopeId(destCallbackType));
+                    }
+
                     return assignType(
                         destCallbackType,
                         concreteSrcType,