Skip to content

Format: fix indent of nested array elements #7450

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
Feb 21, 2019
Merged

Format: fix indent of nested array elements #7450

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
7 changes: 7 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 @@ -1310,4 +1310,11 @@ describe Crystal::Formatter do
" 2 \n" +
"end"
)

# #7443
assert_format "long_variable_name = [{\n :foo => 1,\n}, {\n :bar => 2,\n}]"
assert_format "long_variable_name = [\n {\n :foo => 1,\n }, {\n :bar => 2,\n },\n]"
assert_format "long_variable_name = [\n {\n :foo => 1,\n },\n {\n :bar => 2,\n },\n]"
assert_format "long_variable_name = [1, 2, 3,\n 4, 5, 6]"
assert_format "long_variable_name = [1, 2, 3, # foo\n 4, 5, 6]"
end
13 changes: 10 additions & 3 deletions src/compiler/crystal/tools/formatter.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,6 +787,7 @@ module Crystal
if found_comment || @token.type == :NEWLINE
# add one level of indentation for contents if a newline is present
offset = @indent + 2
start_column = @indent + 2

if elements.empty?
skip_space_or_newline
Expand All @@ -802,7 +803,8 @@ module Crystal
found_first_newline = true
else
# indent contents at the same column as starting token if no newline
offset = @column
offset = @indent
start_column = @column
end

elements.each_with_index do |element, i|
Expand All @@ -819,17 +821,20 @@ module Crystal
write_space_at_end = true
end

start_line = @line
if next_needs_indent
write_indent(offset, element)
else
indent(offset, element)
end
element_lines = @line - start_line
next_offset = element_lines == 0 ? start_column : offset

has_heredoc_in_line = !@lexer.heredocs.empty?

last = last?(i, elements)

found_comment = skip_space(offset, write_comma: (last || has_heredoc_in_line) && has_newlines)
found_comment = skip_space(next_offset, write_comma: (last || has_heredoc_in_line) && has_newlines)

if @token.type == :","
if !found_comment && (!last || has_heredoc_in_line)
Expand All @@ -839,7 +844,7 @@ module Crystal

slash_is_regex!
next_token
found_comment = skip_space(offset, write_comma: last && has_newlines)
found_comment = skip_space(element_lines == 0 ? start_column : offset, write_comma: last && has_newlines)
if @token.type == :NEWLINE
if last && !found_comment && !wrote_comma
write ","
Expand All @@ -849,12 +854,14 @@ module Crystal
skip_space_or_newline
next_needs_indent = true
has_newlines = true
offset = next_offset if element_lines == 0
else
if !last && !found_comment
write " "
next_needs_indent = false
elsif found_comment
next_needs_indent = true
offset = next_offset if element_lines == 0
end
end
end
Expand Down