Skip to content

[prism] more loc_to_str conversions #730

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
froydnj merged 1 commit into from
Dec 26, 2025
Merged

[prism] more loc_to_str conversions #730

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
20 changes: 5 additions & 15 deletions librubyfmt/src/format_prism.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2672,18 +2672,10 @@ fn format_block_local_variable_node(
}

fn format_array_node(ps: &mut ParserState, array_node: prism::ArrayNode) {
let opening = array_node
.opening_loc()
.map(|loc| loc_to_string(loc).trim().to_string());
let is_word_array = opening
.as_ref()
.map(|s| s.starts_with("%"))
.unwrap_or(false);
let opening = array_node.opening_loc().map(|loc| loc_to_str(loc).trim());
let is_word_array = opening.map(|s| s.starts_with("%")).unwrap_or(false);

let orig_delim = opening
.as_ref()
.and_then(|s| s.chars().nth(2))
.unwrap_or('[');
let orig_delim = opening.and_then(|s| s.chars().nth(2)).unwrap_or('[');

if is_word_array {
ps.emit_ident(opening.unwrap().split_at(2).0.to_string());
Expand Down Expand Up @@ -3426,11 +3418,9 @@ fn format_hash_pattern_node(ps: &mut ParserState, hash_pattern_node: prism::Hash
});
}

let opener = hash_pattern_node
.opening_loc()
.map(|loc| loc_to_string(loc));
let opener = hash_pattern_node.opening_loc().map(|loc| loc_to_str(loc));
let use_parens = hash_pattern_node.constant().is_some()
|| opener.as_ref().map(|s| s.starts_with("(")).unwrap_or(false);
|| opener.map(|s| s.starts_with("(")).unwrap_or(false);

let elements = hash_pattern_node.elements();

Expand Down