Remove isinstance(Var) check: we want to exclude all clashing names

Author: sterliakov

mypy/checker.py

@@ -5434,9 +5434,7 @@ def remove_capture_conflicts(
             for expr, typ in list(type_map.items()):
                 if isinstance(expr, NameExpr):
                     node = expr.node
-                    if isinstance(node, Var) and (
-                        node not in inferred_types or not is_subtype(typ, inferred_types[node])
-                    ):
+                    if node not in inferred_types or not is_subtype(typ, inferred_types[node]):
                         del type_map[expr]
 
     def visit_type_alias_stmt(self, o: TypeAliasStmt) -> None:

test-data/unit/check-python310.test

@@ -2448,7 +2448,7 @@ def x() -> tuple[Literal["test"]]: ...
 
 match x():
     case (x,) if x == "test":  # E: Incompatible types in capture pattern (pattern captures type "Literal['test']", variable has type "Callable[[], Tuple[Literal['test']]]")
-        pass
+        reveal_type(x)  # N: Revealed type is "def () -> Tuple[Literal['test']]"
     case foo:
         foo
 
@@ -2460,11 +2460,33 @@ class Some:
     value: int | str
     __match_args__ = ("value",)
 
-def some(x: Some) -> None:
+def fn1(x: Some | int | str) -> None:
     match x:
         case int():
             def value():
                 return 1
+            reveal_type(value)  # N: Revealed type is "def () -> Any"
+        case str():
+            def value():
+                return 1
+            reveal_type(value)  # N: Revealed type is "def () -> Any"
         case Some(value):  # E: Incompatible types in capture pattern (pattern captures type "Union[int, str]", variable has type "Callable[[], Any]")
             pass
+
+def fn2(x: Some | int | str) -> None:
+    match x:
+        case int():
+            def value() -> str:
+                return ""
+            reveal_type(value)  # N: Revealed type is "def () -> builtins.str"
+        case str():
+            def value() -> int:  # E: All conditional function variants must have identical signatures \
+                                 # N: Original: \
+                                 # N:     def value() -> str \
+                                 # N: Redefinition: \
+                                 # N:     def value() -> int
+                return 1
+            reveal_type(value)  # N: Revealed type is "def () -> builtins.str"
+        case Some(value):  # E: Incompatible types in capture pattern (pattern captures type "Union[int, str]", variable has type "Callable[[], str]")
+            pass
 [builtins fixtures/dict.pyi]