From 894d47c3d12d5b2cfb918f8142263070ca97961b Mon Sep 17 00:00:00 2001
From: hauntsaninja <hauntsaninja@gmail.com>
Date: Wed, 22 Jan 2025 17:08:17 -0800
Subject: [PATCH] Fix isinstance with explicit (non generic) type alias

This is a partial revert of #18173 to unblock the 1.15 release

Fixes #18488
---
 mypy/semanal.py                        |  1 -
 test-data/unit/check-type-aliases.test | 31 +++++++++-----------------
 test-data/unit/diff.test               |  1 +
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/mypy/semanal.py b/mypy/semanal.py
index 034d8fb28b42..febb9590887e 100644
--- a/mypy/semanal.py
+++ b/mypy/semanal.py
@@ -4022,7 +4022,6 @@ def check_and_set_up_type_alias(self, s: AssignmentStmt) -> bool:
             and not res.args
             and not empty_tuple_index
             and not pep_695
-            and not pep_613
         )
         if isinstance(res, ProperType) and isinstance(res, Instance):
             if not validate_instance(res, self.fail, empty_tuple_index):
diff --git a/test-data/unit/check-type-aliases.test b/test-data/unit/check-type-aliases.test
index f04bd777ee4e..9527c85ed26a 100644
--- a/test-data/unit/check-type-aliases.test
+++ b/test-data/unit/check-type-aliases.test
@@ -1243,31 +1243,22 @@ A = Union[int, List[A]]
 def func(x: A) -> int: ...
 [builtins fixtures/tuple.pyi]
 
-[case testAliasExplicitNoArgsBasic]
-from typing import Any, List, assert_type
+[case testAliasNonGeneric]
 from typing_extensions import TypeAlias
+class Foo: ...
 
-Implicit = List
-Explicit: TypeAlias = List
+ImplicitFoo = Foo
+ExplicitFoo: TypeAlias = Foo
 
-x1: Implicit[str]
-x2: Explicit[str]  # E: Bad number of arguments for type alias, expected 0, given 1
-assert_type(x1, List[str])
-assert_type(x2, List[Any])
-[builtins fixtures/tuple.pyi]
-
-[case testAliasExplicitNoArgsGenericClass]
-# flags: --python-version 3.9
-from typing import Any, assert_type
-from typing_extensions import TypeAlias
+x1: ImplicitFoo[str]  # E: "Foo" expects no type arguments, but 1 given
+x2: ExplicitFoo[str]  # E: "Foo" expects no type arguments, but 1 given
 
-Implicit = list
-Explicit: TypeAlias = list
+def is_foo(x: object):
+    if isinstance(x, ImplicitFoo):
+        pass
+    if isinstance(x, ExplicitFoo):
+        pass
 
-x1: Implicit[str]
-x2: Explicit[str]  # E: Bad number of arguments for type alias, expected 0, given 1
-assert_type(x1, list[str])
-assert_type(x2, list[Any])
 [builtins fixtures/tuple.pyi]
 
 [case testAliasExplicitNoArgsTuple]
diff --git a/test-data/unit/diff.test b/test-data/unit/diff.test
index b7c71c7f37f2..4acf451e2c34 100644
--- a/test-data/unit/diff.test
+++ b/test-data/unit/diff.test
@@ -1563,6 +1563,7 @@ type H[T] = int
 __main__.A
 __main__.C
 __main__.D
+__main__.E
 __main__.G
 __main__.H