diff options
| -rw-r--r-- | lib/irb.rb | 206 | ||||
| -rw-r--r-- | lib/irb/init.rb | 36 | ||||
| -rw-r--r-- | test/irb/test_cmd.rb | 8 |
3 files changed, 119 insertions, 131 deletions
diff --git a/lib/irb.rb b/lib/irb.rb index 9d0588d016..d0688e6f9f 100644 --- a/lib/irb.rb +++ b/lib/irb.rb @@ -367,24 +367,6 @@ module IRB # An exception raised by IRB.irb_abort class Abort < Exception;end - @CONF = {} - # Displays current configuration. - # - # Modifying the configuration is achieved by sending a message to IRB.conf. - # - # See IRB@Configuration for more information. - def IRB.conf - @CONF - end - - # Returns the current version of IRB, including release version and last - # updated date. - def IRB.version - if v = @CONF[:VERSION] then return v end - - @CONF[:VERSION] = format("irb %s (%s)", @RELEASE_VERSION, @LAST_UPDATE_DATE) - end - # The current IRB::Context of the session, see IRB.conf # # irb @@ -431,6 +413,11 @@ module IRB PROMPT_MAIN_TRUNCATE_OMISSION = '...'.freeze CONTROL_CHARACTERS_PATTERN = "\x00-\x1F".freeze + # Returns the current context of this irb session + attr_reader :context + # The lexer used by this irb session + attr_accessor :scanner + # Creates a new irb session def initialize(workspace = nil, input_method = nil) @context = Context.new(self, workspace, input_method) @@ -509,41 +496,6 @@ module IRB end end - # Returns the current context of this irb session - attr_reader :context - # The lexer used by this irb session - attr_accessor :scanner - - private def generate_prompt(opens, continue, line_offset) - ltype = @scanner.ltype_from_open_tokens(opens) - indent = @scanner.calc_indent_level(opens) - continue = opens.any? || continue - line_no = @line_no + line_offset - - if ltype - f = @context.prompt_s - elsif continue - f = @context.prompt_c - else - f = @context.prompt_i - end - f = "" unless f - if @context.prompting? - p = format_prompt(f, ltype, indent, line_no) - else - p = "" - end - if @context.auto_indent_mode and !@context.io.respond_to?(:auto_indent) - unless ltype - prompt_i = @context.prompt_i.nil? ? "" : @context.prompt_i - ind = format_prompt(prompt_i, ltype, indent, line_no)[/.*\z/].size + - indent * 2 - p.size - p += " " * ind if ind > 0 - end - end - p - end - # Evaluates input for this session. def eval_input configure_io @@ -835,16 +787,6 @@ module IRB end end - # Evaluates the given block using the given +context+ as the Context. - def suspend_context(context) - @context, back_context = context, @context - begin - yield back_context - ensure - @context = back_context - end - end - # Handler for the signal SIGINT, see Kernel#trap for more information. def signal_handle unless @context.ignore_sigint? @@ -880,52 +822,6 @@ module IRB end end - private def truncate_prompt_main(str) # :nodoc: - str = str.tr(CONTROL_CHARACTERS_PATTERN, ' ') - if str.size <= PROMPT_MAIN_TRUNCATE_LENGTH - str - else - str[0, PROMPT_MAIN_TRUNCATE_LENGTH - PROMPT_MAIN_TRUNCATE_OMISSION.size] + PROMPT_MAIN_TRUNCATE_OMISSION - end - end - - private def format_prompt(format, ltype, indent, line_no) # :nodoc: - format.gsub(/%([0-9]+)?([a-zA-Z])/) do - case $2 - when "N" - @context.irb_name - when "m" - truncate_prompt_main(@context.main.to_s) - when "M" - truncate_prompt_main(@context.main.inspect) - when "l" - ltype - when "i" - if indent < 0 - if $1 - "-".rjust($1.to_i) - else - "-" - end - else - if $1 - format("%" + $1 + "d", indent) - else - indent.to_s - end - end - when "n" - if $1 - format("%" + $1 + "d", line_no) - else - line_no.to_s - end - when "%" - "%" - end - end - end - def output_value(omit = false) # :nodoc: str = @context.inspect_last_value multiline_p = str.include?("\n") @@ -978,28 +874,84 @@ module IRB end format("#<%s: %s>", self.class, ary.join(", ")) end - end - def @CONF.inspect - IRB.version unless self[:VERSION] - - array = [] - for k, v in sort{|a1, a2| a1[0].id2name <=> a2[0].id2name} - case k - when :MAIN_CONTEXT, :__TMP__EHV__ - array.push format("CONF[:%s]=...myself...", k.id2name) - when :PROMPT - s = v.collect{ - |kk, vv| - ss = vv.collect{|kkk, vvv| ":#{kkk.id2name}=>#{vvv.inspect}"} - format(":%s=>{%s}", kk.id2name, ss.join(", ")) - } - array.push format("CONF[:%s]={%s}", k.id2name, s.join(", ")) + private + + def generate_prompt(opens, continue, line_offset) + ltype = @scanner.ltype_from_open_tokens(opens) + indent = @scanner.calc_indent_level(opens) + continue = opens.any? || continue + line_no = @line_no + line_offset + + if ltype + f = @context.prompt_s + elsif continue + f = @context.prompt_c else - array.push format("CONF[:%s]=%s", k.id2name, v.inspect) + f = @context.prompt_i + end + f = "" unless f + if @context.prompting? + p = format_prompt(f, ltype, indent, line_no) + else + p = "" + end + if @context.auto_indent_mode and !@context.io.respond_to?(:auto_indent) + unless ltype + prompt_i = @context.prompt_i.nil? ? "" : @context.prompt_i + ind = format_prompt(prompt_i, ltype, indent, line_no)[/.*\z/].size + + indent * 2 - p.size + p += " " * ind if ind > 0 + end + end + p + end + + def truncate_prompt_main(str) # :nodoc: + str = str.tr(CONTROL_CHARACTERS_PATTERN, ' ') + if str.size <= PROMPT_MAIN_TRUNCATE_LENGTH + str + else + str[0, PROMPT_MAIN_TRUNCATE_LENGTH - PROMPT_MAIN_TRUNCATE_OMISSION.size] + PROMPT_MAIN_TRUNCATE_OMISSION + end + end + + def format_prompt(format, ltype, indent, line_no) # :nodoc: + format.gsub(/%([0-9]+)?([a-zA-Z])/) do + case $2 + when "N" + @context.irb_name + when "m" + truncate_prompt_main(@context.main.to_s) + when "M" + truncate_prompt_main(@context.main.inspect) + when "l" + ltype + when "i" + if indent < 0 + if $1 + "-".rjust($1.to_i) + else + "-" + end + else + if $1 + format("%" + $1 + "d", indent) + else + indent.to_s + end + end + when "n" + if $1 + format("%" + $1 + "d", line_no) + else + line_no.to_s + end + when "%" + "%" + end end end - array.join("\n") end end diff --git a/lib/irb/init.rb b/lib/irb/init.rb index d1097b5738..d9549420b4 100644 --- a/lib/irb/init.rb +++ b/lib/irb/init.rb @@ -5,6 +5,41 @@ # module IRB # :nodoc: + @CONF = {} + # Displays current configuration. + # + # Modifying the configuration is achieved by sending a message to IRB.conf. + # + # See IRB@Configuration for more information. + def IRB.conf + @CONF + end + + def @CONF.inspect + array = [] + for k, v in sort{|a1, a2| a1[0].id2name <=> a2[0].id2name} + case k + when :MAIN_CONTEXT, :__TMP__EHV__ + array.push format("CONF[:%s]=...myself...", k.id2name) + when :PROMPT + s = v.collect{ + |kk, vv| + ss = vv.collect{|kkk, vvv| ":#{kkk.id2name}=>#{vvv.inspect}"} + format(":%s=>{%s}", kk.id2name, ss.join(", ")) + } + array.push format("CONF[:%s]={%s}", k.id2name, s.join(", ")) + else + array.push format("CONF[:%s]=%s", k.id2name, v.inspect) + end + end + array.join("\n") + end + + # Returns the current version of IRB, including release version and last + # updated date. + def IRB.version + format("irb %s (%s)", @RELEASE_VERSION, @LAST_UPDATE_DATE) + end # initialize config def IRB.setup(ap_path, argv: ::ARGV) @@ -28,6 +63,7 @@ module IRB # :nodoc: unless ap_path and @CONF[:AP_NAME] ap_path = File.join(File.dirname(File.dirname(__FILE__)), "irb.rb") end + @CONF[:VERSION] = version @CONF[:AP_NAME] = File::basename(ap_path, ".rb") @CONF[:IRB_NAME] = "irb" diff --git a/test/irb/test_cmd.rb b/test/irb/test_cmd.rb index fd0a02a7af..67dcfd0a63 100644 --- a/test/irb/test_cmd.rb +++ b/test/irb/test_cmd.rb @@ -453,7 +453,7 @@ module TestIRB "show_source IRB.conf\n", ) assert_empty err - assert_match(%r[/irb\.rb], out) + assert_match(%r[/irb\/init\.rb], out) end def test_show_source_method @@ -461,7 +461,7 @@ module TestIRB "p show_source('IRB.conf')\n", ) assert_empty err - assert_match(%r[/irb\.rb], out) + assert_match(%r[/irb\/init\.rb], out) end def test_show_source_string @@ -469,7 +469,7 @@ module TestIRB "show_source 'IRB.conf'\n", ) assert_empty err - assert_match(%r[/irb\.rb], out) + assert_match(%r[/irb\/init\.rb], out) end def test_show_source_alias @@ -478,7 +478,7 @@ module TestIRB conf: { COMMAND_ALIASES: { :'$' => :show_source } } ) assert_empty err - assert_match(%r[/irb\.rb], out) + assert_match(%r[/irb\/init\.rb], out) end def test_show_source_end_finder |