Fix type guard crashes

[hauntsaninja]

Fixes #11007, fixes #10899, fixes #10647

Since the initial implementation of TypeGuard, there have been several fixes quickly applied to make mypy not crash on various TypeGuard things. This includes #10496, #10683 and #11015. We'll discuss how this PR relates to each of these three changes.

In particular, #10496 seems incorrect. As A5rocks discusses in #10899 , it introduces confusion between a type guarded variable and a TypeGuard[T]. This PR basically walks back that change entirely and renames TypeGuardType to TypeGuardedType to reduce that possible confusion.

Now, we still have the issue that TypeGuardedTypes are getting everywhere and causing unhappiness. I see two high level solutions to this:
a) Make TypeGuardedType a proper type, then delegate to the wrapped type in a bunch of type visitors and arbitrary amounts of other places where multiple types interact, and hope that we got all of them,
b) Make TypeGuardedType as an improper type (as it was in the original implementation)! Similar to TypeAliasType, it's just a wrapper for another type, so we unwrap it in get_proper_type. This is the approach this PR takes. This might feel controversial, but I think it could be the better option. It also means that if we type check we won't get type guard crashes.

#10683 is basically "remove call that leads to crash from the stacktrace". I think the join here (that ends up being with the wrapped type of the TypeGuardedType) is actually fine: if it's different, it tells us that the type changed, which is what we want to know. So seems fine to remove the special casing.

Finally, #11015. This is the other contentious part of this PR. I liked the idea of moving the core "type guard overrides narrowing" idea into meet.py, so I kept that. But my changes ended up regressing a reveal_type testTypeGuardNestedRestrictionAny test that was added. But it's not really clear to me how that worked or really, what it tested. I tried writing a simpler version of what I thought the test was meant to test (this is testTypeGuardMultipleCondition added in this PR), but that fails on master.

Anyway, this should at least fix the type guard crashes that have been coming up.

[ilevkivskyi]

Thanks! This looks like a good start to clean-up the existing mess. I left few comments where things were not clear to me. There is no need to address them all in this PR, but it would be good to have a clearer/detailed long-term plan.

[ilevkivskyi]

Even if it's not a proper type, we still need to fixup the deserialized target type. Do we have an incremental test with an import cycle?

[ilevkivskyi]

I think this may be wrong. We still need to have some way to propagate the information on updated type guard function. (Btw most likely the old way was wrong as well, do we actually have good test cover for type guards in daemon mode?)

[ilevkivskyi]

So just to clarify, what is the view on subtyping between type guard functions? Can a type guard method be overridden in a subclass? Can a type guard function be expected as a callback?

[hauntsaninja]

I believe yes to both.

But note that mypy.types.TypeGuardedType doesn't actually appear in the signature of def f(x: object) -> TypeGuard[str]. The return type is just treated as a bool

mypy/mypy/typeanal.py

Line 356 in e1bd6cf

elif self.anal_type_guard_arg(t, fullname) is not None:

mypy.types.TypeGuardedType is only created in find_isinstance_check:

mypy/mypy/checker.py

Line 4268 in 9c9c358

return {expr: TypeGuardedType(node.callee.type_guard)}, {}

[github-actions]

Diff from mypy_primer, showing the effect of this PR on open source code:

tornado (https://github.com/tornadoweb/tornado.git)
- tornado/testing.py:587: error: Incompatible types in assignment (expression has type "Union[Generator[Any, Any, Any], CoroutineType]", variable has type "Union[Generator[Any, Any, Any], Coroutine[Any, Any, Any], None]")
- tornado/testing.py:590: error: Incompatible return value type (got "Union[Generator[Any, Any, Any], CoroutineType, Coroutine[Any, Any, Any]]", expected "Union[Generator[Any, Any, Any], Coroutine[Any, Any, Any]]")