From 01257b095127ddf0c73f927db6e61764a7205eff Mon Sep 17 00:00:00 2001
From: Ivan Levkivskyi <levkivskyi@gmail.com>
Date: Sun, 9 Jun 2024 20:40:00 +0100
Subject: [PATCH 1/2] Fix crash on unpacking self in NamedTuple

---
 mypy/checker.py                      |  2 ++
 test-data/unit/check-namedtuple.test | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/mypy/checker.py b/mypy/checker.py
index 38976d4ce15e..42fcc05c5976 100644
--- a/mypy/checker.py
+++ b/mypy/checker.py
@@ -3839,6 +3839,8 @@ def check_multi_assignment_from_tuple(
                     self.expr_checker.accept(rvalue, lvalue_type)
                 )
 
+                if isinstance(reinferred_rvalue_type, TypeVarLikeType):
+                    reinferred_rvalue_type = get_proper_type(reinferred_rvalue_type.upper_bound)
                 if isinstance(reinferred_rvalue_type, UnionType):
                     # If this is an Optional type in non-strict Optional code, unwrap it.
                     relevant_items = reinferred_rvalue_type.relevant_items()
diff --git a/test-data/unit/check-namedtuple.test b/test-data/unit/check-namedtuple.test
index a0d984b30279..54cbc7046daf 100644
--- a/test-data/unit/check-namedtuple.test
+++ b/test-data/unit/check-namedtuple.test
@@ -1412,3 +1412,14 @@ A(x=0).__replace__(x="asdf")  # E: Argument "x" to "__replace__" of "A" has inco
 A(x=0).__replace__(y=1)  # E: Unexpected keyword argument "y" for "__replace__" of "A"
 [builtins fixtures/tuple.pyi]
 [typing fixtures/typing-namedtuple.pyi]
+
+[case testUnpackSelfNamedTuple]
+import typing
+
+class Foo(typing.NamedTuple):
+    bar: int
+    def baz(self: typing.Self) -> None:
+        x ,= self
+        reveal_type(x)  # N: Revealed type is "builtins.int"
+[builtins fixtures/tuple.pyi]
+[typing fixtures/typing-namedtuple.pyi]

From 18a98e9c2fa0a161cfeaa041557cf11ce801404e Mon Sep 17 00:00:00 2001
From: Ivan Levkivskyi <levkivskyi@gmail.com>
Date: Sun, 9 Jun 2024 20:41:57 +0100
Subject: [PATCH 2/2] Re-format test

---
 test-data/unit/check-namedtuple.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-data/unit/check-namedtuple.test b/test-data/unit/check-namedtuple.test
index 54cbc7046daf..2007d574f922 100644
--- a/test-data/unit/check-namedtuple.test
+++ b/test-data/unit/check-namedtuple.test
@@ -1419,7 +1419,7 @@ import typing
 class Foo(typing.NamedTuple):
     bar: int
     def baz(self: typing.Self) -> None:
-        x ,= self
+        x, = self
         reveal_type(x)  # N: Revealed type is "builtins.int"
 [builtins fixtures/tuple.pyi]
 [typing fixtures/typing-namedtuple.pyi]