Preserve literals when joining Literal and Instance with matching last_known_value

Author: sterliakov

mypy/join.py

@@ -625,6 +625,8 @@ def visit_literal_type(self, t: LiteralType) -> ProperType:
             if self.s.fallback.type.is_enum and t.fallback.type.is_enum:
                 return mypy.typeops.make_simplified_union([self.s, t])
             return join_types(self.s.fallback, t.fallback)
+        elif isinstance(self.s, Instance) and self.s.last_known_value == t:
+            return t
         else:
             return join_types(self.s, t.fallback)
 

test-data/unit/check-literal.test

@@ -2976,3 +2976,22 @@ x: Type[Literal[1]]  # E: Type[...] can't contain "Literal[...]"
 y: Type[Union[Literal[1], Literal[2]]]  # E: Type[...] can't contain "Union[Literal[...], Literal[...]]"
 z: Type[Literal[1, 2]]  # E: Type[...] can't contain "Union[Literal[...], Literal[...]]"
 [builtins fixtures/tuple.pyi]
+
+[case testJoinLiteralAndInstance]
+from typing import Generic, TypeVar, Literal
+
+T = TypeVar("T")
+
+class A(Generic[T]): ...
+
+def f(a: A[T], t: T) -> T: ...
+def g(a: T, t: A[T]) -> T: ...
+
+def check(obj: A[Literal[1]]) -> None:
+    reveal_type(f(obj, 1))  # N: Revealed type is "Literal[1]"
+    reveal_type(f(obj, ''))  # E: Cannot infer type argument 1 of "f" \
+                             # N: Revealed type is "Any"
+    reveal_type(g(1, obj))  # N: Revealed type is "Literal[1]"
+    reveal_type(g('', obj))  # E: Cannot infer type argument 1 of "g" \
+                             # N: Revealed type is "Any"
+[builtins fixtures/tuple.pyi]