Skip to content

Do not remove the whitespace in foo () when formatting #14439

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
straight-shoota merged 1 commit into from
Apr 8, 2024
Merged

Do not remove the whitespace in foo () when formatting #14439

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
2 changes: 2 additions & 0 deletions spec/compiler/formatter/formatter_spec.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1837,6 +1837,8 @@ describe Crystal::Formatter do
assert_format "foo (1; 2)"
assert_format "foo ((1) ? 2 : 3)", "foo((1) ? 2 : 3)"
assert_format "foo((1..3))"
assert_format "foo ()"
assert_format "foo ( )", "foo ()"
assert_format "def foo(\n\n#foo\nx,\n\n#bar\nz\n)\nend", "def foo(\n # foo\n x,\n\n # bar\n z\n)\nend"
assert_format "def foo(\nx, #foo\nz #bar\n)\nend", "def foo(\n x, # foo\n z # bar\n)\nend"
assert_format "a = 1;;; b = 2", "a = 1; b = 2"
Expand Down
9 changes: 7 additions & 2 deletions src/compiler/crystal/tools/formatter.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2774,8 +2774,13 @@ module Crystal
!node.named_args && !node.block_arg && !node.block &&
(expressions = node.args[0].as?(Expressions)) &&
expressions.keyword.paren? && expressions.expressions.size == 1
skip_space
node.args[0] = expressions.expressions[0]
# ...except do not transform `foo ()` into `foo()`, as the former is
# actually semantically equivalent to `foo(nil)`
arg = expressions.expressions[0]
unless arg.is_a?(Nop)
skip_space
node.args[0] = arg
end
end

if @token.type.op_lparen?
Expand Down