kward 0.72.0 → 0.73.0

data/lib/kward/prompt_interface/editor/state.rb

@@ -16,16 +16,19 @@ module Kward
   class PromptInterface
     # Mutable state for the built-in composer file editor.
     class EditorState
-      attr_reader :path, :original_content, :original_digest, :original_mtime, :original_size
+      attr_reader :path, :display_path, :language, :original_content, :original_digest, :original_mtime, :original_size
       attr_reader :buffer, :undo_stack, :redo_stack, :kill_buffer, :kill_ring, :last_yank_range, :last_yank_index
       attr_accessor :viewport_row, :viewport_column, :status, :overwrite_confirmed, :quit_confirmed, :search_active, :search_query, :search_direction, :new_file, :editor_mode, :emacs_pending, :readonly, :diff_view
 
-      def initialize(path:, content:, new_file: false, editor_mode: "modern", readonly: false, diff_view: false)
-        @path = path.to_s
+      def initialize(path:, content:, new_file: false, editor_mode: "modern", readonly: false, diff_view: false, virtual: false, display_path: nil, language: nil)
+        @path = virtual ? nil : path.to_s
+        @display_path = display_path.to_s.empty? ? path.to_s : display_path.to_s
+        @language = language&.to_sym
         @new_file = new_file
         @readonly = readonly
         @diff_view = diff_view
-        @file_marker = EditorFileMarker.new(path: @path, content: content, new_file: new_file)
+        @virtual = virtual == true
+        @file_marker = EditorFileMarker.new(path: @path || @display_path, content: content, new_file: new_file || virtual?)
         @original_content = @file_marker.content
         @original_digest = @file_marker.digest
         @original_mtime = @file_marker.mtime
@@ -61,9 +64,12 @@ module Kward
 
       def initialize_copy(other)
         super
-        @path = other.path.dup
+        @path = other.path&.dup
+        @display_path = other.display_path.dup
+        @language = other.language
+        @virtual = other.virtual?
         @original_content = other.original_content.dup
-        @file_marker = EditorFileMarker.new(path: @path, content: @original_content, new_file: other.new_file)
+        @file_marker = EditorFileMarker.new(path: @path || @display_path, content: @original_content, new_file: other.new_file || @virtual)
         @original_digest = other.original_digest.dup
         @original_mtime = other.original_mtime
         @original_size = other.original_size
@@ -306,6 +312,18 @@ module Kward
         @readonly == true
       end
 
+      def virtual?
+        @virtual == true
+      end
+
+      def bind_path(path)
+        @path = path.to_s
+        @display_path = @path
+        @virtual = false
+        @new_file = !File.exist?(@path)
+        @file_marker = EditorFileMarker.new(path: @path, content: @original_content, new_file: true)
+      end
+
       def diff_view?
         @diff_view == true
       end
@@ -938,6 +956,8 @@ module Kward
 
       def refresh_after_save(content)
         @new_file = false
+        @virtual = false
+        @display_path = @path.to_s
         @file_marker.refresh(content)
         @original_content = @file_marker.content
         @original_digest = @file_marker.digest
@@ -949,6 +969,8 @@ module Kward
       end
 
       def file_changed_on_disk?
+        return false if virtual?
+
         @file_marker.changed_on_disk?(new_file: new_file)
       end
 

data/lib/kward/prompt_interface/editor/syntax_highlighter.rb

@@ -134,11 +134,13 @@ module Kward
 
       def editor_syntax_language
         return nil unless @editor_state
+        return @editor_state.language if @editor_state.language
 
+        path = @editor_state.path || @editor_state.display_path
         @editor_syntax_language_path ||= nil
-        if @editor_syntax_language_path != @editor_state.path
-          @editor_syntax_language_path = @editor_state.path
-          @editor_syntax_language = editor_detect_syntax_language(@editor_state.path)
+        if @editor_syntax_language_path != path
+          @editor_syntax_language_path = path
+          @editor_syntax_language = editor_detect_syntax_language(path)
         end
         @editor_syntax_language
       end

data/lib/kward/prompt_interface/git_prompt.rb

@@ -45,6 +45,14 @@ module Kward
         end
       end
 
+      def open_modal_diff_viewer(path, content)
+        @mutex.synchronize do
+          open_diff_viewer(path.to_s, content.to_s)
+          render_prompt_locked
+        end
+        read_editor_until_closed
+      end
+
       private
 
       def handle_git_key(key)
@@ -116,12 +124,9 @@ module Kward
       end
 
       def handle_git_bracketed_paste_key(key)
-        paste = read_bracketed_paste(key)
-        return false unless paste
-
-        insert_string(normalize_paste(paste[:content])) if git_composing?
-        queue_pending_keys(paste[:remaining]) if paste[:remaining] && !paste[:remaining].empty?
-        true
+        handle_bracketed_paste(key) do |content|
+          insert_string(content) if git_composing?
+        end
       end
 
       def handle_git_named_key(key_name)
@@ -149,18 +154,6 @@ module Kward
         end
       end
 
-      def handle_git_escape_sequence
-        pending_sequence = read_pending_escape_sequence
-        return SELECT_CANCEL if pending_sequence.empty?
-
-        full_sequence = "\e#{pending_sequence}"
-        sequence = next_key_token(full_sequence)
-        queue_pending_keys(full_sequence[sequence.length..]) if full_sequence.length > sequence.length
-        return SELECT_CANCEL if sequence == "\e"
-
-        handle_git_named_key(key_name_for(sequence))
-      end
-
       def git_state_for(status_lines, selected_index: 0)
         lines = Array(status_lines).map(&:to_s)
         selected_index = [[selected_index.to_i, 0].max, [lines.length - 1, 0].max].min
@@ -204,11 +197,7 @@ module Kward
       def open_git_diff_viewer(diff)
         return unless diff.respond_to?(:[])
 
-        @mutex.synchronize do
-          open_diff_viewer(diff[:path].to_s, diff[:content].to_s)
-          render_prompt_locked
-        end
-        read_editor_until_closed
+        open_modal_diff_viewer(diff[:path], diff[:content])
       end
 
       def read_editor_until_closed

data/lib/kward/prompt_interface/interactive/controller.rb

@@ -50,7 +50,7 @@ module Kward
       # @param row [Integer] zero-based row
       # @param col [Integer] zero-based column
       # @param char [String] single character to display
-      # @param color [Symbol, String, nil] ANSI style name or raw SGR code
+      # @param colors [Array<Symbol, String>] ANSI style names or raw SGR codes
       # @return [void]
       def put(row, col, char, *colors)
         row = row.to_i

data/lib/kward/prompt_interface/key_handler.rb

@@ -14,7 +14,7 @@ module Kward
 
         @reader.read_keypress(echo: false, raw: true, nonblock: nonblock)
       rescue TTY::Reader::InputInterrupt
-        "\x03"
+        TerminalKeys::CTRL_C
       rescue IO::WaitReadable, Errno::EAGAIN, Errno::EWOULDBLOCK
         nil
       end
@@ -116,11 +116,11 @@ module Kward
             handle_tab_completion_key
           when "\b", "\x7F"
             delete_before_cursor
-          when "\x04"
+          when TerminalKeys::CTRL_D
             delete_at_cursor_or_exit
-          when "\x03"
+          when TerminalKeys::CTRL_C
             cancel_input_or_interrupt
-          when "\x12"
+          when TerminalKeys::CTRL_R
             start_history_search
           when "\e"
             handle_escape_sequence
@@ -152,7 +152,7 @@ module Kward
             accept_history_search
           when "\b", "\x7F"
             update_history_search_query(composer_input[0...-1].to_s)
-          when "\x03", "\e"
+          when TerminalKeys::CTRL_C, "\e"
             cancel_history_search
           else
             append_history_search_key(key)
@@ -193,7 +193,7 @@ module Kward
       def cancel_input_or_interrupt
         return CANCEL_INPUT if @busy
 
-        raise Interrupt
+        true
       end
 
       def handle_tab_completion_key
@@ -253,21 +253,41 @@ module Kward
       end
 
       def handle_bracketed_paste_key(key)
+        handle_bracketed_paste(key) { |content| insert_paste(content) }
+      end
+
+      def handle_mouse_reporting_key(key)
+        event = parse_sgr_mouse_event(key)
+        return false unless event
+
+        queue_pending_keys(event[:remaining]) unless event[:remaining].empty?
+        true
+      end
+
+      def handle_bracketed_paste(key)
         paste = read_bracketed_paste(key)
         return false unless paste
 
-        insert_paste(normalize_paste(paste[:content]))
+        yield normalize_paste(paste[:content])
         queue_pending_keys(paste[:remaining]) if paste[:remaining] && !paste[:remaining].empty?
         true
       end
 
-      def handle_mouse_reporting_key(key)
-        text = key.to_s
-        match = text.match(/\A(?:\e)?\[<\d+;\d+;\d+[Mm]/)
-        return false unless match
+      def parse_sgr_mouse_event(key)
+        match = key.to_s.match(/\A(?:\e)?\[<(\d+);(\d+);(\d+)([Mm])/)
+        return nil unless match
 
-        queue_pending_keys(text[match[0].length..]) if match[0].length < text.length
-        true
+        code = match[1].to_i
+        {
+          code: code,
+          button: code & 3,
+          column: match[2].to_i,
+          row: match[3].to_i,
+          action: match[4],
+          release: match[4] == "m",
+          drag: (code & 32).positive?,
+          remaining: key.to_s[match[0].length..].to_s
+        }
       end
 
       def read_bracketed_paste(key)
@@ -329,7 +349,7 @@ module Kward
       end
 
       def parse_csi_u_key(key)
-        match = key.to_s.match(/\A\e\[(\d+)((?:;[\d:]*)*)u/)
+        match = key.to_s.match(TerminalKeys::CSI_U_PATTERN)
         return nil unless match
 
         fields = match[2].to_s.split(";", -1)[1..] || []
@@ -345,12 +365,34 @@ module Kward
         }
       end
 
+      def csi_u_key_event(sequence)
+        code = sequence[:code]
+        case code
+        when 9
+          { type: :tab, modifier: sequence[:modifier] }
+        when 13
+          { type: :enter, modifier: sequence[:modifier] }
+        when 27
+          { type: :escape, modifier: sequence[:modifier] }
+        when 8, 127
+          { type: :backspace, modifier: sequence[:modifier] }
+        when 4
+          { type: :delete, modifier: sequence[:modifier] }
+        else
+          text = csi_u_printable_text(sequence)
+          return { type: :printable, text: text, modifier: sequence[:modifier] } if text
+          return { type: :text_field, modifier: sequence[:modifier] } if csi_u_text_field?(sequence)
+
+          { type: :modified, code: code, modifier: sequence[:modifier] }
+        end
+      end
+
       def insert_csi_u_text(sequence)
-        text = csi_u_printable_text(sequence)
-        return true if text.nil? && csi_u_text_field?(sequence)
-        return false unless text
+        event = csi_u_key_event(sequence)
+        return true if event[:type] == :text_field
+        return false unless event[:type] == :printable
 
-        insert_string(text)
+        insert_string(event[:text])
       end
 
       def csi_u_text_field?(sequence)
@@ -444,17 +486,17 @@ module Kward
       def cursor_key_name(key)
         text = key.to_s
         case text
-        when /\A\e\[[0-9;:]*A\z/, "\eOA"
+        when TerminalKeys::UP_PATTERN, *TerminalKeys::UP
           :up
-        when /\A\e\[[0-9;:]*B\z/, "\eOB"
+        when TerminalKeys::DOWN_PATTERN, *TerminalKeys::DOWN
           :down
-        when /\A\e\[[0-9;:]*C\z/, "\eOC"
+        when TerminalKeys::RIGHT_PATTERN, *TerminalKeys::RIGHT
           :right
-        when /\A\e\[[0-9;:]*D\z/, "\eOD"
+        when TerminalKeys::LEFT_PATTERN, *TerminalKeys::LEFT
           :left
-        when "\e[5~"
+        when *TerminalKeys::PAGE_UP
           :pageup
-        when "\e[6~"
+        when *TerminalKeys::PAGE_DOWN
           :pagedown
         end
       end
@@ -506,8 +548,8 @@ module Kward
 
       def next_key_token(keys)
         text = keys.to_s
-        text.match(/\A\e\[[0-9;:]*[A-Za-z~]/)&.[](0) ||
-          text.match(/\A\eO[A-Za-z]/)&.[](0) ||
+        text.match(TerminalKeys::CSI_KEY_PATTERN)&.[](0) ||
+          text.match(TerminalKeys::SS3_KEY_PATTERN)&.[](0) ||
           shift_enter_sequence_for(text) ||
           (text.start_with?("\e") && text.length > 1 && alt_key_sequence?(text[1]) ? text[0, 2] : text[0, 1])
       end
@@ -536,9 +578,9 @@ module Kward
         sequence
       end
 
-      CTRL_TAB_SEQUENCES = ["\e[9;5u", "\e[27;5;9~", "\e[1;5I"].freeze
-      CTRL_SHIFT_TAB_SEQUENCES = ["\e[9;6u", "\e[27;6;9~", "\e[1;6I", "\e[1;6Z"].freeze
-      SHIFT_TAB_SEQUENCES = ["\e[Z", "\e[1;2Z", "\e[9;2u", "\e[27;2;9~", "\e[1;2I"].freeze
+      CTRL_TAB_SEQUENCES = TerminalKeys::CTRL_TAB
+      CTRL_SHIFT_TAB_SEQUENCES = TerminalKeys::CTRL_SHIFT_TAB
+      SHIFT_TAB_SEQUENCES = TerminalKeys::SHIFT_TAB
 
       def handle_completion_provider_key(key)
         return false unless key == "\t" && @completion_provider
@@ -617,9 +659,9 @@ module Kward
 
       def handle_ctrl_tab_key_binding(key)
         case key
-        when "\x14", "\e[116;5u"
+        when TerminalKeys::CTRL_T, TerminalKeys::CTRL_T_CSI_U
           { tab_action: :new }
-        when "\e[119;5u"
+        when TerminalKeys::CTRL_W_CSI_U
           { tab_action: :close }
         else
           ctrl_number_tab_action(key)
@@ -627,7 +669,7 @@ module Kward
       end
 
       def ctrl_number_tab_action(key)
-        match = key.to_s.match(/\A\e\[((?:49)|(?:5[0-7]));5u\z/)
+        match = key.to_s.match(TerminalKeys::CTRL_NUMBER_TAB_PATTERN)
         return false unless match
 
         { tab_action: :select, index: match[1].to_i - 49 }
@@ -637,9 +679,9 @@ module Kward
         case key
         when "\et", "\eT"
           { tab_action: :new }
-        when "\e[1;3C", "\e[3C"
+        when *TerminalKeys::ALT_RIGHT
           { tab_action: :next }
-        when "\e[1;3D", "\e[3D"
+        when *TerminalKeys::ALT_LEFT
           { tab_action: :previous }
         else
           alt_number_tab_action(key)
@@ -655,35 +697,35 @@ module Kward
 
       def handle_composer_key_binding(key)
         case key
-        when "\x01"
+        when TerminalKeys::CTRL_A
           move_to_start_of_line
-        when "\x02"
+        when TerminalKeys::CTRL_B
           move_cursor_left
-        when "\x04"
+        when TerminalKeys::CTRL_D
           delete_at_cursor_or_exit
-        when "\x05"
+        when TerminalKeys::CTRL_E
           move_to_end_of_line
-        when "\x06"
+        when TerminalKeys::CTRL_F
           move_cursor_right
-        when "\x0B"
+        when TerminalKeys::CTRL_K
           kill_line_after_cursor
-        when "\x0C"
+        when TerminalKeys::CTRL_L
           redraw_screen_locked
-        when "\x15"
+        when TerminalKeys::CTRL_U
           kill_line_before_cursor
-        when "\x17"
+        when TerminalKeys::CTRL_W
           delete_word_before_cursor
-        when "\x19"
+        when TerminalKeys::CTRL_Y
           yank_kill_buffer
-        when "\e[D", "\eOD"
+        when *TerminalKeys::LEFT
           move_cursor_left
-        when "\e[C", "\eOC"
+        when *TerminalKeys::RIGHT
           move_cursor_right
-        when "\e[H", "\eOH", "\e[1~", "\e[7~"
+        when *TerminalKeys::HOME
           move_to_start_of_line
-        when "\e[F", "\eOF", "\e[4~", "\e[8~"
+        when *TerminalKeys::END_KEY
           move_to_end_of_line
-        when "\e[3~"
+        when *TerminalKeys::DELETE
           delete_at_cursor
         when "\eb", "\eB"
           move_to_previous_word
@@ -699,9 +741,9 @@ module Kward
       end
 
       def parse_modified_ansi_key(key)
-        if (match = key.to_s.match(/\A\e\[(\d+);(\d+)([CDFH])\z/))
+        if (match = key.to_s.match(TerminalKeys::MODIFIED_CURSOR_PATTERN))
           { type: :cursor, modifier: match[2].to_i, final: match[3] }
-        elsif (match = key.to_s.match(/\A\e\[3;(\d+)~\z/))
+        elsif (match = key.to_s.match(TerminalKeys::MODIFIED_DELETE_PATTERN))
           { type: :delete, modifier: match[1].to_i }
         end
       end

data/lib/kward/prompt_interface/question_prompt.rb

@@ -195,12 +195,7 @@ module Kward
       end
 
       def handle_question_bracketed_paste_key(key)
-        paste = read_bracketed_paste(key)
-        return false unless paste
-
-        question_insert_string(normalize_paste(paste[:content]))
-        queue_pending_keys(paste[:remaining]) if paste[:remaining] && !paste[:remaining].empty?
-        true
+        handle_bracketed_paste(key) { |content| question_insert_string(content) }
       end
 
       def current_question_answer

data/lib/kward/prompt_interface/screen.rb

@@ -95,7 +95,7 @@ module Kward
         old_top = [height - old_reserved_rows + 1, 1].max
         @reserved_rows = new_reserved_rows
         new_top = composer_top_row(height)
-        @output_io.print("\e[1;#{transcript_bottom_row(height)}r")
+        @output_io.print(TerminalSequences.scroll_region(1, transcript_bottom_row(height)))
         clear_screen_rows_locked(old_top, new_top - 1) if new_top > old_top
         @last_composer_rows = []
         redraw_transcript_locked(width: width, height: height) if redraw_transcript && new_reserved_rows < old_reserved_rows
@@ -119,7 +119,7 @@ module Kward
       end
 
       def restore_scroll_region_locked
-        @output_io.print("\e[r")
+        @output_io.print(TerminalSequences.restore_scroll_region)
         @reserved_rows = 0
       end
 
@@ -188,7 +188,7 @@ module Kward
       end
 
       def move_to_screen(row, col)
-        @output_io.print("\e[#{row};#{col}H")
+        @output_io.print(TerminalSequences.move_to(row, col))
       end
 
       def screen_size

data/lib/kward/prompt_interface/selection_prompt.rb

@@ -147,12 +147,9 @@ module Kward
       end
 
       def handle_select_bracketed_paste_key(key)
-        paste = read_bracketed_paste(key)
-        return false unless paste
-
-        select_insert_string(normalize_paste(paste[:content])) if select_editing_active?
-        queue_pending_keys(paste[:remaining]) if paste[:remaining] && !paste[:remaining].empty?
-        true
+        handle_bracketed_paste(key) do |content|
+          select_insert_string(content) if select_editing_active?
+        end
       end
 
       def select_current_choice

data/lib/kward/prompt_interface/slash_overlay.rb

@@ -37,6 +37,8 @@ module Kward
       end
 
       def slash_overlay_visible?
+        return false if @slash_overlay_disabled
+
         composer_input.match?(%r{\A/[^\s/]*\z}) && @slash_overlay_dismissed_input != composer_input && !slash_overlay_matches.empty?
       end