PY-27128 PY-48466 Fix problem with imports in PyMakeFunctionReturnTypeQuickFix

(cherry picked from commit 9320c2e708afa2ddd025f60b0c122132387493b7)

IJ-MR-10124

GitOrigin-RevId: 219e646482999e8b81b77aaf52eb24574381af3d

python/testData/quickFixes/PyMakeFunctionReturnTypeQuickFixTest/ancestorAndInheritorReturn/main.py

@@ -0,0 +1,8 @@
+import my
+
+
+def foo(a) -> my.X:
+    if a:
+        return <warning descr="Expected type 'X', got 'Type[X]' instead">my.X<caret></warning>
+    else:
+        return <warning descr="Expected type 'X', got 'Type[Y]' instead">my.Y</warning>

python/testData/quickFixes/PyMakeFunctionReturnTypeQuickFixTest/ancestorAndInheritorReturn/main_after.py

@@ -0,0 +1,11 @@
+from typing import Type
+
+import my
+from my import X
+
+
+def foo(a) -> Type[X]:
+    if a:
+        return my.X<caret>
+    else:
+        return my.Y

python/testData/quickFixes/PyMakeFunctionReturnTypeQuickFixTest/ancestorAndInheritorReturn/my.py

@@ -0,0 +1,5 @@
+class X():
+    pass
+
+class Y(X):
+    pass

python/testData/quickFixes/PyMakeFunctionReturnTypeQuickFixTest/bitwiseOrUnionTypeImports/main.py

@@ -0,0 +1,8 @@
+import my
+
+
+def foo(a) -> my.X:
+    if a:
+        return <warning descr="Expected type 'X', got 'Type[X]' instead">my.X<caret></warning>
+    else:
+        return <warning descr="Expected type 'X', got 'Type[Y]' instead">my.Y</warning>

python/testData/quickFixes/PyMakeFunctionReturnTypeQuickFixTest/bitwiseOrUnionTypeImports/main_after.py

@@ -0,0 +1,11 @@
+from typing import Type
+
+import my
+from my import X, Y
+
+
+def foo(a) -> Type[X | Y]:
+    if a:
+        return my.X
+    else:
+        return my.Y

python/testData/quickFixes/PyMakeFunctionReturnTypeQuickFixTest/bitwiseOrUnionTypeImports/my.py

@@ -0,0 +1,5 @@
+class X():
+    pass
+
+class Y():
+    pass

python/testData/quickFixes/PyMakeFunctionReturnTypeQuickFixTest/lambda.py

@@ -0,0 +1,2 @@
+def func() -> int:
+    return <warning descr="Expected type 'int', got '(x: Any) -> int' instead">lambda x: 42<caret></warning>

python/testData/quickFixes/PyMakeFunctionReturnTypeQuickFixTest/lambda_after.py

@@ -0,0 +1,5 @@
+from typing import Callable, Any
+
+
+def func() -> Callable[[Any], int]:
+    return lambda x: 42<caret>

python/testData/quickFixes/PyMakeFunctionReturnTypeQuickFixTest/py39BitwiseOrUnionFromFutureAnnotationsUnionTypeImports/main.py

@@ -0,0 +1,10 @@
+from __future__ import annotations
+
+import my
+
+
+def foo(a) -> my.X:
+    if a:
+        return <warning descr="Expected type 'X', got 'Type[X]' instead">my.X<caret></warning>
+    else:
+        return <warning descr="Expected type 'X', got 'Type[Y]' instead">my.Y</warning>

python/testData/quickFixes/PyMakeFunctionReturnTypeQuickFixTest/py39BitwiseOrUnionFromFutureAnnotationsUnionTypeImports/main_after.py

@@ -0,0 +1,13 @@
+from __future__ import annotations
+
+from typing import Type
+
+import my
+from my import X, Y
+
+
+def foo(a) -> Type[X | Y]:
+    if a:
+        return my.X
+    else:
+        return my.Y

python/testData/quickFixes/PyMakeFunctionReturnTypeQuickFixTest/py39BitwiseOrUnionFromFutureAnnotationsUnionTypeImports/my.py

@@ -0,0 +1,5 @@
+class X():
+    pass
+
+class Y():
+    pass

python/testData/quickFixes/PyMakeFunctionReturnTypeQuickFixTest/py39UnionTypeImports/main.py

@@ -0,0 +1,8 @@
+import my
+
+
+def foo(a) -> my.X:
+    if a:
+        return <warning descr="Expected type 'X', got 'Type[X]' instead">my.X<caret></warning>
+    else:
+        return <warning descr="Expected type 'X', got 'Type[Y]' instead">my.Y</warning>

python/testData/quickFixes/PyMakeFunctionReturnTypeQuickFixTest/py39UnionTypeImports/main_after.py

@@ -0,0 +1,11 @@
+from typing import Union, Type
+
+import my
+from my import X, Y
+
+
+def foo(a) -> Type[Union[X, Y]]:
+    if a:
+        return my.X
+    else:
+        return my.Y

python/testData/quickFixes/PyMakeFunctionReturnTypeQuickFixTest/py39UnionTypeImports/my.py

@@ -0,0 +1,5 @@
+class X():
+    pass
+
+class Y():
+    pass