kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Refactored width calculations

Browse source
This commit is contained in:
Nobuyoshi Nakada 2019-07-06 12:31:11 +09:00
parent 44aae5fee6
commit 688cef2169
No known key found for this signature in database
GPG key ID: 4BC7D6DF58D8DF60
1 changed files with 21 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
lib/reline/line_editor.rb
View file

@ -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