Skip to content

Remaining prettier formatting fixes #56

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
merged 13 commits into from
Apr 22, 2022
Merged

Remaining prettier formatting fixes #56

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0e7a01f
Transform if/unless into ternary
kddnewton Apr 21, 2022
a576f84
Don't format FCall parentheses unless you need them, add parentheses …
kddnewton Apr 21, 2022
7fd2af3
Format comments on params even if they are empty
kddnewton Apr 21, 2022
1f623a5
Include %s symbols in no indent
kddnewton Apr 21, 2022
6eb63e8
Better formatting for empty hashes and arrays with interior comments
kddnewton Apr 21, 2022
b38f7e1
Only test long-running tests if CI env var
kddnewton Apr 21, 2022
e739d62
Alignment on command and command call for ternaries
kddnewton Apr 21, 2022
b7c0232
Format correctly for chained call nodes with arguments
kddnewton Apr 21, 2022
ffb6531
Even better chained calls
kddnewton Apr 21, 2022
b75aa49
Better call chain formatting with method add blocks factored in
kddnewton Apr 21, 2022
368889f
Handle trailing operators if necessary
kddnewton Apr 21, 2022
b847e88
Specialized formatting for sorbet
kddnewton Apr 22, 2022
752b494
More random fixes and simplification
kddnewton Apr 22, 2022
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
Prev Previous commit
Next Next commit
Format comments on params even if they are empty
  • Loading branch information
@kddnewton
kddnewton committed Apr 22, 2022
commit 7fd2af359590bfbab5cb96ac6e8932da19c5aa97
18 changes: 11 additions & 7 deletions lib/syntax_tree/node.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3060,7 +3060,10 @@ def format(q)
q.group do
q.text("def ")
q.format(name)
q.format(params) if !params.is_a?(Params) || !params.empty?

if !params.is_a?(Params) || !params.empty? || params.comments.any?
q.format(params)
end
end

unless bodystmt.empty?
Expand Down Expand Up @@ -3280,7 +3283,10 @@ def format(q)
q.format(target)
q.format(CallOperatorFormatter.new(operator), stackable: false)
q.format(name)
q.format(params) if !params.is_a?(Params) || !params.empty?

if !params.is_a?(Params) || !params.empty? || params.comments.any?
q.format(params)
end
end

unless bodystmt.empty?
Expand Down Expand Up @@ -6317,16 +6323,16 @@ def format(q)
q.format(rest) if rest && rest.is_a?(ExcessedComma)
end

if [Def, Defs, DefEndless].include?(q.parent.class)
if ![Def, Defs, DefEndless].include?(q.parent.class) || parts.empty?
q.nest(0, &contents)
else
q.group(0, "(", ")") do
q.indent do
q.breakable("")
contents.call
end
q.breakable("")
end
else
q.nest(0, &contents)
end
end
end
Expand Down Expand Up @@ -8394,8 +8400,6 @@ def format(q)
q.text(")")
elsif ternary
q.if_break {}.if_flat { q.text(")") }
else
q.text(" ")
end
end
end
Expand Down