Skip to content

[prism] Support method modifier calls #541

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
reese merged 1 commit into from
Apr 14, 2025
Merged

[prism] Support method modifier calls #541

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
51 changes: 37 additions & 14 deletions librubyfmt/src/format_prism.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1097,22 +1097,45 @@ fn format_call_node(
);
}
if let Some(arguments) = call_node.arguments() {
let delims = if is_aref {
BreakableDelims::for_array()
// For callers where the only arg is a def node,
// we assume that's a `public def` style modifier and don't use parens
if arguments.arguments().iter().count() == 1
&& arguments
.arguments()
.iter()
.next()
.unwrap()
.as_def_node()
.is_some()
{
ps.emit_space();

let def_node = arguments
.arguments()
.iter()
.next()
.unwrap()
.as_def_node()
.unwrap();
Comment on lines +1102 to +1119
Copy link
Collaborator

@froydnj froydnj Apr 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Faster let_chains stabilization, please: rust-lang/rust#53667

Copy link
Collaborator Author

@reese reese Apr 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Literally the exact reason I made #540 😆

format_def_node(ps, def_node);
} else {
BreakableDelims::for_method_call()
let delims = if is_aref {
BreakableDelims::for_array()
} else {
BreakableDelims::for_method_call()
};
ps.with_start_of_line(
false,
Box::new(|ps| {
ps.breakable_of(
delims,
Box::new(|ps| {
format_arguments_node(ps, arguments);
}),
);
}),
);
};
ps.with_start_of_line(
false,
Box::new(|ps| {
ps.breakable_of(
delims,
Box::new(|ps| {
format_arguments_node(ps, arguments);
}),
);
}),
);
}
if let Some(block) = call_node.block() {
ps.emit_space();
Expand Down
10 changes: 5 additions & 5 deletions tests/prism_fixtures_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ fixture!(test_small_long_blockvar, "small/long_blockvar");
fixture!(test_small_map_curly, "small/map_curly");
// fixture!(test_small_massign, "small/massign");
// fixture!(test_small_massign_omg, "small/massign_omg");
// fixture!(test_small_memoist, "small/memoist");
fixture!(test_small_memoist, "small/memoist");
fixture!(
test_small_method_add_block_command_call,
"small/method_add_block_command_call"
Expand Down Expand Up @@ -425,10 +425,10 @@ fixture!(
test_small_preserve_slash_u_strings,
"small/preserve_slash_u_strings"
);
// fixture!(
// test_small_private_class_method,
// "small/private_class_method"
// );
fixture!(
test_small_private_class_method,
"small/private_class_method"
);
fixture!(
test_small_private_gets_trailing_blankline,
"small/private_gets_trailing_blankline"
Expand Down