Skip to content

Dedupe inherited class FQN formatting in pyrefly coverage #3847

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
+12 −26
Open

Dedupe inherited class FQN formatting in pyrefly coverage #3847

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
38 changes: 12 additions & 26 deletions pyrefly/lib/commands/coverage/collect.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1156,7 +1156,7 @@ fn parse_classes(
tco_classes: &SmallSet<Idx<KeyClass>>,
) -> Vec<ReportClass> {
let mut classes = Vec::new();
let module_prefix = module_prefix(module);
let prefix = module_prefix(module);
let deleted = bindings.module_deletes();

// group method definitions by class
Expand Down Expand Up @@ -1203,10 +1203,7 @@ fn parse_classes(
},
None => continue,
};
let class_name = format!(
"{module_prefix}{}",
class_qualified_name(module, parent, name)
);
let class_name = format!("{prefix}{}", class_qualified_name(module, parent, name));
let mro = answers
.get_idx(bindings.key_to_idx(&KeyClassMro(ClassDefIndex(class_type.index().0))))
.unwrap_or_else(|| Arc::new(ClassMro::Cyclic));
Expand All @@ -1223,31 +1220,20 @@ fn parse_classes(
// Check inherited methods
for ancestor_class_type in mro.ancestors_no_object() {
let ancestor_class = ancestor_class_type.class_object();
let ancestor_name = {
let ancestor_module = ancestor_class.module();
let ancestor_module_prefix = if ancestor_module.name() != ModuleName::unknown() {
format!("{}.", ancestor_module.name())
} else {
String::new()
};
let ancestor_parent_path = ancestor_module
.display(ancestor_class.qname().parent())
.to_string();
if ancestor_parent_path.is_empty() {
format!("{}{}", ancestor_module_prefix, ancestor_class.name())
} else {
format!(
"{}{}.{}",
ancestor_module_prefix,
ancestor_parent_path,
ancestor_class.name()
)
}
};
// Skip methods inherited from builtins
if ancestor_class.module_name().as_str() == "builtins" {
continue;
}
let ancestor_module = ancestor_class.module();
let ancestor_name = format!(
"{}{}",
module_prefix(ancestor_module),
class_qualified_name(
ancestor_module,
ancestor_class.qname().parent(),
ancestor_class.name()
)
);
let Some(ancestor_class_fields) = transaction.get_class_fields(handle, ancestor_class)
else {
continue;
Expand Down
Loading