diff options
author | aycabta <aycabta@gmail.com> | 2019-12-10 07:01:26 +0900 |
---|---|---|
committer | aycabta <aycabta@gmail.com> | 2019-12-10 07:07:43 +0900 |
commit | 6a22b2a091eda81a473eb1b0cc69fe0792560e27 (patch) | |
tree | af969234b7f36b066a916b083cb74fef8008b070 /lib | |
parent | 562fd754b55aaaf794fa8eb5461eb0ee87725464 (diff) | |
download | ruby-6a22b2a091eda81a473eb1b0cc69fe0792560e27.tar.gz |
Support completion with case-insensitive fashion
Reline performs completion in a case-insensitive fashon if
Readline.completion_case_fold or completion-ignore-case of .inputrc are set
"on".
Diffstat (limited to 'lib')
-rw-r--r-- | lib/reline.rb | 15 | ||||
-rw-r--r-- | lib/reline/line_editor.rb | 20 |
2 files changed, 26 insertions, 9 deletions
diff --git a/lib/reline.rb b/lib/reline.rb index 229c41a9a8..2036ec7024 100644 --- a/lib/reline.rb +++ b/lib/reline.rb @@ -32,10 +32,6 @@ module Reline dig_perfect_match_proc ).each(&method(:attr_reader)) - ATTR_ACCESSOR_NAMES = %i( - completion_case_fold - ).each(&method(:attr_accessor)) - attr_accessor :config attr_accessor :key_stroke attr_accessor :line_editor @@ -84,6 +80,14 @@ module Reline @special_prefixes = v.encode(Encoding::default_external) end + def completion_case_fold=(v) + @config.completion_ignore_case = v + end + + def completion_case_fold + @config.completion_ignore_case + end + def completion_proc=(p) raise ArgumentError unless p.respond_to?(:call) @completion_proc = p @@ -336,12 +340,13 @@ module Reline # Documented API #-------------------------------------------------------- - (Core::ATTR_READER_NAMES + Core::ATTR_ACCESSOR_NAMES).each { |name| + (Core::ATTR_READER_NAMES).each { |name| def_single_delegators :core, "#{name}", "#{name}=" } def_single_delegators :core, :input=, :output= def_single_delegators :core, :vi_editing_mode, :emacs_editing_mode def_single_delegators :core, :readline + def_single_delegators :core, :completion_case_fold, :completion_case_fold= def_instance_delegators self, :readline private :readline diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb index e352f8881c..2986bdd154 100644 --- a/lib/reline/line_editor.rb +++ b/lib/reline/line_editor.rb @@ -552,7 +552,11 @@ class Reline::LineEditor if i and not Encoding.compatible?(target.encoding, i.encoding) raise Encoding::CompatibilityError end - i&.start_with?(target) + if @config.completion_ignore_case + i&.downcase.start_with?(target.downcase) + else + i&.start_with?(target) + end } if is_menu menu(target, list) @@ -569,10 +573,18 @@ class Reline::LineEditor size = [memo_mbchars.size, item_mbchars.size].min result = '' size.times do |i| - if memo_mbchars[i] == item_mbchars[i] - result << memo_mbchars[i] + if @config.completion_ignore_case + if memo_mbchars[i].casecmp?(item_mbchars[i]) + result << memo_mbchars[i] + else + break + end else - break + if memo_mbchars[i] == item_mbchars[i] + result << memo_mbchars[i] + else + break + end end end result |