[ruby/irb] Drop showing indent level number in DEFAULT prompt and

INF_RUBY prompt
(https://github.com/ruby/irb/pull/679)

* Drop showing indent level number in DEFAULT prompt and INF_RUBY prompt

* Update prompt part of test_rendering's expected result

https://github.com/ruby/irb/commit/3847532e54
This commit is contained in:
tomoya ishida 2023-08-12 19:19:20 +09:00 committed by git
parent 680835085d
commit e1683b4958
3 changed files with 58 additions and 58 deletions

View File

@ -194,10 +194,10 @@ require_relative "irb/easter-egg"
# For instance, the default prompt mode is defined as follows: # For instance, the default prompt mode is defined as follows:
# #
# IRB.conf[:PROMPT_MODE][:DEFAULT] = { # IRB.conf[:PROMPT_MODE][:DEFAULT] = {
# :PROMPT_I => "%N(%m):%03n:%i> ", # :PROMPT_I => "%N(%m):%03n> ",
# :PROMPT_N => "%N(%m):%03n:%i> ", # :PROMPT_N => "%N(%m):%03n> ",
# :PROMPT_S => "%N(%m):%03n:%i%l ", # :PROMPT_S => "%N(%m):%03n%l ",
# :PROMPT_C => "%N(%m):%03n:%i* ", # :PROMPT_C => "%N(%m):%03n* ",
# :RETURN => "%s\n" # used to printf # :RETURN => "%s\n" # used to printf
# } # }
# #
@ -211,10 +211,10 @@ require_relative "irb/easter-egg"
# # :RETURN: | # # :RETURN: |
# # %s # # %s
# # :DEFAULT: # # :DEFAULT:
# # :PROMPT_I: ! '%N(%m):%03n:%i> ' # # :PROMPT_I: ! '%N(%m):%03n> '
# # :PROMPT_N: ! '%N(%m):%03n:%i> ' # # :PROMPT_N: ! '%N(%m):%03n> '
# # :PROMPT_S: ! '%N(%m):%03n:%i%l ' # # :PROMPT_S: ! '%N(%m):%03n%l '
# # :PROMPT_C: ! '%N(%m):%03n:%i* ' # # :PROMPT_C: ! '%N(%m):%03n* '
# # :RETURN: | # # :RETURN: |
# # => %s # # => %s
# # :CLASSIC: # # :CLASSIC:
@ -232,7 +232,7 @@ require_relative "irb/easter-egg"
# # :RETURN: | # # :RETURN: |
# # => %s # # => %s
# # :INF_RUBY: # # :INF_RUBY:
# # :PROMPT_I: ! '%N(%m):%03n:%i> ' # # :PROMPT_I: ! '%N(%m):%03n> '
# # :PROMPT_N: # # :PROMPT_N:
# # :PROMPT_S: # # :PROMPT_S:
# # :PROMPT_C: # # :PROMPT_C:

View File

@ -64,10 +64,10 @@ module IRB # :nodoc:
:RETURN => "%s\n" :RETURN => "%s\n"
}, },
:DEFAULT => { :DEFAULT => {
:PROMPT_I => "%N(%m):%03n:%i> ", :PROMPT_I => "%N(%m):%03n> ",
:PROMPT_N => "%N(%m):%03n:%i> ", :PROMPT_N => "%N(%m):%03n> ",
:PROMPT_S => "%N(%m):%03n:%i%l ", :PROMPT_S => "%N(%m):%03n%l ",
:PROMPT_C => "%N(%m):%03n:%i* ", :PROMPT_C => "%N(%m):%03n* ",
:RETURN => "=> %s\n" :RETURN => "=> %s\n"
}, },
:CLASSIC => { :CLASSIC => {
@ -85,7 +85,7 @@ module IRB # :nodoc:
:RETURN => "=> %s\n" :RETURN => "=> %s\n"
}, },
:INF_RUBY => { :INF_RUBY => {
:PROMPT_I => "%N(%m):%03n:%i> ", :PROMPT_I => "%N(%m):%03n> ",
:PROMPT_N => nil, :PROMPT_N => nil,
:PROMPT_S => nil, :PROMPT_S => nil,
:PROMPT_C => nil, :PROMPT_C => nil,

View File

@ -41,9 +41,9 @@ class IRB::RenderingTest < Yamatanooroti::TestCase
close close
assert_screen(<<~EOC) assert_screen(<<~EOC)
start IRB start IRB
irb(main):001:0> 'Hello, World!' irb(main):001> 'Hello, World!'
=> "Hello, World!" => "Hello, World!"
irb(main):002:0> irb(main):002>
EOC EOC
end end
@ -68,21 +68,21 @@ class IRB::RenderingTest < Yamatanooroti::TestCase
close close
assert_screen(<<~EOC) assert_screen(<<~EOC)
start IRB start IRB
irb(main):001:1* class A irb(main):001* class A
irb(main):002:1* def inspect; '#<A>'; end irb(main):002* def inspect; '#<A>'; end
irb(main):003:1* def a; self; end irb(main):003* def a; self; end
irb(main):004:1* def b; true; end irb(main):004* def b; true; end
irb(main):005:0> end irb(main):005> end
=> :b => :b
irb(main):006:0> irb(main):006>
irb(main):007:0> a = A.new irb(main):007> a = A.new
=> #<A> => #<A>
irb(main):008:0> irb(main):008>
irb(main):009:0> a irb(main):009> a
irb(main):010:0> .a irb(main):010> .a
irb(main):011:0> .b irb(main):011> .b
=> true => true
irb(main):012:0> irb(main):012>
EOC EOC
end end
@ -121,39 +121,39 @@ class IRB::RenderingTest < Yamatanooroti::TestCase
close close
assert_screen(<<~EOC) assert_screen(<<~EOC)
start IRB start IRB
irb(main):001:1* class A irb(main):001* class A
irb(main):002:1* def inspect; '#<A>'; end irb(main):002* def inspect; '#<A>'; end
irb(main):003:1* def b; self; end irb(main):003* def b; self; end
irb(main):004:1* def c; true; end irb(main):004* def c; true; end
irb(main):005:0> end irb(main):005> end
=> :c => :c
irb(main):006:0> irb(main):006>
irb(main):007:0> a = A.new irb(main):007> a = A.new
=> #<A> => #<A>
irb(main):008:0> irb(main):008>
irb(main):009:0> a irb(main):009> a
irb(main):010:0> .b irb(main):010> .b
irb(main):011:0> # aaa irb(main):011> # aaa
irb(main):012:0> .c irb(main):012> .c
=> true => true
irb(main):013:0> irb(main):013>
irb(main):014:0> (a) irb(main):014> (a)
irb(main):015:0> &.b() irb(main):015> &.b()
=> #<A> => #<A>
irb(main):016:0> irb(main):016>
irb(main):017:0> irb(main):017>
irb(main):018:0> class A def b; self; end; def c; true; end; end; irb(main):018> class A def b; self; end; def c; true; end; end;
irb(main):019:0> a = A.new irb(main):019> a = A.new
=> #<A> => #<A>
irb(main):020:0> a irb(main):020> a
irb(main):021:0> .b irb(main):021> .b
irb(main):022:0> # aaa irb(main):022> # aaa
irb(main):023:0> .c irb(main):023> .c
=> true => true
irb(main):024:0> (a) irb(main):024> (a)
irb(main):025:0> &.b() irb(main):025> &.b()
=> #<A> => #<A>
irb(main):026:0> irb(main):026>
EOC EOC
end end
@ -168,9 +168,9 @@ class IRB::RenderingTest < Yamatanooroti::TestCase
close close
assert_screen(<<~EOC) assert_screen(<<~EOC)
start IRB start IRB
irb(main):001:0> :` irb(main):001> :`
=> :` => :`
irb(main):002:0> irb(main):002>
EOC EOC
end end
@ -243,11 +243,11 @@ class IRB::RenderingTest < Yamatanooroti::TestCase
close close
assert_screen(<<~EOC) assert_screen(<<~EOC)
start IRB start IRB
irb(main):001:0> #{code} irb(main):001> #{code}
=> =>
[0, [0,
... ...
irb(main):002:0> irb(main):002>
EOC EOC
end end