From 301f92fe720d39a53c7cb22a31ab947cb1267afb Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 11 Aug 2011 00:38:36 +0000 Subject: merges r32295 from trunk into ruby_1_9_2. -- * lib/irb/completion.rb: complate correctry string literal. fix [Bug #1145]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32919 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/irb/completion.rb | 11 ++++++++++- version.h | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f916c6a777..4af4c769f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Jun 30 00:03:20 2011 Keiju Ishitsuka + + * lib/irb/completion.rb: complate correctry string literal. fix + [Bug #1145]. + Wed Jun 29 23:17:57 2011 WATANABE Hirofumi * ext/openssl/ossl.h (OPENSSL_SYS_WIN32): support for mingw(msys). diff --git a/lib/irb/completion.rb b/lib/irb/completion.rb index e059bc4055..adc41ecea5 100644 --- a/lib/irb/completion.rb +++ b/lib/irb/completion.rb @@ -39,6 +39,14 @@ module IRB # puts "input: #{input}" case input + when /^((["'`]).*\2)\.([^.]*)$/ + # String + receiver = $1 + message = $3 + + candidates = String.instance_methods.collect{|m| m.to_s} + select_message(receiver, message, candidates) + when /^(\/[^\/]*\/)\.([^.]*)$/ # Regexp receiver = $1 @@ -201,7 +209,8 @@ module IRB end if Readline.respond_to?("basic_word_break_characters=") - Readline.basic_word_break_characters= " \t\n\"\\'`><=;|&{(" +# Readline.basic_word_break_characters= " \t\n\"\\'`><=;|&{(" + Readline.basic_word_break_characters= " \t\n`><=;|&{(" end Readline.completion_append_character = nil Readline.completion_proc = IRB::InputCompletor::CompletionProc diff --git a/version.h b/version.h index 3e2bb97dd5..748ba34c8c 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 304 +#define RUBY_PATCHLEVEL 305 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit v1.2.3