Skip to content

fix(ast_tools): remove r# prefix from attr parts during parsing #10026

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

Merged
graphite-app merged 1 commit into from
Mar 25, 2025
Merged

fix(ast_tools): remove r# prefix from attr parts during parsing #10026

Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion tasks/ast_tools/src/derives/estree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ fn parse_estree_attr(location: AttrLocation, part: AttrPart) -> Result<()> {
let mut field_indices = vec![];
for list_element in list {
let field_name = list_element.try_into_tag()?;
let field_name = field_name.trim_start_matches("r#");
let field_index = all_field_names
.clone()
.position(|this_field_name| this_field_name == field_name)
Expand Down
12 changes: 6 additions & 6 deletions tasks/ast_tools/src/parse/parse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,7 @@ fn process_attr(
for meta in parts {
match &meta {
Meta::Path(path) => {
let part_name = path.get_ident().ok_or(())?.to_string();
let part_name = ident_name(path.get_ident().ok_or(())?);
process_attr_part(
processor,
attr_name,
Expand All @@ -793,7 +793,7 @@ fn process_attr(
)?;
}
Meta::NameValue(name_value) => {
let part_name = name_value.path.get_ident().ok_or(())?.to_string();
let part_name = ident_name(name_value.path.get_ident().ok_or(())?);
let str = convert_expr_to_string(&name_value.value);
process_attr_part(
processor,
Expand All @@ -803,7 +803,7 @@ fn process_attr(
)?;
}
Meta::List(meta_list) => {
let part_name = meta_list.path.get_ident().ok_or(())?.to_string();
let part_name = ident_name(meta_list.path.get_ident().ok_or(())?);
let list = parse_attr_part_list(meta_list)?;
process_attr_part(
processor,
Expand All @@ -827,16 +827,16 @@ fn parse_attr_part_list(meta_list: &MetaList) -> Result<Vec<AttrPartListElement>
.into_iter()
.map(|meta| match meta {
Meta::Path(path) => {
let part_name = path.get_ident().ok_or(())?.to_string();
let part_name = ident_name(path.get_ident().ok_or(())?);
Ok(AttrPartListElement::Tag(part_name))
}
Meta::NameValue(name_value) => {
let part_name = name_value.path.get_ident().ok_or(())?.to_string();
let part_name = ident_name(name_value.path.get_ident().ok_or(())?);
let str = convert_expr_to_string(&name_value.value);
Ok(AttrPartListElement::String(part_name, str))
}
Meta::List(meta_list) => {
let part_name = meta_list.path.get_ident().ok_or(())?.to_string();
let part_name = ident_name(meta_list.path.get_ident().ok_or(())?);
let list = parse_attr_part_list(&meta_list)?;
Ok(AttrPartListElement::List(part_name, list))
}
Expand Down