sourcegraph
diff --git a/‎packages/pyright-internal/src/analyzer/checker.ts
Lines changed: 18 additions & 0 deletions b/‎packages/pyright-internal/src/analyzer/checker.ts
Lines changed: 18 additions & 0 deletions
diff --git a/‎packages/pyright-internal/src/tests/samples/override1.py
Lines changed: 7 additions & 0 deletions b/‎packages/pyright-internal/src/tests/samples/override1.py
Lines changed: 7 additions & 0 deletions
diff --git a/‎packages/pyright-internal/src/tests/samples/override2.py
Lines changed: 9 additions & 0 deletions b/‎packages/pyright-internal/src/tests/samples/override2.py
Lines changed: 9 additions & 0 deletions
diff --git a/‎packages/pyright-internal/src/tests/typeEvaluator5.test.ts
Lines changed: 2 additions & 7 deletions b/‎packages/pyright-internal/src/tests/typeEvaluator5.test.ts
Lines changed: 2 additions & 7 deletions
@@ -5332,6 +5332,15 @@ export class Checker extends ParseTreeWalker {
             overrideFunction = overrideType;
         } else if (isOverloadedFunction(overrideType)) {
             overrideFunction = OverloadedFunctionType.getImplementation(overrideType);
+        } else if (isClassInstance(overrideType) && ClassType.isPropertyClass(overrideType)) {
+            const fgetSymbol = overrideType.details.fields.get('fget');
+
+            if (fgetSymbol) {
+                const fgetType = this._evaluator.getDeclaredTypeOfSymbol(fgetSymbol)?.type;
+                if (fgetType && isFunction(fgetType)) {
+                    overrideFunction = fgetType;
+                }
+            }
         }
 
         if (!overrideFunction?.details.declaration || FunctionType.isOverridden(overrideFunction)) {
@@ -5365,6 +5374,15 @@ export class Checker extends ParseTreeWalker {
             overrideFunction = overrideType;
         } else if (isOverloadedFunction(overrideType)) {
             overrideFunction = OverloadedFunctionType.getImplementation(overrideType);
+        } else if (isClassInstance(overrideType) && ClassType.isPropertyClass(overrideType)) {
+            const fgetSymbol = overrideType.details.fields.get('fget');
+
+            if (fgetSymbol) {
+                const fgetType = this._evaluator.getDeclaredTypeOfSymbol(fgetSymbol)?.type;
+                if (fgetType && isFunction(fgetType)) {
+                    overrideFunction = fgetType;
+                }
+            }
         }
 
         if (!overrideFunction?.details.declaration || !FunctionType.isOverridden(overrideFunction)) {
 
@@ -20,6 +20,13 @@ def method5(self, x: int | str) -> int | str:
 
 
 class ClassC(ClassA, ClassB):
+    @property
+    @override
+    # This should generate an error because prop_a doesn't
+    # override anything in its base class.
+    def prop_a(self) -> int:
+        raise NotImplementedError
+
     @override
     def method1(self) -> None:
         pass
 
@@ -12,6 +12,10 @@ def __init__(self):
     def method1(self):
         pass
 
+    @property
+    def prop_c(self) -> int:
+        return 0
+
 
 class Child(Base):
     def __init__(self):
@@ -20,3 +24,8 @@ def __init__(self):
     # This should generate an error if reportImplicitOverride is enabled.
     def method1(self):
         pass
+
+    @property
+    # This should generate an error if reportImplicitOverride is enabled.
+    def prop_c(self) -> int:
+        return 0
@@ -147,12 +147,7 @@ test('Hashability1', () => {
 
 test('Override1', () => {
     const analysisResults = TestUtils.typeAnalyzeSampleFiles(['override1.py']);
-    TestUtils.validateResults(analysisResults, 2);
-});
-
-test('Override1', () => {
-    const analysisResults = TestUtils.typeAnalyzeSampleFiles(['override1.py']);
-    TestUtils.validateResults(analysisResults, 2);
+    TestUtils.validateResults(analysisResults, 3);
 });
 
 test('Override2', () => {
@@ -163,7 +158,7 @@ test('Override2', () => {
 
     configOptions.diagnosticRuleSet.reportImplicitOverride = 'error';
     const analysisResults2 = TestUtils.typeAnalyzeSampleFiles(['override2.py'], configOptions);
-    TestUtils.validateResults(analysisResults2, 1);
+    TestUtils.validateResults(analysisResults2, 2);
 });
 
 test('TypeVarDefault1', () => {