Updated TypedDict qualifier logic and conformance outputs

Author: ajaymiranda

conformance/third_party/conformance.exp

@@ -10543,6 +10543,16 @@
       "stop_column": 24,
       "stop_line": 19
     },
+    {
+      "code": -2,
+      "column": 8,
+      "concise_description": "Cannot combine Required and NotRequired for a TypedDict field",
+      "description": "Cannot combine Required and NotRequired for a TypedDict field",
+      "line": 63,
+      "name": "invalid-annotation",
+      "stop_column": 34,
+      "stop_line": 63
+    },
     {
       "code": -2,
       "column": 75,

conformance/third_party/conformance.result

@@ -613,7 +613,6 @@
   ],
   "typeddicts_required.py": [
     "Line 62: Expected 1 errors",
-    "Line 63: Expected 1 errors",
     "Line 74: Unexpected errors [\"Expected a type form, got instance of `Literal['RecursiveMovie']`\"]"
   ],
   "typeddicts_type_consistency.py": [

conformance/third_party/results.json

@@ -3,7 +3,7 @@
   "pass": 55,
   "fail": 81,
   "pass_rate": 0.4,
-  "differences": 407,
+  "differences": 406,
   "passing": [
     "aliases_explicit.py",
     "aliases_newtype.py",
@@ -140,7 +140,7 @@
     "typeddicts_readonly_consistency.py": 3,
     "typeddicts_readonly_inheritance.py": 7,
     "typeddicts_readonly_update.py": 2,
-    "typeddicts_required.py": 3,
+    "typeddicts_required.py": 2,
     "typeddicts_type_consistency.py": 2,
     "typeddicts_usage.py": 2
   },

pyrefly/lib/alt/solve.rs

@@ -469,18 +469,28 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                     );
                 }
 
-                let has_required = ann.qualifiers.contains(&Qualifier::Required);
-                let has_not_required = ann.qualifiers.contains(&Qualifier::NotRequired);
-                if (qualifier == Qualifier::Required && has_not_required)
-                    || (qualifier == Qualifier::NotRequired && has_required)
-                {
-                    self.error(
-                        errors,
-                        x.range(),
-                        ErrorKind::InvalidAnnotation,
-                        None,
-                        "Cannot combine Required and NotRequired for a TypedDict field".to_owned(),
-                    );
+                if qualifier == Qualifier::Required {
+                    if ann.qualifiers.contains(&Qualifier::NotRequired) {
+                        self.error(
+                            errors,
+                            x.range(),
+                            ErrorKind::InvalidAnnotation,
+                            None,
+                            "Cannot combine Required and NotRequired for a TypedDict field"
+                                .to_owned(),
+                        );
+                    }
+                } else if qualifier == Qualifier::NotRequired {
+                    if ann.qualifiers.contains(&Qualifier::Required) {
+                        self.error(
+                            errors,
+                            x.range(),
+                            ErrorKind::InvalidAnnotation,
+                            None,
+                            "Cannot combine Required and NotRequired for a TypedDict field"
+                                .to_owned(),
+                        );
+                    }
                 }
 
                 ann.qualifiers.insert(0, qualifier);