add-annotation-tests

Darshan808 · Darshan808 · commit 514a040c6c73 · 2025-11-24T14:43:55.000+05:45
diff --git a/IPython/core/guarded_eval.py b/IPython/core/guarded_eval.py
@@ -573,16 +573,19 @@ def _is_type_annotation(obj) -> bool:
     """
     if isinstance(obj, type):
         return True
-    if hasattr(typing, "get_origin"):
-        if typing.get_origin(obj) is not None:
-            return True
-    if hasattr(obj, "__module__") and obj.__module__ == "typing":
-        return True
     if isinstance(obj, types.GenericAlias):
         return True
     if hasattr(types, "UnionType") and isinstance(obj, types.UnionType):
         return True
-    if type(obj).__name__ in ("_GenericAlias", "_SpecialForm", "_UnionGenericAlias"):
+    if isinstance(obj, (typing._SpecialForm, typing._BaseGenericAlias)):
+        return True
+    if isinstance(obj, typing.TypeVar):
+        return True
+    # Types that support __class_getitem__
+    if isinstance(obj, type) and hasattr(obj, "__class_getitem__"):
+        return True
+    # Fallback: check if get_origin returns something
+    if hasattr(typing, "get_origin") and get_origin(obj) is not None:
         return True
 
     return False
diff --git a/tests/test_guarded_eval.py b/tests/test_guarded_eval.py
@@ -12,6 +12,11 @@
     TypeGuard,
     Union,
     TypedDict,
+    TypeVar,
+    List,
+    Callable,
+    Any,
+    Dict,
 )
 from functools import partial
 from IPython.core.guarded_eval import (
@@ -22,6 +27,7 @@
 )
 from IPython.testing import decorators as dec
 import pytest
+from IPython.core.guarded_eval import _is_type_annotation
 
 
 from typing import Self, LiteralString
@@ -579,6 +585,38 @@ def test_mock_class_and_func_instances(code, expected):
     assert isinstance(value, expected)
 
 
+@pytest.mark.parametrize(
+    "annotation,expected",
+    [
+        # Basic types
+        (int, True),
+        (str, True),
+        (list, True),
+        # Typing generics
+        (list[str], True),
+        (dict[str, int], True),
+        (Optional[int], True),
+        (Union[int, str], True),
+        # Special forms
+        (AnyStr, True),
+        (TypeVar("T"), True),
+        (Callable[[int], str], True),
+        (Literal["GET", "POST"], True),
+        (Any, True),
+        (str | int, True),
+        # Nested
+        (List[Dict[str, int]], True),
+        # Non-annotations
+        (42, False),
+        ("string", False),
+        ([1, 2, 3], False),
+        (None, False),
+    ],
+)
+def test_is_type_annotation(annotation, expected):
+    assert _is_type_annotation(annotation) == expected
+
+
 @pytest.mark.parametrize(
     "code,expected",
     [
