diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-07-06 12:31:11 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-07-06 12:31:11 +0900 |
| commit | 688cef2169a438c1402a8870887a6406f29a824b (patch) | |
| tree | f8d32b1a1ce0c35be9504dd76862a44f2d744468 | |
| parent | 44aae5fee666e6767415c214e25e90f6ad565550 (diff) | |
| download | ruby-688cef2169a438c1402a8870887a6406f29a824b.tar.gz | |
Refactored width calculations
| -rw-r--r-- | lib/reline/line_editor.rb | 64 |
1 files changed, 21 insertions, 43 deletions
diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb index 6bcfb4b5cc..f4b72cdd8d 100644 --- a/lib/reline/line_editor.rb +++ b/lib/reline/line_editor.rb @@ -53,6 +53,7 @@ class Reline::LineEditor OSC_REGEXP = /\e\]\d+(?:;[^;]+)*\a/ NON_PRINTING_START = "\1" NON_PRINTING_END = "\2" + WIDTH_SCANNER = /\G(?:#{NON_PRINTING_START}|#{NON_PRINTING_END}|#{CSI_REGEXP}|#{OSC_REGEXP}|\X)/ def initialize(config) @config = config @@ -145,35 +146,23 @@ class Reline::LineEditor width = 0 rest = "#{prompt}#{str}".encode(Encoding::UTF_8) in_zero_width = false - loop do - break if rest.empty? - if rest.start_with?(NON_PRINTING_START) - rest.delete_prefix!(NON_PRINTING_START) + rest.scan(WIDTH_SCANNER) do |gc| + case gc + when NON_PRINTING_START in_zero_width = true - elsif rest.start_with?(NON_PRINTING_END) - rest.delete_prefix!(NON_PRINTING_END) + when NON_PRINTING_END in_zero_width = false - elsif rest.start_with?(CSI_REGEXP) - lines.last << $& - rest = $' - elsif rest.start_with?(OSC_REGEXP) - lines.last << $& - rest = $' + when CSI_REGEXP, OSC_REGEXP + lines.last << gc else - gcs = rest.grapheme_clusters - gc = gcs.first - rest = gcs[1..-1].join - if in_zero_width - mbchar_width = 0 - else + unless in_zero_width mbchar_width = Reline::Unicode.get_mbchar_width(gc) - end - width += mbchar_width - if width > max_width - width = mbchar_width - lines << nil - lines << String.new(encoding: @encoding) - height += 1 + if (width += mbchar_width) > max_width + width = mbchar_width + lines << nil + lines << String.new(encoding: @encoding) + height += 1 + end end lines.last << gc end @@ -955,28 +944,17 @@ class Reline::LineEditor width = 0 rest = str.encode(Encoding::UTF_8) in_zero_width = false - loop do - break if rest.empty? - if rest.start_with?(NON_PRINTING_START) - rest.delete_prefix!(NON_PRINTING_START) + rest.scan(WIDTH_SCANNER) do |gc| + case gc + when NON_PRINTING_START in_zero_width = true - elsif rest.start_with?(NON_PRINTING_END) - rest.delete_prefix!(NON_PRINTING_END) + when NON_PRINTING_END in_zero_width = false - elsif rest.start_with?(CSI_REGEXP) - rest = $' - elsif rest.start_with?(OSC_REGEXP) - rest = $' + when CSI_REGEXP, OSC_REGEXP else - gcs = rest.grapheme_clusters - gc = gcs.first - rest = gcs[1..-1].join - if in_zero_width - mbchar_width = 0 - else - mbchar_width = Reline::Unicode.get_mbchar_width(gc) + unless in_zero_width + width += Reline::Unicode.get_mbchar_width(gc) end - width += mbchar_width end end width |