summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-11 00:38:36 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-11 00:38:36 +0000
commit301f92fe720d39a53c7cb22a31ab947cb1267afb (patch)
tree93e546d50dc91b3eeeaaddd1580396a91b0a557c
parenta0948d8334936d086e6af4157674f90dedf35296 (diff)
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
-rw-r--r--ChangeLog5
-rw-r--r--lib/irb/completion.rb11
-rw-r--r--version.h2
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 <keiju@ishitsuka.com>
+
+ * lib/irb/completion.rb: complate correctry string literal. fix
+ [Bug #1145].
+
Wed Jun 29 23:17:57 2011 WATANABE Hirofumi <eban@ruby-lang.org>
* 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