Restrict ellipsis replacement to stubs

Author: sterliakov

mypy/plugins/enums.py

@@ -91,7 +91,12 @@ def _infer_value_type_with_auto_fallback(
     # Enums in stubs may have ... instead of actual values. If `_value_` is annotated
     # (manually or inherited from IntEnum, for example), it is a more reasonable guess
     # than literal ellipsis type.
-    if isinstance(proper_type, Instance) and proper_type.type.fullname in ELLIPSIS_TYPE_NAMES:
+    source_module = ctx.api.modules[ctx.type.type.fullname.rsplit(".", 1)[0]]
+    if (
+        source_module.is_stub
+        and isinstance(proper_type, Instance)
+        and proper_type.type.fullname in ELLIPSIS_TYPE_NAMES
+    ):
         if (
             isinstance(ctx.type, Instance)
             and (value_type := ctx.type.type.get("_value_"))

test-data/unit/check-enum.test

@@ -2534,50 +2534,86 @@ def check(thing: Things) -> None:
     return None  # E: Statement is unreachable
 [builtins fixtures/enum.pyi]
 
-[case testSunderValueType]
+[case testSunderValueTypeEllipsis]
+from foo.bar import (
+    Basic, FromStub, InheritedInt, InheritedStr, InheritedFlag, InheritedIntFlag
+)
+
+reveal_type(Basic.FOO)  # N: Revealed type is "Literal[foo.bar.Basic.FOO]?"
+reveal_type(Basic.FOO.value)  # N: Revealed type is "Literal[1]?"
+reveal_type(Basic.FOO._value_)  # N: Revealed type is "builtins.int"
+
+reveal_type(FromStub.FOO)  # N: Revealed type is "Literal[foo.bar.FromStub.FOO]?"
+reveal_type(FromStub.FOO.value)  # N: Revealed type is "builtins.int"
+reveal_type(FromStub.FOO._value_)  # N: Revealed type is "builtins.int"
+
+reveal_type(InheritedInt.FOO)  # N: Revealed type is "Literal[foo.bar.InheritedInt.FOO]?"
+reveal_type(InheritedInt.FOO.value)  # N: Revealed type is "builtins.int"
+reveal_type(InheritedInt.FOO._value_)  # N: Revealed type is "builtins.int"
+
+reveal_type(InheritedStr.FOO)  # N: Revealed type is "Literal[foo.bar.InheritedStr.FOO]?"
+reveal_type(InheritedStr.FOO.value)  # N: Revealed type is "builtins.str"
+reveal_type(InheritedStr.FOO._value_)  # N: Revealed type is "builtins.str"
+
+reveal_type(InheritedFlag.FOO)  # N: Revealed type is "Literal[foo.bar.InheritedFlag.FOO]?"
+reveal_type(InheritedFlag.FOO.value)  # N: Revealed type is "builtins.int"
+reveal_type(InheritedFlag.FOO._value_)  # N: Revealed type is "builtins.int"
+
+reveal_type(InheritedIntFlag.FOO)  # N: Revealed type is "Literal[foo.bar.InheritedIntFlag.FOO]?"
+reveal_type(InheritedIntFlag.FOO.value)  # N: Revealed type is "builtins.int"
+reveal_type(InheritedIntFlag.FOO._value_)  # N: Revealed type is "builtins.int"
+
+[file foo/__init__.pyi]
+[file foo/bar/__init__.pyi]
 from enum import Enum, IntEnum, StrEnum, Flag, IntFlag
 
 class Basic(Enum):
     _value_: int
     FOO = 1
 
-reveal_type(Basic.FOO)  # N: Revealed type is "Literal[__main__.Basic.FOO]?"
-reveal_type(Basic.FOO.value)  # N: Revealed type is "Literal[1]?"
-reveal_type(Basic.FOO._value_)  # N: Revealed type is "builtins.int"
-
 class FromStub(Enum):
     _value_: int
     FOO = ...
 
-reveal_type(FromStub.FOO)  # N: Revealed type is "Literal[__main__.FromStub.FOO]?"
-reveal_type(FromStub.FOO.value)  # N: Revealed type is "builtins.int"
-reveal_type(FromStub.FOO._value_)  # N: Revealed type is "builtins.int"
-
 class InheritedInt(IntEnum):
     FOO = ...
 
-reveal_type(InheritedInt.FOO)  # N: Revealed type is "Literal[__main__.InheritedInt.FOO]?"
-reveal_type(InheritedInt.FOO.value)  # N: Revealed type is "builtins.int"
-reveal_type(InheritedInt.FOO._value_)  # N: Revealed type is "builtins.int"
-
 class InheritedStr(StrEnum):
     FOO = ...
 
-reveal_type(InheritedStr.FOO)  # N: Revealed type is "Literal[__main__.InheritedStr.FOO]?"
-reveal_type(InheritedStr.FOO.value)  # N: Revealed type is "builtins.str"
-reveal_type(InheritedStr.FOO._value_)  # N: Revealed type is "builtins.str"
-
 class InheritedFlag(Flag):
     FOO = ...
 
-reveal_type(InheritedFlag.FOO)  # N: Revealed type is "Literal[__main__.InheritedFlag.FOO]?"
-reveal_type(InheritedFlag.FOO.value)  # N: Revealed type is "builtins.int"
-reveal_type(InheritedFlag.FOO._value_)  # N: Revealed type is "builtins.int"
-
 class InheritedIntFlag(IntFlag):
     FOO = ...
+[builtins fixtures/enum.pyi]
 
-reveal_type(InheritedIntFlag.FOO)  # N: Revealed type is "Literal[__main__.InheritedIntFlag.FOO]?"
-reveal_type(InheritedIntFlag.FOO.value)  # N: Revealed type is "builtins.int"
-reveal_type(InheritedIntFlag.FOO._value_)  # N: Revealed type is "builtins.int"
+[case testSunderValueTypeEllipsisNonStub]
+from enum import Enum, StrEnum
+
+class Basic(Enum):
+    _value_: int
+    FOO = 1
+
+reveal_type(Basic.FOO)  # N: Revealed type is "Literal[__main__.Basic.FOO]?"
+reveal_type(Basic.FOO.value)  # N: Revealed type is "Literal[1]?"
+reveal_type(Basic.FOO._value_)  # N: Revealed type is "builtins.int"
+
+# TODO: this and below should produce diagnostics, Ellipsis is not assignable to int
+# Now we do not check members against _value_ at all.
+
+class FromStub(Enum):
+    _value_: int
+    FOO = ...
+
+reveal_type(FromStub.FOO)  # N: Revealed type is "Literal[__main__.FromStub.FOO]?"
+reveal_type(FromStub.FOO.value)  # N: Revealed type is "builtins.ellipsis"
+reveal_type(FromStub.FOO._value_)  # N: Revealed type is "builtins.int"
+
+class InheritedStr(StrEnum):
+    FOO = ...
+
+reveal_type(InheritedStr.FOO)  # N: Revealed type is "Literal[__main__.InheritedStr.FOO]?"
+reveal_type(InheritedStr.FOO.value)  # N: Revealed type is "builtins.ellipsis"
+reveal_type(InheritedStr.FOO._value_)  # N: Revealed type is "builtins.ellipsis"
 [builtins fixtures/enum.pyi]