language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-27 13:59:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Disallow typing optional fields when required fields are annotated

Browse source 
Closes #4313
This commit is contained in:
Ayaz Hafiz 2022-10-18 15:50:20 -05:00
parent 62c9a2a8b6
commit 05e8e6de6f
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
13 changed files with 133 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/reporting/src/error/type.rs
View file

@ -2317,6 +2317,9 @@ fn to_doc_help<'b>(
Parens::Unnecessary,
v,
)),
RecordField::RigidRequired(v) => RecordField::RigidRequired(
to_doc_help(ctx, alloc, Parens::Unnecessary, v),
),
RecordField::Demanded(v) => RecordField::Demanded(to_doc_help(
ctx,
alloc,
@ -2794,22 +2797,12 @@ fn diff_record<'b>(
left: (
field.clone(),
alloc.string(field.as_str().to_string()),
match t1 {
RecordField::Optional(_) => RecordField::Optional(diff.left),
RecordField::RigidOptional(_) => RecordField::RigidOptional(diff.left),
RecordField::Required(_) => RecordField::Required(diff.left),
RecordField::Demanded(_) => RecordField::Demanded(diff.left),
},
t1.replace(diff.left),
),
right: (
field.clone(),
alloc.string(field.as_str().to_string()),
match t2 {
RecordField::Optional(_) => RecordField::Optional(diff.right),
RecordField::RigidOptional(_) => RecordField::RigidOptional(diff.right),
RecordField::Required(_) => RecordField::Required(diff.right),
RecordField::Demanded(_) => RecordField::Demanded(diff.right),
},
t2.replace(diff.right),
),
status: {
match (&t1, &t2) {
@ -3252,10 +3245,9 @@ mod report_text {
let entry_to_doc =
|(field_name, field_type): (RocDocBuilder<'b>, RecordField<RocDocBuilder<'b>>)| {
match field_type {
RecordField::Demanded(field) => {
field_name.append(alloc.text(" : ")).append(field)
}
RecordField::Required(field) => {
RecordField::Demanded(field)
| RecordField::Required(field)
| RecordField::RigidRequired(field) => {
field_name.append(alloc.text(" : ")).append(field)
}
RecordField::Optional(field) | RecordField::RigidOptional(field) => {