Skip to content

Dedupe return annotation matching in pyrefly coverage #3850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jorenham wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −27
Open

Dedupe return annotation matching in pyrefly coverage #3850

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 16 additions & 27 deletions pyrefly/lib/commands/coverage/collect.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,20 +766,9 @@ fn parse_functions(
format!("{}{}", module_prefix, fun.def.name)
};

// Get return annotation text and check if return type is known
let return_key = Key::ReturnType(*id);
let return_idx = bindings.key_to_idx(&return_key);
let return_annotation = if let Binding::ReturnType(ret) = bindings.get(return_idx) {
match &ret.kind {
ReturnTypeKind::ShouldValidateAnnotation { range, .. }
| ReturnTypeKind::ShouldTrustAnnotation { range, .. } => {
Some(module.code_at(*range).to_owned())
}
_ => None,
}
} else {
None
};
let return_idx = bindings.key_to_idx(&Key::ReturnType(*id));
let return_annotation = return_annotation_range(bindings, return_idx)
.map(|range| module.code_at(range).to_owned());

let resolved_return_ty = return_annotation
.as_ref()
Expand Down Expand Up @@ -942,26 +931,26 @@ fn parse_functions(
functions
}

fn return_annotation_range(bindings: &Bindings, return_idx: Idx<Key>) -> Option<TextRange> {
if let Binding::ReturnType(ret) = bindings.get(return_idx)
&& let ReturnTypeKind::ShouldValidateAnnotation { range, .. }
| ReturnTypeKind::ShouldTrustAnnotation { range, .. } = &ret.kind
{
Some(*range)
} else {
None
}
}

/// Only the first parameter (`self`/`cls`) is allowed to be unannotated.
fn is_function_completely_annotated(
bindings: &Bindings,
answers: &Answers,
undecorated_idx: Idx<KeyUndecoratedFunction>,
) -> bool {
let fun = bindings.get(undecorated_idx);
let return_key = Key::ReturnType(ShortIdentifier::new(&fun.def.name));
let return_idx = bindings.key_to_idx(&return_key);
let has_return_annotation = if let Binding::ReturnType(ret) = bindings.get(return_idx) {
matches!(
&ret.kind,
ReturnTypeKind::ShouldValidateAnnotation { .. }
| ReturnTypeKind::ShouldTrustAnnotation { .. }
)
} else {
false
};

if !has_return_annotation {
let return_idx = bindings.key_to_idx(&Key::ReturnType(ShortIdentifier::new(&fun.def.name)));
if return_annotation_range(bindings, return_idx).is_none() {
return false;
}

Expand Down
Loading