Skip to content

Indent multiline percent literals #643

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
tompng merged 1 commit into from
Jul 15, 2023
Merged

Indent multiline percent literals #643

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
6 changes: 3 additions & 3 deletions lib/irb/ruby-lex.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,9 +368,9 @@ def calc_indent_level(opens)
end
end
when :on_tstring_beg, :on_regexp_beg, :on_symbeg, :on_backtick
# can be indented if t.tok starts with `%`
when :on_words_beg, :on_qwords_beg, :on_symbols_beg, :on_qsymbols_beg, :on_embexpr_beg
# can be indented but not indented in current implementation
# No indent: "", //, :"", ``
# Indent: %(), %r(), %i(), %x()
indent_level += 1 if t.tok.start_with? '%'
when :on_embdoc_beg
indent_level = 0
else
Expand Down
34 changes: 17 additions & 17 deletions test/irb/test_ruby_lex.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,13 +256,13 @@ def test_heredoc_with_embexpr
PromptRow.new('001:0:":* ', %q(<<A+%W[#{<<B)),
PromptRow.new('002:0:":* ', %q(#{<<C+%W[)),
PromptRow.new('003:0:":* ', %q(a)),
PromptRow.new('004:0:]:* ', %q(C)),
PromptRow.new('005:0:]:* ', %q(a)),
PromptRow.new('004:2:]:* ', %q(C)),
PromptRow.new('005:2:]:* ', %q(a)),
PromptRow.new('006:0:":* ', %q(]})),
PromptRow.new('007:0:":* ', %q(})),
PromptRow.new('008:0:":* ', %q(A)),
PromptRow.new('009:0:]:* ', %q(B)),
PromptRow.new('010:0:]:* ', %q(})),
PromptRow.new('009:2:]:* ', %q(B)),
PromptRow.new('010:1:]:* ', %q(})),
PromptRow.new('011:0: :> ', %q(])),
PromptRow.new('012:0: :> ', %q()),
]
Expand Down Expand Up @@ -737,16 +737,16 @@ def test_pasted_code_keep_base_indent_spaces_with_heredoc
Row.new(%q( [1), 10, 12, 3),
Row.new(%q( ]+[["a), 10, 14, 4),
Row.new(%q(b" + <<~A + <<-B + <<C), 0, 16, 5),
Row.new(%q( a#{), 16, 16, 5),
Row.new(%q( 1), 16, 16, 5),
Row.new(%q( a#{), 16, 18, 6),
Row.new(%q( 1), 18, 18, 6),
Row.new(%q( }), 16, 16, 5),
Row.new(%q( A), 14, 16, 5),
Row.new(%q( b#{), 16, 16, 5),
Row.new(%q( 1), 16, 16, 5),
Row.new(%q( b#{), 16, 18, 6),
Row.new(%q( 1), 18, 18, 6),
Row.new(%q( }), 16, 16, 5),
Row.new(%q( B), 14, 0, 0),
Row.new(%q(c#{), 0, 0, 0),
Row.new(%q(1), 0, 0, 0),
Row.new(%q(c#{), 0, 2, 1),
Row.new(%q( 1), 2, 2, 1),
Row.new(%q(}), 0, 0, 0),
Row.new(%q(C), 0, 14, 4),
Row.new(%q( ]), 12, 12, 3),
Expand Down Expand Up @@ -799,7 +799,7 @@ def test_dynamic_prompt
def test_dynamic_prompt_with_double_newline_breaking_code
input_with_prompt = [
PromptRow.new('001:1: :* ', %q(if true)),
PromptRow.new('002:1: :* ', %q(%)),
PromptRow.new('002:2: :* ', %q(%)),
PromptRow.new('003:1: :* ', %q(;end)),
PromptRow.new('004:1: :* ', %q(;hello)),
PromptRow.new('005:0: :> ', %q(end)),
Expand All @@ -813,12 +813,12 @@ def test_dynamic_prompt_with_double_newline_breaking_code
def test_dynamic_prompt_with_multiline_literal
input_with_prompt = [
PromptRow.new('001:1: :* ', %q(if true)),
PromptRow.new('002:1:]:* ', %q( %w[)),
PromptRow.new('003:1:]:* ', %q( a)),
PromptRow.new('002:2:]:* ', %q( %w[)),
PromptRow.new('003:2:]:* ', %q( a)),
PromptRow.new('004:1: :* ', %q( ])),
PromptRow.new('005:1: :* ', %q( b)),
PromptRow.new('006:1:]:* ', %q( %w[)),
PromptRow.new('007:1:]:* ', %q( c)),
PromptRow.new('006:2:]:* ', %q( %w[)),
PromptRow.new('007:2:]:* ', %q( c)),
PromptRow.new('008:1: :* ', %q( ])),
PromptRow.new('009:0: :> ', %q(end)),
]
Expand All @@ -830,8 +830,8 @@ def test_dynamic_prompt_with_multiline_literal

def test_dynamic_prompt_with_blank_line
input_with_prompt = [
PromptRow.new('001:0:]:* ', %q(%w[)),
PromptRow.new('002:0:]:* ', %q()),
PromptRow.new('001:1:]:* ', %q(%w[)),
PromptRow.new('002:1:]:* ', %q()),
PromptRow.new('003:0: :> ', %q(])),
]

Expand Down