Permalink
Browse files

* lib/irb/completion.rb (IRB::InputCompletor::CompletionProc):

  ignore non-string name modules.  [ruby-core:42244][Bug #5938]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 0c5cfb6 commit ef72bdf2deda76ca8a537d3eeaa9c3f2111017de @nobu nobu committed Jan 27, 2012
Showing with 28 additions and 2 deletions.
  1. +5 −0 ChangeLog
  2. +6 −2 lib/irb/completion.rb
  3. +17 −0 test/irb/test_completion.rb
View
@@ -1,3 +1,8 @@
+Sat Jan 28 05:53:34 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/irb/completion.rb (IRB::InputCompletor::CompletionProc):
+ ignore non-string name modules. [ruby-core:42244][Bug #5938]
+
Fri Jan 27 16:31:45 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* gc.c (HEAP_ALIGN, HEAP_ALIGN_MASK): DRY, let compiler calculate
View
@@ -178,8 +178,12 @@ module InputCompletor
rescue Exception
name = ""
end
- next if name != "IRB::Context" and
- /^(IRB|SLex|RubyLex|RubyToken)/ =~ name
+ begin
+ next if name != "IRB::Context" and
+ /^(IRB|SLex|RubyLex|RubyToken)/ =~ name
+ rescue Exception
+ next
+ end
candidates.concat m.instance_methods(false).collect{|x| x.to_s}
}
candidates.sort!
@@ -0,0 +1,17 @@
+require 'test/unit'
+require_relative '../ruby/envutil'
+
+module TestIRB
+ class TestCompletion < Test::Unit::TestCase
+ def test_nonstring_module_name
+ bug5938 = '[ruby-core:42244]'
+ cmds = %W[-rirb -rirb/completion -e IRB.setup(__FILE__)
+ -e IRB.conf[:MAIN_CONTEXT]=IRB::Irb.new.context
+ -e module\sFoo;def\sself.name;//;end;end
+ -e IRB::InputCompletor::CompletionProc.call("[1].first.")
+ -- -f --]
+ status = assert_in_out_err(cmds, "", //, [], bug5938)
+ assert(status.success?, bug5938)
+ end
+ end
+end

0 comments on commit ef72bdf

Please sign in to comment.