fatty 0.99.0 → 0.99.3

data/lib/fatty/pager.rb

@@ -2,16 +2,17 @@
 
 module Fatty
   class Pager
-    SCROLL_WHEEL_LINES = 3
+    SCROLL_WHEEL_LINES = 6
 
     include Fatty::Actionable
 
     action_on :pager
     attr_reader :mode
 
-    def initialize(output:, viewport:, mode: :paging)
+    def initialize(output:, viewport: Viewport.new, mode: :paging, lines: nil)
       @output   = output
       @viewport = viewport
+      @lines = lines || -> { @output.lines }
       # @mode can be :paging, or :scrolling
       # - paging: the viewport displays one page worth of output at a time,
       # - scrolling: the viewport displays output continuously as it is produced.
@@ -21,6 +22,8 @@ module Fatty
       @last_nav_dir = nil
       # Search state (used by SearchSession, but owned here so paging repeats and
       # highlighting survive after the SearchSession closes).
+      @isearch_snapshot = nil
+      @search_snapshot = nil
       @search = {
         pattern: nil,
         regex: false,
@@ -33,10 +36,48 @@ module Fatty
       }
     end
 
+    def quit
+      @paused = false
+      @mode = :paging
+      @anchor = nil
+      @autoscroll = false
+    end
+
     def paused?
       @mode == :paging && @paused
     end
 
+    def scrolling?
+      @mode == :scrolling
+    end
+
+    def toggle_paging_mode
+      @last_nav_dir = :down
+      if @mode == :paging
+        set_to_scrolling
+      else
+        set_to_paging
+      end
+    end
+
+    def set_to_scrolling
+      @mode = :scrolling
+      @paused = false
+      @autoscroll = true
+    end
+
+    def set_to_paging
+        @mode = :paging
+        @paused = true
+        @autoscroll = false
+        @anchor = nil
+        @viewport.clamp!(lines)
+    end
+
+    def active?
+      paused? || scrolling?
+    end
+
     def reserve_prompt_row?
       paused?
     end
@@ -57,23 +98,19 @@ module Fatty
     # Called by OutputSession after new text is appended.
     def on_append(ntrim:)
       @viewport.adjust_for_trim(ntrim)
-      lines = @output.lines
-      total = lines.size
-
+      current_lines = lines
+      total = current_lines.size
       case @mode
       when :scrolling
         # In scrolling mode, the viewport is allowed to move continuously.
         # Autoscroll animation (after switching from paging -> scrolling) is
         # driven by #autoscroll_step? in ShellSession#tick, not by incremental
         # scroll deltas during append.
-        @viewport.clamp!(lines)
+        @viewport.clamp!(current_lines)
       when :paging
         if @anchor
           produced = total - @anchor
-
-          if produced <= 0
-            return
-          end
+          return if produced <= 0
 
           # While producing the first page, keep the viewport pinned to the anchor.
           @viewport.top = @anchor
@@ -96,7 +133,7 @@ module Fatty
           @viewport.page_top
         end
         # Otherwise user is not at bottom; don't force movement.
-        @viewport.clamp!(lines)
+        @viewport.clamp!(current_lines)
       end
     end
 
@@ -139,7 +176,7 @@ module Fatty
       @last_nav_dir = :down
       @anchor = nil
       @autoscroll = false
-      @viewport.page_bottom(@output.lines)
+      @viewport.page_bottom(lines)
     end
 
     desc "One line up"
@@ -178,12 +215,16 @@ module Fatty
       clamp_to_page!
     end
 
-    desc "Page top"
-    action :page_top do
+    desc "Page top or go to an output line"
+    action :page_top do |count: nil|
       @mode = :paging
       @paused = true
       @last_nav_dir = :up
-      page_top!
+      if count
+        go_to_line!(count)
+      else
+        page_top!
+      end
     end
 
     desc "Page bottom"
@@ -201,33 +242,19 @@ module Fatty
       @anchor = nil
       @last_nav_dir = :down
       @autoscroll = true
-      @viewport.clamp!(@output.lines)
+      @viewport.clamp!(lines)
       # Make it visibly start immediately, even if no further appends happen.
       autoscroll_step?(max_lines: @viewport.height)
     end
 
     desc "Toggle between paging and scrolling"
     action :toggle_paging do
-      @last_nav_dir = :down
-      if @mode == :paging
-        @mode = :scrolling
-        @paused = false
-        @autoscroll = true   # keep if you like the animated “catch up”
-      else
-        @mode = :paging
-        @paused = true
-        @autoscroll = false
-        @anchor = nil        # ensure no command-anchored paging behavior kicks in
-        @viewport.clamp!(@output.lines)
-      end
+      toggle_paging_mode
     end
 
     desc "Exit paging and return control to normal input."
     action :quit_paging do
-      @paused = false
-      @mode = :paging
-      @anchor = nil
-      @autoscroll = false
+      quit
     end
 
     def at_top?
@@ -253,14 +280,14 @@ module Fatty
     end
 
     def max_page_top
-      [@output.lines.size - page_height, 0].max
+      [lines.size - page_height, 0].max
     end
 
     def clamp!
       if paused?
         clamp_to_page!
       else
-        @viewport.clamp!(@output.lines)
+        @viewport.clamp!(lines)
       end
     end
 
@@ -275,6 +302,17 @@ module Fatty
       @autoscroll = false
     end
 
+    def finish_command!
+      @anchor = nil
+      if @mode == :scrolling && lines.length > page_height
+        set_to_paging
+        @viewport.top = max_page_top
+      elsif @mode == :paging && lines.length > page_height
+        @paused = true
+        clamp_to_page!
+      end
+    end
+
     def reset!(total_lines: 0, mode: :paging)
       @mode = mode
       @paused = false
@@ -283,7 +321,6 @@ module Fatty
     end
 
     def autoscroll_step?(max_lines: 200)
-      lines = @output.lines
       total = lines.length
       moved = false
       if total > 0
@@ -310,6 +347,25 @@ module Fatty
       !@search[:re].nil?
     end
 
+    def search_begin!
+      ensure_search_snapshot!
+      nil
+    end
+
+    def search_cancel!
+      if @search_snapshot
+        @viewport.top = @search_snapshot[:viewport_top]
+        @search = @search_snapshot[:search]
+        @search_snapshot = nil
+      end
+      nil
+    end
+
+    def search_commit!
+      @search_snapshot = nil
+      nil
+    end
+
     # Sets the search pattern and moves the viewport to the next match.
     # Returns a result hash:
     #   { status: :moved }
@@ -366,14 +422,13 @@ module Fatty
       end
       return { status: :not_found } unless re
 
-      lines = @output.lines
       total = lines.length
       return { status: :not_found } if total.zero?
 
       start = search_start_position(direction: direction, total: total, initial: initial)
       found = find_next_match(lines, re, start, direction: direction, wrap: false)
 
-      if found
+      if valid_search_match?(found)
         apply_search_match(found)
         @search[:pending_wrap] = nil
         return { status: :moved }
@@ -385,7 +440,7 @@ module Fatty
         found = find_next_match(lines, re, wrap_start, direction: direction, wrap: true)
         @search[:pending_wrap] = nil
 
-        if found
+        if valid_search_match?(found)
           apply_search_match(found)
           return { status: :moved, wrapped: true }
         end
@@ -435,8 +490,8 @@ module Fatty
     # the renderer’s slice planner / highlighting behavior.
     def search_visible_highlights(viewport:)
       return unless @search[:re]
+      return unless active?
 
-      lines = @output.lines
       total = lines.length
       return if total.zero?
 
@@ -570,8 +625,10 @@ module Fatty
       "#{arrow} #{prefix}#{pat}"
     end
 
+    # --- ISearch -----------------------------------------------------------
+
     def isearch_update!(pattern:, direction:)
-      ensure_isearch_snapshot!
+      isearch_begin!
       pattern = pattern.to_s
 
       result =
@@ -598,6 +655,16 @@ module Fatty
       { status: :not_found, message: "Invalid regexp: #{e.message}" }
     end
 
+    def isearch_begin!
+      ensure_isearch_snapshot!
+      nil
+    end
+
+    def isearch_commit!
+      @isearch_snapshot = nil
+      nil
+    end
+
     def isearch_step!(direction:)
       ensure_isearch_snapshot!
       search_step!(direction: direction, initial: false, update_origin: false)
@@ -612,19 +679,24 @@ module Fatty
       nil
     end
 
-    def isearch_commit!(pattern:, direction:)
-      ensure_isearch_snapshot!
+    def isearch_accept!(pattern:, direction:)
+      isearch_begin!
+
       pattern = pattern.to_s
       if pattern.strip.empty?
         isearch_cancel!
         return { status: :not_found }
       end
+
       result = isearch_update!(pattern: pattern, direction: direction)
       if result[:status] == :moved
         @search[:original_direction] = direction.to_sym
         @search[:pending_wrap] = nil
+        isearch_commit!
+      else
+        isearch_cancel!
       end
-      @isearch_snapshot = nil
+
       result
     end
 
@@ -637,7 +709,7 @@ module Fatty
     end
 
     def preserve_after_resize!(was_at_bottom:)
-      if @mode == :paging && @output.lines.any? && was_at_bottom
+      if @mode == :paging && lines.any? && was_at_bottom
         page_bottom!
       else
         clamp!
@@ -646,6 +718,35 @@ module Fatty
 
     private
 
+    # simplecov:disable
+
+    def go_to_line!(number)
+      target = [number.to_i, 1].max
+      current_lines = lines
+      index =
+        if current_lines.first.respond_to?(:number)
+          current_lines.bsearch_index { |line| line.number >= target }
+        else
+          target - 1
+        end
+      index ||= current_lines.length - 1
+      @viewport.top = [index, 0].max
+      clamp_to_page!
+    end
+
+    def lines
+      @lines.call
+    end
+
+    def ensure_search_snapshot!
+      return if @search_snapshot
+
+      @search_snapshot = {
+        viewport_top: @viewport.top,
+        search: @search.dup,
+      }
+    end
+
     def ensure_isearch_snapshot!
       return if @isearch_snapshot
 
@@ -697,7 +798,7 @@ module Fatty
     end
 
     def search_start_col_for(line_index)
-      line = @output.lines[line_index]
+      line = lines[line_index]
       # Use end-of-line as the backward scan upper bound so the starting line
       # is included. +1 avoids edge weirdness when match ends exactly at len.
       if line
@@ -785,17 +886,27 @@ module Fatty
     end
 
     def apply_search_match(match)
+      unless valid_search_match?(match)
+        raise ArgumentError, "invalid search match: #{match.inspect}"
+      end
+
       @search[:last] = match
       line = match[:line]
-      # Make sure we're in paging mode when navigating search results.
+
       @mode = :paging
       @paused = true
       @last_nav_dir = :down
 
-      # Position the match line near the middle when possible.
       half = (@viewport.height / 2)
       @viewport.top = [line - half, 0].max
       @search[:last_view_top] = @viewport.top
     end
+
+    def valid_search_match?(match)
+      match.is_a?(Hash) &&
+      match[:line].is_a?(Integer) &&
+      match[:from].is_a?(Integer) &&
+        match[:to].is_a?(Integer)
+    end
   end
 end