textbringer 17 → 19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afebafd9a22024be2bc3c4c5c2140ac9ad3b7fa7a1efc25e0ae9bf4d38c3da10
-  data.tar.gz: 53841ecd93d7b63e9d33a07d39721f90bf0d39e6803406287518601d67d4a59c
+  metadata.gz: 9aa0a319cdc7f8e965d906b1059a76083730240463a3ed33a4cb79214d2762b6
+  data.tar.gz: 3993baf2bf25459b7ec201b112d98c05aa96eaac68e77510b013cfd2d3cf69c8
 SHA512:
-  metadata.gz: 469ef80d72998003e1d5ca9e6c499b70debc5d1c2c09b43b9b79311e94ce15c22adbd766bf31cafaa20a5ac11a19c8b12d9c8392d166cec5a617305c4a50e43f
-  data.tar.gz: 6908288f0debd4001c131327071962fda1392ff0310f26fc72b9f0391b01e281b22824c78e78d2be69cd89b5fc768c7239d116bd35699d1483c4fa944aae76be
+  metadata.gz: cb57afbe902f32238deab1589433564632fcea16b43351faebf530262deafb50d36719180a120e9496206ed99eaebc56f7c7506c190cb75abfaf104b00aecea1
+  data.tar.gz: 633f52c2fc1b4012b0e02ad06fba07d1cde388f1949ad06189a2b1354ab4952d9ae2c68898f8e4de899f58b9b800579f77212a3db6569340371d700fa3a3d12d

data/exe/txtb

@@ -27,11 +27,11 @@ end
 Controller.current = Controller.new
 begin
   Window.start do
+    load_user_config("~/.textbringer/init.rb")
     $stdout = DefaultOutput.new
     begin
       transient_mark_mode(true)
       Window.echo_area.clear_message
-      load_user_config("~/.textbringer/init.rb")
       Plugin.load_plugins
       load_user_config("~/.textbringer.rb")
       ruby_mode

data/lib/textbringer/buffer.rb

@@ -10,7 +10,7 @@ module Textbringer
 
     attr_accessor :mode, :keymap
     attr_reader :name, :file_name, :file_encoding, :file_format, :point, :marks
-    attr_reader :current_line, :current_column, :visible_mark, :mark_active
+    attr_reader :current_line, :current_column, :visible_mark, :isearch_mark, :mark_active
     attr_reader :last_match
     attr_reader :input_method
 
@@ -254,6 +254,7 @@ module Textbringer
       @save_point_level = 0
       @match_offsets = []
       @visible_mark = nil
+      @isearch_mark = nil
       @mark_active = false
       @read_only = read_only
       @callbacks = {}
@@ -276,11 +277,15 @@ module Textbringer
     end
 
     def file_name=(file_name)
+      old_file_name = @file_name
       @file_name = file_name
       basename = File.basename(file_name)
       if /\A#{Regexp.quote(basename)}(<\d+>)?\z/ !~ name
         self.name = basename
       end
+      if old_file_name != file_name && current?
+        Utils.run_hooks(:after_set_visited_file_name_hook, old_file_name)
+      end
     end
 
     def file_encoding=(enc)
@@ -342,7 +347,7 @@ module Textbringer
     end
 
     def on_killed(&callback)
-      add_callback(:killed, callback)
+      on(:killed, &callback)
     end
 
     def current?
@@ -366,7 +371,7 @@ module Textbringer
     end
 
     def on_modified(&callback)
-      add_callback(:modified, callback)
+      on(:modified, &callback)
     end
 
     def [](name)
@@ -609,6 +614,7 @@ module Textbringer
       end
       self.modified = true
       @goal_column = nil
+      Utils.run_hooks(:after_change_functions, pos, @point, "") unless @undoing || !current?
       self
     end
 
@@ -650,6 +656,7 @@ module Textbringer
         end
         push_undo(DeleteAction.new(self, s, s, str))
         self.modified = true
+        Utils.run_hooks(:after_change_functions, s, s, str) unless @undoing || !current?
       elsif n < 0
         str = substring(pos, s)
         update_line_and_column(@point, pos)
@@ -665,6 +672,7 @@ module Textbringer
         @point = @gap_start = pos
         push_undo(DeleteAction.new(self, s, pos, str))
         self.modified = true
+        Utils.run_hooks(:after_change_functions, pos, pos, str) unless @undoing || !current?
       end
       @goal_column = nil
     end
@@ -948,6 +956,18 @@ module Textbringer
       end
     end
 
+    def set_isearch_mark(pos = @point)
+      @isearch_mark ||= new_mark
+      @isearch_mark.location = pos
+    end
+
+    def delete_isearch_mark
+      if @isearch_mark
+        @isearch_mark.delete
+        @isearch_mark = nil
+      end
+    end
+
     def activate_mark
       @mark_active = true
       set_visible_mark(@mark.location) if @mark
@@ -1007,6 +1027,7 @@ module Textbringer
         end
         push_undo(DeleteAction.new(self, old_pos, s, str))
         self.modified = true
+        Utils.run_hooks(:after_change_functions, s, s, str) unless @undoing || !current?
       end
     end
 
@@ -1477,6 +1498,19 @@ module Textbringer
       end
     end
 
+    def pos_to_line_and_column(pos)
+      return [1, 1] if pos == 0
+      text_before = substring(0, pos)
+      line = text_before.count("\n") + 1
+      last_newline = text_before.rindex("\n")
+      column = if last_newline
+                 text_before.size - last_newline
+               else
+                 text_before.size + 1
+               end
+      [line, column]
+    end
+
     private
 
     def set_contents(s, enc)

data/lib/textbringer/commands/buffers.rb

@@ -96,7 +96,8 @@ module Textbringer
       buffer = Buffer.current
       buffer.exchange_point_and_mark
       # Activate mark if transient mark mode is enabled
-      if TransientMarkMode.enabled?
+      if TransientMarkMode.enabled? &&
+          Controller.current.this_command == :exchange_point_and_mark
         buffer.activate_mark
       end
     end
@@ -153,7 +154,8 @@ module Textbringer
       else
         buffer.push_mark
         # Activate mark if transient mark mode is enabled
-        if TransientMarkMode.enabled?
+        if TransientMarkMode.enabled? &&
+            Controller.current.this_command == :set_mark_command
           buffer.activate_mark
         end
         message("Mark set")

data/lib/textbringer/commands/clipboard.rb

@@ -29,23 +29,38 @@ module Textbringer
         Copy the region to the kill ring and the clipboard, and delete
         the region.
       EOD
-      kill_region
-      Clipboard.copy(KILL_RING.current)
+      begin
+        kill_region
+        Clipboard.copy(KILL_RING.current)
+      rescue ReadOnlyError
+        Clipboard.copy(KILL_RING.current)
+        raise
+      end
     end
 
     define_command(:clipboard_kill_line, doc: <<~EOD) do
         Kill the rest of the current line, and copy the killed text to
         the clipboard.
       EOD
-      kill_line
-      Clipboard.copy(KILL_RING.current)
+      begin
+        kill_line
+        Clipboard.copy(KILL_RING.current)
+      rescue ReadOnlyError
+        Clipboard.copy(KILL_RING.current)
+        raise
+      end
     end
 
     define_command(:clipboard_kill_word, doc: <<~EOD) do
         Kill a word, and copy the word to the clipboard.
       EOD
-      kill_word
-      Clipboard.copy(KILL_RING.current)
+      begin
+        kill_word
+        Clipboard.copy(KILL_RING.current)
+      rescue ReadOnlyError
+        Clipboard.copy(KILL_RING.current)
+        raise
+      end
     end
 
     define_command(:clipboard_yank, doc: <<~EOD) do

data/lib/textbringer/commands/completion.rb

@@ -0,0 +1,133 @@
+module Textbringer
+  module Commands
+    define_keymap :COMPLETION_POPUP_MAP
+
+    # Navigation keys
+    COMPLETION_POPUP_MAP.define_key("\C-n", :completion_popup_next)
+    COMPLETION_POPUP_MAP.define_key(:down, :completion_popup_next)
+    COMPLETION_POPUP_MAP.define_key("\C-p", :completion_popup_previous)
+    COMPLETION_POPUP_MAP.define_key(:up, :completion_popup_previous)
+
+    # Accept keys
+    COMPLETION_POPUP_MAP.define_key("\C-m", :completion_popup_accept)  # RET
+    COMPLETION_POPUP_MAP.define_key("\t", :completion_popup_accept)    # Tab
+
+    # Cancel keys
+    COMPLETION_POPUP_MAP.define_key("\C-g", :completion_popup_cancel)
+
+    # Handle undefined keys - close popup and forward the key
+    COMPLETION_POPUP_MAP.handle_undefined_key do |key|
+      :completion_popup_self_insert_and_close
+    end
+
+    COMPLETION_POPUP_STATUS = {
+      active: false,
+      start_point: nil
+    }
+
+    def self.completion_popup_mode_active?
+      COMPLETION_POPUP_STATUS[:active]
+    end
+
+    define_command(:completion_popup_next,
+                   doc: "Select next completion candidate.") do
+      CompletionPopup.instance.select_next
+    end
+
+    define_command(:completion_popup_previous,
+                   doc: "Select previous completion candidate.") do
+      CompletionPopup.instance.select_previous
+    end
+
+    define_command(:completion_popup_accept,
+                   doc: "Accept the selected completion.") do
+      popup = CompletionPopup.instance
+      item = popup.accept
+      if item
+        insert_completion(item)
+      end
+      completion_popup_done
+    end
+
+    define_command(:completion_popup_cancel,
+                   doc: "Cancel completion popup.") do
+      CompletionPopup.instance.cancel
+      completion_popup_done
+    end
+
+    define_command(:completion_popup_self_insert_and_close,
+                   doc: "Close popup and process the key.") do
+      CompletionPopup.instance.close
+      completion_popup_done
+      # Execute the command for the key that closed the popup
+      key = Controller.current.last_key
+      buffer = Buffer.current
+      cmd = buffer&.keymap&.lookup([key]) || GLOBAL_MAP.lookup([key])
+      if cmd.is_a?(Symbol)
+        send(cmd)
+      elsif cmd.respond_to?(:call)
+        cmd.call
+      end
+    end
+
+    def completion_popup_start(items:, start_point:, prefix: "")
+      return if items.empty?
+
+      CompletionPopup.instance.show(
+        items: items,
+        start_point: start_point,
+        prefix: prefix
+      )
+
+      COMPLETION_POPUP_STATUS[:active] = true
+      COMPLETION_POPUP_STATUS[:start_point] = start_point
+
+      Controller.current.overriding_map = COMPLETION_POPUP_MAP
+      add_hook(:pre_command_hook, :completion_popup_pre_command_hook)
+    end
+
+    def completion_popup_done
+      COMPLETION_POPUP_STATUS[:active] = false
+      COMPLETION_POPUP_STATUS[:start_point] = nil
+      Controller.current.overriding_map = nil
+      remove_hook(:pre_command_hook, :completion_popup_pre_command_hook)
+    end
+
+    def completion_popup_pre_command_hook
+      # Close popup if command is not a completion popup command
+      if /\Acompletion_popup_/ !~ Controller.current.this_command.to_s
+        CompletionPopup.instance.close
+        completion_popup_done
+      end
+    end
+
+    def insert_completion(item)
+      buffer = Buffer.current
+      start_point = COMPLETION_POPUP_STATUS[:start_point]
+      return unless start_point
+
+      insert_text = item[:insert_text] || item[:label]
+      return unless insert_text
+
+      # The server may return an insert_text that covers more than the typed
+      # symbol prefix (e.g. "Textbringer::Buffer" when the symbol pattern only
+      # backed up to "Buf"). Find the longest prefix of insert_text that is a
+      # suffix of the buffer text ending at point, and use that as the
+      # replacement range.
+      look_back = [buffer.point, insert_text.length].min
+      actual_start = start_point
+      if look_back > 0
+        text_before_point = buffer.substring(buffer.point - look_back, buffer.point)
+        look_back.downto(1) do |n|
+          if text_before_point.end_with?(insert_text[0, n])
+            actual_start = buffer.point - n
+            break
+          end
+        end
+      end
+
+      buffer.delete_region(actual_start, buffer.point)
+      buffer.insert(insert_text)
+    end
+  end
+end

data/lib/textbringer/commands/ctags.rb

@@ -76,7 +76,7 @@ module Textbringer
       if CTAGS[:path] != path || CTAGS[:tags_mtime] != mtime
         CTAGS[:path] = path
         tags = Hash.new { |h, k| h[k] = [] }
-        File.read(path).scan(/^(.*?)\t(.*?)\t(.*?)(?:;".*)?$/) do
+        File.binread(path).scan(/^(.*?)\t(.*?)\t(.*?)(?:;".*)?$/) do
           |name, file, addr|
           n = tags[name].count { |f,| f == file } + 1
           tags[name].push([file, addr, n])

data/lib/textbringer/commands/files.rb

@@ -45,6 +45,7 @@ module Textbringer
       if config.key?("tab_width")
         Buffer.current[:tab_width] = config["tab_width"].to_i
       end
+      run_hooks(:find_file_hook)
     end
 
     define_command(:revert_buffer, doc: <<~EOD) do
@@ -102,10 +103,19 @@ module Textbringer
           next
         end
       end
-      Buffer.current.save(file_name)
+      set_visited_file_name(file_name)
+      Buffer.current.save
       message("Wrote #{Buffer.current.file_name}")
     end
 
+    define_command(:set_visited_file_name,
+                   doc: "Change the file name of the current buffer.") do
+      |file_name = read_file_name("Set visited file name: ",
+                                  default: Buffer.current.file_name)|
+      file_name = File.expand_path(file_name)
+      Buffer.current.file_name = file_name
+    end
+
     define_command(:set_buffer_file_encoding,
                    doc: "Set the file encoding of the current buffer.") do
       |enc = read_encoding("File encoding: ",

data/lib/textbringer/commands/help.rb

@@ -65,7 +65,7 @@ module Textbringer
     end
 
     def command_help(cmd)
-      file, line = *cmd.block.source_location
+      file, line = *cmd.source_location
       s = format("%s:%d\n", file, line)
       s << "-" * (Window.columns - 2) + "\n"
       s << "#{cmd.name}"

data/lib/textbringer/commands/isearch.rb

@@ -77,10 +77,7 @@ module Textbringer
     end
 
     def isearch_done
-      # Don't delete visible_mark if mark is active (transient mark mode)
-      unless Buffer.current.mark_active?
-        Buffer.current.delete_visible_mark
-      end
+      Buffer.current.delete_isearch_mark
       Controller.current.overriding_map = nil
       remove_hook(:pre_command_hook, :isearch_pre_command_hook)
       ISEARCH_STATUS[:last_string] = ISEARCH_STATUS[:string]
@@ -94,7 +91,7 @@ module Textbringer
     end
 
     define_command(:isearch_abort, doc: "Abort incremental search.") do
-      goto_char(Buffer.current[:isearch_start])
+      goto_char(ISEARCH_STATUS[:start])
       isearch_done
       raise Quit
     end
@@ -157,11 +154,8 @@ module Textbringer
         if Buffer.current != Buffer.minibuffer
           message(isearch_prompt + ISEARCH_STATUS[:string], log: false)
         end
-        # Don't update visible_mark if mark is already active (transient mark mode)
-        unless Buffer.current.mark_active?
-          Buffer.current.set_visible_mark(forward ? match_beginning(0) :
-                                          match_end(0))
-        end
+        Buffer.current.set_isearch_mark(forward ? match_beginning(0) :
+                                        match_end(0))
         goto_char(forward ? match_end(0) : match_beginning(0))
       else
         if Buffer.current != Buffer.minibuffer

data/lib/textbringer/commands/ispell.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "open3"
 require "uri"