fancy_buff 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24ca22ff6ce4b91274d9158e71ddb51dbf78ed644bdc4eb0affc665e8fc7b9a9
-  data.tar.gz: 8027d3a0e02558e96a7f12c4746b6f9b9ca8b3e896c121d64fb1e841e08da65a
+  metadata.gz: 195debbfecfec78a6e9efe04ca6b0cb0dcb828f3cc0f9a957f8342422f00c925
+  data.tar.gz: 0e2b2635f5330e5b7dd08a1135a0810d1e38d6695d289598826b0618798303ea
 SHA512:
-  metadata.gz: 7c9f91c3e37fded5bb22351c276a47d2d0baa03e516d1eaa7bbc1ebe1ae85b48e00610e7ef3c75d04ffa11d5907bf7e1fcfc82be1d34b3bca987a55dd93c8340
-  data.tar.gz: c707b62adb80e8506aaaf03d67eb7913caeb98ca03faa8cd9a6839e9b8dabf7d70fa9e83d2b6d6a736195bf26ff81ff2d1b3d9f35df0dfd3d5902c625fca29e1
+  metadata.gz: 6b5cef70ff2eee10fd6f7cd33af401b36fcf7478f5493795fd694c6446b0a52d5f7a598bc112b83711204ab0c835d91d1b2b6535a3320f91228a7d6848c2e6de
+  data.tar.gz: 90ad2a3a7148f2669a7b1274d482ca08bd17d7068622ebc19aaf6d827c283b18c7da6fe217aba91e0c501e0419f8b49099bbfdffa1ef920d6abe11fee5342fac

data/lib/fancy_buff.rb

@@ -40,10 +40,30 @@ class FancyBuff
   def win=(coords)
     @win = coords
 
-    reset_caret!
+    adjust_caret!
   end
 
-  def reset_caret!
+  # index of first visible column
+  def c
+    @win[0]
+  end
+
+  # index of first visible row
+  def r
+    @win[1]
+  end
+
+  # width of the buffer window
+  def w
+    @win[2]
+  end
+
+  # height of the buffer window
+  def h
+    @win[3]
+  end
+
+  def adjust_caret!
     cx, cy = @caret
     new_cx = if cx < c
                c
@@ -64,33 +84,56 @@ class FancyBuff
     @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
-    ]
+  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
 
-  # index of first visible column
-  def c
-    @win[0]
+  def caret_down!
+    @caret[1] = [caret[1] + 1, @lines.length - 1].min
+    adjust_win!
   end
 
-  # index of first visible row
-  def r
-    @win[1]
+  def caret_up!
+    @caret[1] = [caret[1] - 1, 0].max
+    adjust_win!
   end
 
-  # width of the buffer window
-  def w
-    @win[2]
+  def caret_left!
+    @caret[0] = [caret[0] - 1, 0].max
+    adjust_win!
   end
 
-  # height of the buffer window
-  def h
-    @win[3]
+  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
@@ -155,25 +198,25 @@ class FancyBuff
   # scrolls the visible window up
   def win_up!(n=1)
     @win[1] = [@win[1] - n, 0].max
-    reset_caret!
+    adjust_caret!
   end
 
   # scrolls the visible window down
   def win_down!(n=1)
     @win[1] = [@win[1] + n, @lines.length - 1].min
-    reset_caret!
+    adjust_caret!
   end
 
   # scrolls the visible window left
   def win_left!(n=1)
     @win[0] = [@win[0] - n, 0].max
-    reset_caret!
+    adjust_caret!
   end
 
   # scrolls the visible window right
   def win_right!(n=1)
     @win[0] = [@win[0] + n, max_char_width - 1].min
-    reset_caret!
+    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: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Jeff Lunt