Fixed recent regression that resulted in attribution of a type var to the wrong scope when it was used in an __init__ method of a class with a class decorator.

msfterictraut · msfterictraut · commit 67927318a093 · 2022-07-06T20:13:43.000-07:00
diff --git a/packages/pyright-internal/src/analyzer/typeEvaluator.ts b/packages/pyright-internal/src/analyzer/typeEvaluator.ts
@@ -14991,6 +14991,9 @@ export function createTypeEvaluator(importLookup: ImportLookup, evaluatorOptions
 
         const effectiveMetaclass = computeEffectiveMetaclass(classType, node.name);
 
+        // Clear the "partially constructed" flag.
+        classType.details.flags &= ~ClassTypeFlags.PartiallyEvaluated;
+
         // Now determine the decorated type of the class.
         let decoratedType: Type = classType;
         let foundUnknown = false;
@@ -15037,9 +15040,6 @@ export function createTypeEvaluator(importLookup: ImportLookup, evaluatorOptions
             applyDataClassClassBehaviorOverrides(evaluatorInterface, classType, initSubclassArgs);
         }
 
-        // Clear the "partially constructed" flag.
-        classType.details.flags &= ~ClassTypeFlags.PartiallyEvaluated;
-
         // Run any class hooks that depend on this class.
         runClassTypeHooks(classType);
 
diff --git a/packages/pyright-internal/src/tests/samples/decorator7.py b/packages/pyright-internal/src/tests/samples/decorator7.py
@@ -0,0 +1,21 @@
+# This sample tests the case where a class decorator needs to evaluate
+# the type of __init__ prior to the class being fully evaluated.
+
+from typing import Any, Callable, Generic, TypeVar
+
+T = TypeVar("T")
+FuncType = Callable[..., Any]
+FT = TypeVar("FT", bound=FuncType)
+
+
+def decorate() -> Callable[[FT], FT]:
+    ...
+
+
+@decorate()
+class ValueDecorated(Generic[T]):
+    def __init__(self, value: T) -> None:
+        self._value: T = value
+
+    def __call__(self) -> T:
+        return self._value
diff --git a/packages/pyright-internal/src/tests/typeEvaluator3.test.ts b/packages/pyright-internal/src/tests/typeEvaluator3.test.ts
@@ -1254,6 +1254,12 @@ test('Decorator6', () => {
     TestUtils.validateResults(analysisResults, 0);
 });
 
+test('Decorator7', () => {
+    const analysisResults = TestUtils.typeAnalyzeSampleFiles(['decorator7.py']);
+
+    TestUtils.validateResults(analysisResults, 0);
+});
+
 test('DataclassTransform1', () => {
     const analysisResults = TestUtils.typeAnalyzeSampleFiles(['dataclassTransform1.py']);
 
