reline 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24b02f1563ed151bd0b67246977442d845c887048264399384dddf506b4d6de2
-  data.tar.gz: 3d51b1b162709f7d378e782a4f28b6b1e99b0fe3fa8929846481c4c6ab9dae5e
+  metadata.gz: 5fbe3e08832a8893e51895e3efe21ff3e728414d85ae95d62f2c854c1608f966
+  data.tar.gz: 8a0af70e8ce6cf9454fdb40070a405e53e0d2afcad9b4ad87345e2d5092662e6
 SHA512:
-  metadata.gz: 0a467797d4c4191c3b9949b5048fc3cadae9e837bdf086565e51206f7d6786774ae13b6081f6e418fdf4ee62c82d02e369d50a4cca9955918ebfb682d5875a7d
-  data.tar.gz: 65e0a409b22c3f5ebeb8bd3b068168bdabac6cda5d0b8b7d6d07dacbe90265055a7eeb24f433a455b9bd6ca06dbe3f9d2018987ea1a098dedc96d6a6eb16430c
+  metadata.gz: 1b480360a8dde5c140028bcaa408cdcd08469499ee331fd7441ffb7f63a9dda835e395ffc7b95b9c78fe3ad3209190deac1639f47c8973e2c1839a73d386201b
+  data.tar.gz: df35e1166aaec1003a40abb889d5c7a9268bd59293dcd3a1910dd2b5aa36177ba4b03c93aae746c7066c4b267115d621f8c8510b4a40871f27a7c96e1e384581

data/lib/reline/face.rb

@@ -74,6 +74,13 @@ class Reline::Face
       @definition[name] = values
     end
 
+    def reconfigure
+      @definition.each_value do |values|
+        values.delete(:escape_sequence)
+        values[:escape_sequence] = format_to_sgr(values.to_a).freeze
+      end
+    end
+
     def [](name)
       @definition.dig(name, :escape_sequence) or raise ArgumentError, "unknown face: #{name}"
     end
@@ -82,6 +89,14 @@ class Reline::Face
 
     def sgr_rgb(key, value)
       return nil unless rgb_expression?(value)
+      if Reline::Face.truecolor?
+        sgr_rgb_truecolor(key, value)
+      else
+        sgr_rgb_256color(key, value)
+      end
+    end
+
+    def sgr_rgb_truecolor(key, value)
       case key
       when :foreground
         "38;2;"
@@ -90,6 +105,24 @@ class Reline::Face
       end + value[1, 6].scan(/../).map(&:hex).join(";")
     end
 
+    def sgr_rgb_256color(key, value)
+      # 256 colors are
+      # 0..15: standard colors, hight intensity colors
+      # 16..232: 216 colors (R, G, B each 6 steps)
+      # 233..255: grayscale colors (24 steps)
+      # This methods converts rgb_expression to 216 colors
+      rgb = value[1, 6].scan(/../).map(&:hex)
+      # Color steps are [0, 95, 135, 175, 215, 255]
+      r, g, b = rgb.map { |v| v <= 95 ? v / 48 : (v - 35) / 40 }
+      color = (16 + 36 * r + 6 * g + b)
+      case key
+      when :foreground
+        "38;5;#{color}"
+      when :background
+        "48;5;#{color}"
+      end
+    end
+
     def format_to_sgr(ordered_values)
       sgr = "\e[" + ordered_values.map do |key_value|
         key, value = key_value
@@ -124,6 +157,15 @@ class Reline::Face
 
   private_constant :SGR_PARAMETERS, :Config
 
+  def self.truecolor?
+    @force_truecolor || %w[truecolor 24bit].include?(ENV['COLORTERM'])
+  end
+
+  def self.force_truecolor
+    @force_truecolor = true
+    @configs&.each_value(&:reconfigure)
+  end
+
   def self.[](name)
     @configs[name]
   end

data/lib/reline/kill_ring.rb

@@ -14,7 +14,7 @@ class Reline::KillRing
     end
 
     def ==(other)
-      object_id == other.object_id
+      equal?(other)
     end
   end
 

data/lib/reline/line_editor.rb

@@ -1313,7 +1313,7 @@ class Reline::LineEditor
       end
       if not just_show_list and target < completed
         @line = (preposing + completed + completion_append_character.to_s + postposing).split("\n")[@line_index] || String.new(encoding: @encoding)
-        line_to_pointer = (preposing + completed + completion_append_character.to_s).split("\n").last || String.new(encoding: @encoding)
+        line_to_pointer = (preposing + completed + completion_append_character.to_s).split("\n")[@line_index] || String.new(encoding: @encoding)
         @cursor_max = calculate_width(@line)
         @cursor = calculate_width(line_to_pointer)
         @byte_pointer = line_to_pointer.bytesize
@@ -1360,7 +1360,7 @@ class Reline::LineEditor
     completed = @completion_journey_data.list[@completion_journey_data.pointer]
     new_line = (@completion_journey_data.preposing + completed + @completion_journey_data.postposing).split("\n")[@line_index]
     @line = new_line.nil? ? String.new(encoding: @encoding) : new_line
-    line_to_pointer = (@completion_journey_data.preposing + completed).split("\n").last
+    line_to_pointer = (@completion_journey_data.preposing + completed).split("\n")[@line_index]
     line_to_pointer = String.new(encoding: @encoding) if line_to_pointer.nil?
     @cursor_max = calculate_width(@line)
     @cursor = calculate_width(line_to_pointer)

data/lib/reline/version.rb

@@ -1,3 +1,3 @@
 module Reline
-  VERSION = '0.4.0'
+  VERSION = '0.4.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reline
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - aycabta
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-07 00:00:00.000000000 Z
+date: 2024-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: io-console
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.0.dev
+rubygems_version: 3.5.1
 signing_key:
 specification_version: 4
 summary: Alternative GNU Readline or Editline implementation by pure Ruby.