fancy_buff 2.4.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 892b50af936bb97a23a873b029d23410320cde8ecfbee5952ca6693f1b2f6e5c
-  data.tar.gz: cd5c61bd3f0be2e4463686d0e72fd6594aa362048dfea27423bef03c7a6c46a9
+  metadata.gz: 195debbfecfec78a6e9efe04ca6b0cb0dcb828f3cc0f9a957f8342422f00c925
+  data.tar.gz: 0e2b2635f5330e5b7dd08a1135a0810d1e38d6695d289598826b0618798303ea
 SHA512:
-  metadata.gz: 68953497b15fc893d68b270dde92799394fbeff68b2f39ce500e90a1a212fcafa0c29c69250bd7242a771901b5467a97535c0339f8e5fb9005688791892d0a30
-  data.tar.gz: 0d2b82addc499d165882758b688868495003572975227d3f8a8a9602ea51ff9c5722ef3e5a33714ff629305b8b6efbd7a1bcc87edefcb703ff9ed53a0c8eb7c4
+  metadata.gz: 6b5cef70ff2eee10fd6f7cd33af401b36fcf7478f5493795fd694c6446b0a52d5f7a598bc112b83711204ab0c835d91d1b2b6535a3320f91228a7d6848c2e6de
+  data.tar.gz: 90ad2a3a7148f2669a7b1274d482ca08bd17d7068622ebc19aaf6d827c283b18c7da6fe217aba91e0c501e0419f8b49099bbfdffa1ef920d6abe11fee5342fac

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,11 +18,14 @@ 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
@@ -31,16 +33,23 @@ class FancyBuff
 
     @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
+
+    adjust_caret!
   end
 
   # index of first visible column
   def c
+    @win[0]
+  end
+
+  # index of first visible row
+  def r
     @win[1]
   end
 
@@ -54,14 +63,83 @@ class FancyBuff
     @win[3]
   end
 
+  def adjust_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 adjust_win!
+    cx, cy = visual_caret
+    wx, wy = @win[0], @win[1]
+
+    new_wx = if cx > (c + w - 1)
+               wx + 1
+             elsif cx < 0
+               wx - 1
+             else
+               wx
+             end
+
+    new_wy = if cy > (r + h - 1)
+               wy + 1
+             elsif cy < 0
+               wy - 1
+             else
+               wy
+             end
+
+    @win[0] = wx
+    @win[1] = wy
+  end
+
+  def caret_down!
+    @caret[1] = [caret[1] + 1, @lines.length - 1].min
+    adjust_win!
+  end
+
+  def caret_up!
+    @caret[1] = [caret[1] - 1, 0].max
+    adjust_win!
+  end
+
+  def caret_left!
+    @caret[0] = [caret[0] - 1, 0].max
+    adjust_win!
+  end
+
+  def caret_right!
+    @caret[0] = [caret[0] + 1, @lines[caret[1]].length - 1].min
+    adjust_win!
+  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
   # 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
+    @line_no_width = @lines.length.to_s.length
     if @edited_since_last_render
       @rendered_lines = @formatter
         .format(@lexer.lex(@lines.join("\n")))
@@ -74,7 +152,7 @@ class FancyBuff
     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.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
@@ -118,23 +196,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
+    adjust_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
+    adjust_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
+    adjust_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
+    adjust_caret!
   end
 
   # set a mark, as in the Vim sense

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fancy_buff
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 3.1.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: []