irb-theme-rk2025 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce4447e376bb7ab8a4227ec50220cd19696d6ff10d148ac5c9a221a13a2c7d72
-  data.tar.gz: f596661156701fcd665d0e35f6d19f77cf016f810b462dc1f1d93d94bcc24d90
+  metadata.gz: 508b6c16e31f5488182ec2e0bf4f447a1786aa53481623df8c7eee08248cc746
+  data.tar.gz: 032671b0b2d4e369c15f07f640cd205b701e9edac287c1f33deeaff590e8d50d
 SHA512:
-  metadata.gz: 85044d05d327adc8192953816011b09bf1e77aa6d5cddc241c4fa8c26e920909fcae0b301e3efb6470d7dd9bed30a7d7378bc04d5bc58654a39a2c727e2ff049
-  data.tar.gz: 820e455b357ed85c540ac0df0cff8a180476841a24aeabea2e9a1a80840c90abf89aafa89604bb32697638938ebbb1aa675da9268e66a7c6139e8381ac55fd48
+  metadata.gz: 97ca9d0206e7b9ae4c9741c2e0da3d2c4a0fab18313b918597c02aba126d514aafb11c1b3943f1a19b453a86299b0c78c408ed0482bf491df2c2c676feb80665
+  data.tar.gz: efb29e9c18fa41606e5be83479a0ac50e39f2bb9863fea77089506dbbac33427051a968c6d4ee774bd85adf8f3fbcf49660535339a3b0b59d464b2cedfe77cc3

data/lib/irb/theme/rk2025.rb

@@ -35,31 +35,41 @@ module IRB2025Mikan
         output = +''
         background = color = nil
         x = 0
+        chars = line ? line.grapheme_clusters.flat_map { |c|
+          case Reline::Unicode.get_mbchar_width(c)
+          when 2
+            [[c, 2], :skip]
+          when 1
+            [[c, 1]]
+          else
+            []
+          end
+        } : []
         while x < @w do
           m = @masks[y][x] || 0
-          t = line&.[](x)
-          t = nil if t == ' '
-          if t
-            w = Reline::Unicode.get_mbchar_width(t)
-            line = "\0" + line if w == 2
-            tlen = w
+          c, cw = chars[x]
+          if c == :skip
+            x += 1
+            next
           end
-          c = @colors[y][x]
+          c = nil if c == ' '
+
+          col = @colors[y][x]
           bg = default_background
-          if t && x + tlen <= @w
-            bg = m == 0 ? default_background : c || default_background
-            c = text_color
-            x += tlen
+          if c && x + cw <= @w
+            bg = m == 0 ? default_background : col || default_background
+            col = text_color
+            x += cw
           else
             x += 1
           end
-          if color != c
-            output << "\e[38;5;#{color = c}m"
+          if color != col
+            output << "\e[38;5;#{color = col}m"
           end
           if background != bg
             output << "\e[48;5;#{background = bg}m"
           end
-          output << (t || CHARS[m])
+          output << (c || CHARS[m])
         end
         output << "\e[m"
         output_lines << output
@@ -93,34 +103,42 @@ module IRB2025Mikan
     end
   end
 
-  prev_color = nil
-  PARAMS = 100.times.map do |i|
-    bi = rand(0.02..0.05)
-    bo = rand(0.05..0.1)
-    bm = bo * rand(1.0..2.0)
-    color = prev_color
-    color = 16+36*5+6*rand(3..5)+rand(1..2) while color == prev_color
-    prev_color = color
-    {
-      cx: rand,
-      cy: 15 * i + rand(10),
-      segments: rand(7..9),
-      theta: 2 * Math::PI * rand,
-      rot: (0.2 + 0.4 * rand) * (rand > 0.5 ? 1 : -1),
-      bi:, bm:, bo:,
-      radius: rand(12..24),
-      color:
-    }
+  def self.params
+    prev_color = nil
+    @params ||= 100.times.map do |i|
+      bi = rand(0.02..0.05)
+      bo = rand(0.05..0.1)
+      bm = bo * rand(1.0..2.0)
+      color = prev_color
+      color = 16+36*5+6*rand(3..5)+rand(1..2) while color == prev_color
+      prev_color = color
+      {
+        cx: rand,
+        cy: 15 * i + rand(10),
+        segments: rand(7..9),
+        theta: 2 * Math::PI * rand,
+        rot: (0.2 + 0.4 * rand) * (rand > 0.5 ? 1 : -1),
+        bi:, bm:, bo:,
+        radius: rand(12..24),
+        color:
+      }
+    end
+  end
+
+  def self.reset_params
+    @params = nil
   end
 
   def self.start
     Reline::LineEditor.prepend Module.new {
       def colorize_completion_dialog
         dialog = @dialogs[0]
-        return unless dialog&.contents
+        unless dialog&.contents
+          IRB2025Mikan.reset_params
+          return
+        end
 
         canvas = Canvas.new(dialog.width, dialog.contents.size)
-        y = dialog.scroll_top
         face = Reline::Face[:completion_dialog]
         time = Time.now.to_f
         original_contents = dialog.contents.instance_eval { @original ||= dup }
@@ -129,11 +147,10 @@ module IRB2025Mikan
           line.gsub(/\e\[[\d;]*m/, '')
         end
         canvas.lines = uncolored_lines
-        t = Time.now.to_f
-        PARAMS.each do |param|
+        IRB2025Mikan.params.each do |param|
           param in { cx:, cy:, segments:, theta:, rot:, bo:, bi:, bm:, radius:, color: }
           cy = (cy - dialog.scroll_top) % 1500 - 100
-          theta += t * rot
+          theta += time * rot
           canvas.draw(5 + (canvas.w - 5)*cx, cy, radius+0.5, color){|x,y|
             z = x+y.i
             a = z.arg
@@ -172,4 +189,4 @@ module IRB2025Mikan
   end
 end
 
-IRB2025Mikan.start
+IRB2025Mikan.start

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: irb-theme-rk2025
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - tompng
 bindir: exe
 cert_chain: []
-date: 2025-03-08 00:00:00.000000000 Z
+date: 2025-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reline