fancy_buff 2.3.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8121c289daee5a5f2aabbcae53048661536428bfc90b8fbca1f49f2722dea5c
-  data.tar.gz: ce3507432e0816fb69634ec64086c03543ae79908ebd5aef7c3749119750cdb3
+  metadata.gz: 24ca22ff6ce4b91274d9158e71ddb51dbf78ed644bdc4eb0affc665e8fc7b9a9
+  data.tar.gz: 8027d3a0e02558e96a7f12c4746b6f9b9ca8b3e896c121d64fb1e841e08da65a
 SHA512:
-  metadata.gz: 39155c9822923ebf3a33f676a66eafcc86004d22c760f1d116e8da0c0f80de1c76119753374b7ec8a84933263da1a8c56b96741f8366bbcad86a629f21a2c9ff
-  data.tar.gz: 0171ca4fa6000da425da34143c1479352c6410e4ffb22ea676893858ac3ec1294ba8bf20491a70b8d76d3959b18e7201ae5d9968059b4e09fa2a1098b14f01f8
+  metadata.gz: 7c9f91c3e37fded5bb22351c276a47d2d0baa03e516d1eaa7bbc1ebe1ae85b48e00610e7ef3c75d04ffa11d5907bf7e1fcfc82be1d34b3bca987a55dd93c8340
+  data.tar.gz: c707b62adb80e8506aaaf03d67eb7913caeb98ca03faa8cd9a6839e9b8dabf7d70fa9e83d2b6d6a736195bf26ff81ff2d1b3d9f35df0dfd3d5902c625fca29e1

data/lib/fancy_buff.rb

@@ -4,14 +4,13 @@ class FancyBuff
               :bytes,
               :lines,
               :length,
+              :line_no_width,
               :max_char_width,
+              :win,
+              :caret,
               :marks,
               :selections
 
-  # allows the consuming application to set the window size, since that
-  # application is probably mananging the other buffers in use
-  attr_accessor :win
-
   # gives you a default, empty, zero slice
   #
   # formatter - a Rouge formatter
@@ -19,26 +18,66 @@ class FancyBuff
   def initialize(formatter, lexer)
     @formatter = formatter
     @lexer = lexer
+    @win = [0, 0, 0, 0]    # the default slice is at the beginning of the buffer, and has a zero size
+    @caret = [c, r]
 
     # size tracking
     @chars = 0        # the number of characters in the buffer (not the same as the number of bytes)
     @bytes = 0        # the number of bytes in the buffer (not the same as the number of characters)
     @lines = []
+    @line_no_width = 1
+    @rendered_lines = [] # fully formatted, syntax highlighted, and transformed
+    @edited_since_last_render = true
     @max_char_width = 0
     @all_buff = @lines.join("\n")
 
     @marks = {}
     @selections = {}
-    @win = [0, 0, 0, 0]    # the default slice is at the beginning of the buffer, and has a zero size
   end
 
-  # index of first visible row
-  def r
-    @win[0]
+  # move the window coordinates, and possibly the caret as well, if moving the
+  # window would cause the caret to be out-of-bounds
+  def win=(coords)
+    @win = coords
+
+    reset_caret!
+  end
+
+  def reset_caret!
+    cx, cy = @caret
+    new_cx = if cx < c
+               c
+             elsif cx > c + w
+               w
+             else
+               cx
+             end
+
+    new_cy = if cy < r
+               r
+             elsif cy > (r + h - 1)
+               r + h - 1
+             else
+               cy
+             end
+
+    @caret = [new_cx, new_cy]
+  end
+
+  def visual_caret
+    [
+      caret[0] - c + line_no_width + 1, # '+ 1' is to account for a space between line numbers and caret
+      caret[1] - r
+    ]
   end
 
   # index of first visible column
   def c
+    @win[0]
+  end
+
+  # index of first visible row
+  def r
     @win[1]
   end
 
@@ -55,16 +94,23 @@ class FancyBuff
   # returns an array of strings representing the visible characters from this
   # FancyBuffer's @rect
   def win_s
-    r, c, w, h = @win
-
     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(line_no_width)} #{substr_with_color(row, c,  c + w - line_no_width - 2)}" }
-      .map{|l| l.chomp + "\e[0K" } +
+    @line_no_width = @lines.length.to_s.length
+    if @edited_since_last_render
+      @rendered_lines = @formatter
+        .format(@lexer.lex(@lines.join("\n")))
+        .lines
+        .map(&:chomp)
+
+      @edited_since_last_render = false
+    else
+      @rendered_lines[r..(r + visible_lines - 1)]
+    end
+
+    @rendered_lines[r..(r + visible_lines - 1)]
+      .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}\e[0K" } +
       Array.new(blank_lines) { "\e[0K" }
   end
 
@@ -107,23 +153,27 @@ class FancyBuff
   end
 
   # scrolls the visible window up
-  def win_up(n=1)
-    @win[0] = [@win[0] - n, 0].max
+  def win_up!(n=1)
+    @win[1] = [@win[1] - n, 0].max
+    reset_caret!
   end
 
   # scrolls the visible window down
-  def win_down(n=1)
-    @win[0] = [@win[0] + n, @lines.length - 1].min
+  def win_down!(n=1)
+    @win[1] = [@win[1] + n, @lines.length - 1].min
+    reset_caret!
   end
 
   # scrolls the visible window left
-  def win_left(n=1)
-    @win[1] = [@win[1] - n, 0].max
+  def win_left!(n=1)
+    @win[0] = [@win[0] - n, 0].max
+    reset_caret!
   end
 
   # scrolls the visible window right
-  def win_right(n=1)
-    @win[1] = [@win[1] + n, max_char_width - 1].min
+  def win_right!(n=1)
+    @win[0] = [@win[0] + n, max_char_width - 1].min
+    reset_caret!
   end
 
   # set a mark, as in the Vim sense
@@ -178,6 +228,7 @@ class FancyBuff
     @chars += line.chars.length
     @max_char_width = line.chars.length if line.chars.length > @max_char_width
 
+    @edited_since_last_render = true
     nil
   end
 #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fancy_buff
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Jeff Lunt
@@ -28,16 +28,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.18'
 description: a text buffer with marks, selections, and simple insert/delete
 email: jefflunt@gmail.com
 executables: []