Merge branch 'main' into pull-pylance-with-pyright-1.1.369-9716881771

microsoft · Jun 29, 2024 · 9813f9e · 9813f9e
2 parents 1fde529 + bee1d91
commit 9813f9e
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/packages/pyright-internal/src/analyzer/typeEvaluator.ts b/packages/pyright-internal/src/analyzer/typeEvaluator.ts
@@ -19499,6 +19499,16 @@ export function createTypeEvaluator(
                 continue;
             }
 
+            // Forward-declared type annotation expressions need to be be evaluated
+            // in context so they have the appropriate flags set. Most of these cases
+            // will have been detected above when calling getParentAnnotationNode,
+            // but TypeAlias expressions are not handled there.
+            const stringEnclosure = ParseTreeUtils.getParentNodeOfType(parent, ParseNodeType.StringList);
+            if (stringEnclosure) {
+                nodeToEvaluate = stringEnclosure as StringListNode;
+                continue;
+            }
+
             // The left expression of a call or member access expression is not generally contextual.
             if (parent.nodeType === ParseNodeType.Call || parent.nodeType === ParseNodeType.MemberAccess) {
                 if (nodeToEvaluate === parent.leftExpression) {
@@ -19525,15 +19535,7 @@ export function createTypeEvaluator(
                 // The base expression of an index expression is not contextual.
                 if (nodeToEvaluate === parent.baseExpression) {
                     flags = EvaluatorFlags.IndexBaseDefaults;
-                    break;
                 }
-            } else if (parent.nodeType === ParseNodeType.StringList && nodeToEvaluate === parent.typeAnnotation) {
-                // Forward-declared type annotation expressions need to be be evaluated
-                // in context so they have the appropriate flags set. Most of these cases
-                // will have been detected above when calling getParentAnnotationNode,
-                // but TypeAlias expressions are not handled there.
-                nodeToEvaluate = parent;
-                continue;
             }
 
             if (!isExpressionNode(parent)) {