fancy_buff 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 919af51ebb70ff27b989e17db097db51eaae6c588200d86cc081c5e2c1e8d523
-  data.tar.gz: '049b9b7c4233e5aee2e807e16e5027fd703da72b6683231e348645df141889ee'
+  metadata.gz: c8121c289daee5a5f2aabbcae53048661536428bfc90b8fbca1f49f2722dea5c
+  data.tar.gz: ce3507432e0816fb69634ec64086c03543ae79908ebd5aef7c3749119750cdb3
 SHA512:
-  metadata.gz: fcb544d92688baa82919afb8fafcbc7761bc83db052759a0b6d25f15532f3b0a5d23a93628aecc1882dfcbc3a856b38241e9c846d7edae3536a1629ad18513e3
-  data.tar.gz: 4aa39cc8ac44c11c0bc3b31bd9f9ba882611e752bed58248301cfec5e3ad85e71c85c1e88b1312beeed36552c9894980557c06a230b74768832729bc158860e8
+  metadata.gz: 39155c9822923ebf3a33f676a66eafcc86004d22c760f1d116e8da0c0f80de1c76119753374b7ec8a84933263da1a8c56b96741f8366bbcad86a629f21a2c9ff
+  data.tar.gz: 0171ca4fa6000da425da34143c1479352c6410e4ffb22ea676893858ac3ec1294ba8bf20491a70b8d76d3959b18e7201ae5d9968059b4e09fa2a1098b14f01f8

data/lib/fancy_buff.rb

@@ -59,14 +59,43 @@ class FancyBuff
 
     return [] if h == 0 || w == 0
 
+    line_no_width = @lines.length.to_s.length
     text = @formatter
       .format(@lexer.lex(@lines.join("\n")))
       .lines[r..(r + visible_lines - 1)]
-      .map.with_index{|row, i| "#{(i + r + 1).to_s.rjust(3)} #{row.chars[c..(c + w - 1 - 4)]&.join}" }
+      .map.with_index{|row, i| "#{(i + r + 1).to_s.rjust(line_no_width)} #{substr_with_color(row, c,  c + w - line_no_width - 2)}" }
       .map{|l| l.chomp + "\e[0K" } +
       Array.new(blank_lines) { "\e[0K" }
   end
 
+  # input - a String that may or may not contain ANSI color codes
+  # start - the starting index of printable characters to keep
+  # finish - the ending index of printable characters to keep
+  #
+  # treats `input' like a String that does
+  def substr_with_color(input, start, finish)
+    ansi_pattern = /\A\e\[[0-9;]+m/
+    printable_counter = 0
+    remaining = input.clone.chomp
+    result = ''
+
+    loop do
+      break if remaining.empty? || printable_counter > finish
+
+      match = remaining.match(ansi_pattern)
+      if match
+        result += match[0]
+        remaining = remaining.sub(match[0], '')
+      else
+        result += remaining[0] if printable_counter >= start
+        remaining = remaining[1..-1]
+        printable_counter += 1
+      end
+    end
+
+    result + "\e[0m"
+  end
+
   # the number of visible lines from @lines at any given time
   def visible_lines
     [h, @lines.length - r].min

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fancy_buff
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Jeff Lunt