Merge branch 'master' into patch-3

Author: BobTheBuidler

mypy/checkmember.py

@@ -981,6 +981,10 @@ def expand_and_bind_callable(
     assert isinstance(expanded, CallableType)
     if var.is_settable_property and mx.is_lvalue and var.setter_type is not None:
         # TODO: use check_call() to infer better type, same as for __set__().
+        if not expanded.arg_types:
+            # This can happen when accessing invalid property from its own body,
+            # error will be reported elsewhere.
+            return AnyType(TypeOfAny.from_error)
         return expanded.arg_types[0]
     else:
         return expanded.ret_type

test-data/unit/check-classes.test

@@ -8726,3 +8726,16 @@ class Fields:
 reveal_type(Fields.bool_f)  # N: Revealed type is "__main__.BoolField"
 reveal_type(Fields.int_f)  # N: Revealed type is "__main__.NumField"
 reveal_type(Fields.custom_f)  # N: Revealed type is "__main__.AnyField[__main__.Custom]"
+
+[case testRecursivePropertyWithInvalidSetterNoCrash]
+class NoopPowerResource:
+    _hardware_type: int
+
+    @property
+    def hardware_type(self) -> int:
+        return self._hardware_type
+
+    @hardware_type.setter
+    def hardware_type(self) -> None:  # E: Invalid property setter signature
+        self.hardware_type = None  # Note: intentionally recursive
+[builtins fixtures/property.pyi]

test-data/unit/check-dataclasses.test

@@ -2609,3 +2609,12 @@ class B2(B1):  # E: A NamedTuple cannot be a dataclass
     pass
 
 [builtins fixtures/tuple.pyi]
+
+[case testDataclassesTypeGuard]
+import dataclasses
+
+raw_target: object
+
+if isinstance(raw_target, type) and dataclasses.is_dataclass(raw_target):
+    reveal_type(raw_target)  # N: Revealed type is "type[dataclasses.DataclassInstance]"
+[builtins fixtures/tuple.pyi]

test-data/unit/check-typeguard.test

@@ -777,3 +777,22 @@ def handle(model: Model) -> int:
         return process_model(model)
     return 0
 [builtins fixtures/tuple.pyi]
+
+
+[case testOverloadedTypeGuardType]
+from __future__ import annotations
+from typing_extensions import TypeIs, Never, overload
+
+class X: ...
+
+@overload  # E: An overloaded function outside a stub file must have an implementation
+def is_xlike(obj: Never) -> TypeIs[X | type[X]]: ...  # type: ignore
+@overload
+def is_xlike(obj: type) -> TypeIs[type[X]]: ...
+@overload
+def is_xlike(obj: object) -> TypeIs[X | type[X]]: ...
+
+raw_target: object
+if isinstance(raw_target, type) and is_xlike(raw_target):
+    reveal_type(raw_target)  # N: Revealed type is "type[__main__.X]"
+[builtins fixtures/tuple.pyi]