textbringer 17 → 19

data/lib/textbringer/modes/programming_mode.rb

@@ -3,14 +3,23 @@ module Textbringer
     # abstract mode
     undefine_command(:programming_mode)
 
-    define_generic_command :indent_line
-    define_generic_command :reindent_then_newline_and_indent
-    define_generic_command :indent_region
-    define_generic_command :forward_definition
-    define_generic_command :backward_definition
-    define_generic_command :compile
-    define_generic_command :toggle_test
-    define_generic_command :indent_new_comment_line
+    define_generic_command :indent_line,
+      doc: "Indent the current line."
+    define_generic_command :reindent_then_newline_and_indent,
+      doc: "Reindent the current line, insert a new line, then indent the new line."
+    define_generic_command :indent_region,
+      doc: "Indent the region."
+    define_generic_command :forward_definition,
+      doc: "Go to the next definition of a class, method etc."
+    define_generic_command :backward_definition,
+      doc: "Go to the preivous definition of a class, method etc."
+    define_generic_command :compile,
+      doc: "Compile the program including the current buffer."
+    define_generic_command :toggle_test,
+      doc: "Open the test file corresponding to the current buffer.  " \
+           "If the current buffer is a test file, open the file of the code under test."
+    define_generic_command :indent_new_comment_line,
+      doc: "Break line at point and indent, continuing comment if within one."
 
     define_keymap :PROGRAMMING_MODE_MAP
     PROGRAMMING_MODE_MAP.define_key("\t", :indent_line_command)

data/lib/textbringer/modes/transient_mark_mode.rb

@@ -28,6 +28,10 @@ module Textbringer
       :isearch_repeat_forward,
       :isearch_repeat_backward,
       :isearch_printing_char,
+      :isearch_delete_char,
+      :isearch_yank_word_or_char,
+      :isearch_quoted_insert,
+      :isearch_exit,
       # Undo/redo
       :undo,
       :redo_command,
@@ -36,8 +40,11 @@ module Textbringer
       :goto_char,
       :recenter,
       :move_to_beginning_of_line,
-      :move_to_end_of_line
-    ].to_set.freeze
+      :move_to_end_of_line,
+      # Other commands
+      :execute_command,
+      :eval_expression
+    ].to_set
 
     # Hook to deactivate mark before most commands
     PRE_COMMAND_HOOK = -> {

data/lib/textbringer/utils.rb

@@ -145,7 +145,8 @@ module Textbringer
           "Command attempted to use minibuffer while in minibuffer"
       end
       old_buffer = Buffer.current
-      old_window = Window.current
+      old_minibuffer_selected = Window.minibuffer_selected
+      Window.minibuffer_selected = Window.current
       old_completion_proc = Buffer.minibuffer[:completion_proc]
       old_completion_ignore_case = Buffer.minibuffer[:completion_ignore_case]
       old_current_prefix_arg = Controller.current.current_prefix_arg
@@ -176,10 +177,11 @@ module Textbringer
         Window.echo_area.redisplay
         Window.update
         Window.echo_area.active = false
-        Window.current = old_window
-        # Just in case old_window has been deleted by resize,
+        Window.current = Window.minibuffer_selected
+        # Just in case Window.minibuffer_selected has been deleted by resize,
         # in which case Window.current is set to the first window.
         Window.current.buffer = Buffer.current = old_buffer
+        Window.minibuffer_selected = old_minibuffer_selected
         Buffer.minibuffer[:completion_ignore_case] = old_completion_ignore_case
         Buffer.minibuffer[:completion_proc] = old_completion_proc
         Buffer.minibuffer.keymap = old_minibuffer_map
@@ -373,20 +375,22 @@ module Textbringer
       end
     end
 
-    def run_hooks(name, remove_on_error: false)
-      hooks = Buffer.current[:hooks]
-      run_hooks_in(hooks, name, remove_on_error:) if hooks
-      run_hooks_in(HOOKS, name, remove_on_error:)
+    def run_hooks(name, *args, remove_on_error: false)
+      if Buffer.current
+        hooks = Buffer.current[:hooks]
+        run_hooks_in(hooks, name, *args, remove_on_error:) if hooks
+      end
+      run_hooks_in(HOOKS, name, *args, remove_on_error:)
     end
 
-    def run_hooks_in(hooks, name, remove_on_error: false)
+    def run_hooks_in(hooks, name, *args, remove_on_error: false)
       hooks[name].delete_if do |func|
         begin
           case func
           when Symbol
-            send(func)
+            send(func, *args)
           else
-            func.call
+            func.call(*args)
           end
           false
         rescue Exception => e

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "17"
+  VERSION = "19"
 end

data/lib/textbringer/window.rb

@@ -20,6 +20,7 @@ module Textbringer
     @@started = false
     @@list = []
     @@current = nil
+    @@minibuffer_selected = nil
     @@echo_area = nil
     @@has_colors = false
 
@@ -45,6 +46,18 @@ module Textbringer
       Buffer.current = window.buffer
     end
 
+    class << self
+      alias selected current
+    end
+
+    def self.minibuffer_selected
+      @@minibuffer_selected
+    end
+
+    def self.minibuffer_selected=(window)
+      @@minibuffer_selected = window
+    end
+
     def self.delete_window(target = @@current)
       if target.echo_area?
         raise EditorError, "Can't delete the echo area"
@@ -117,6 +130,7 @@ module Textbringer
     def self.load_faces
       require_relative "faces/basic"
       require_relative "faces/programming"
+      require_relative "faces/completion"
     end
 
     def self.start
@@ -166,6 +180,15 @@ module Textbringer
         window.redisplay unless window.current?
       end
       current.redisplay
+      if defined?(FloatingWindow)
+        # Render floating windows on top
+        FloatingWindow.redisplay_all_floating
+        # Ensure cursor position is from the current window, not floating windows
+        # Refresh current window's cursor position after floating windows
+        if !FloatingWindow.floating_windows.empty?
+          current&.window&.noutrefresh
+        end
+      end
       update
     end
 
@@ -217,7 +240,7 @@ module Textbringer
     end
 
     attr_reader :buffer, :lines, :columns, :y, :x, :window, :mode_line
-    attr_reader :top_of_window, :bottom_of_window
+    attr_reader :top_of_window, :bottom_of_window, :cursor
 
     def initialize(lines, columns, y, x)
       @lines = lines
@@ -237,6 +260,7 @@ module Textbringer
       @key_buffer = []
       @cursor = Cursor.new(0, 0)
       @in_region = false
+      @in_isearch = false
       @current_highlight_attrs = 0
     end
 
@@ -297,6 +321,10 @@ module Textbringer
       self == @@current
     end
 
+    def current_or_minibuffer_selected?
+      self == @@current || self == @@minibuffer_selected
+    end
+
     def read_event
       key = get_char
       if key.is_a?(Integer)
@@ -408,18 +436,28 @@ module Textbringer
         @window.setpos(0, 0)
         @window.attrset(0)
         @in_region = false
+        @in_isearch = false
         @current_highlight_attrs = 0
-        if current? && @buffer.visible_mark &&
+        if current_or_minibuffer_selected? && @buffer.visible_mark &&
            @buffer.point_after_mark?(@buffer.visible_mark)
           @window.attron(region_attr)
           @in_region = true
         end
+        if current_or_minibuffer_selected? && @buffer.isearch_mark &&
+           @buffer.point_after_mark?(@buffer.isearch_mark)
+          # If already in region, switch to isearch (priority)
+          if @in_region
+            @window.attroff(region_attr)
+          end
+          @window.attron(isearch_attr)
+          @in_isearch = true
+        end
         while !@buffer.end_of_buffer?
           cury = @window.cury
           curx = @window.curx
           update_cursor_and_attr(point, cury, curx)
           if attrs = @highlight_off[@buffer.point]
-            if @in_region
+            if @in_region || @in_isearch
               # In region: only turn off non-color attributes (bold, underline, etc.)
               @window.attroff(attrs & ~Curses::A_COLOR)
             else
@@ -428,7 +466,7 @@ module Textbringer
             @current_highlight_attrs = 0
           end
           if attrs = @highlight_on[@buffer.point]
-            if @in_region
+            if @in_region || @in_isearch
               # In region: only turn on non-color attributes (preserve region background)
               @window.attron(attrs & ~Curses::A_COLOR)
             else
@@ -479,7 +517,10 @@ module Textbringer
           break if newx == columns && cury == lines - 2
           @buffer.forward_char
         end
-        if current? && @buffer.visible_mark
+        if current_or_minibuffer_selected? && @buffer.isearch_mark
+          @window.attroff(isearch_attr)
+        end
+        if current_or_minibuffer_selected? && @buffer.visible_mark
           @window.attroff(region_attr)
         end
         @buffer.mark_to_point(@bottom_of_window)
@@ -708,31 +749,82 @@ module Textbringer
       if @buffer.point_at_mark?(point)
         @cursor.y = cury
         @cursor.x = curx
-        if current? && @buffer.visible_mark
+        # Handle visible mark transitions
+        if current_or_minibuffer_selected? && @buffer.visible_mark
           if @buffer.point_after_mark?(@buffer.visible_mark)
-            @window.attroff(region_attr)
-            @in_region = false
-            # Restore syntax highlighting colors after exiting region
-            if @current_highlight_attrs != 0
-              @window.attron(@current_highlight_attrs)
+            unless @in_isearch
+              @window.attroff(region_attr)
+              # Restore syntax highlighting colors after exiting region
+              if @current_highlight_attrs != 0
+                @window.attron(@current_highlight_attrs)
+              end
             end
+            @in_region = false
           elsif @buffer.point_before_mark?(@buffer.visible_mark)
-            @window.attron(region_attr)
+            unless @in_isearch
+              @window.attron(region_attr)
+            end
             @in_region = true
           end
         end
+        # Handle isearch mark transitions
+        if current_or_minibuffer_selected? && @buffer.isearch_mark
+          if @buffer.point_after_mark?(@buffer.isearch_mark)
+            @window.attroff(isearch_attr)
+            @in_isearch = false
+            # If we were covering a region, restore it
+            if @in_region
+              @window.attron(region_attr)
+            elsif @current_highlight_attrs != 0
+              @window.attron(@current_highlight_attrs)
+            end
+          elsif @buffer.point_before_mark?(@buffer.isearch_mark)
+            # Entering isearch - turn off region if active
+            if @in_region
+              @window.attroff(region_attr)
+            end
+            @window.attron(isearch_attr)
+            @in_isearch = true
+          end
+        end
       end
-      if current? && @buffer.visible_mark &&
-         @buffer.point_at_mark?(@buffer.visible_mark)
+      # Handle transitions when point crosses isearch mark
+      if current_or_minibuffer_selected? && @buffer.isearch_mark &&
+         @buffer.point_at_mark?(@buffer.isearch_mark)
         if @buffer.point_after_mark?(point)
-          @window.attroff(region_attr)
-          @in_region = false
-          # Restore syntax highlighting colors after exiting region
-          if @current_highlight_attrs != 0
+          @window.attroff(isearch_attr)
+          @in_isearch = false
+          # If we have a region underneath, restore it
+          if @in_region
+            @window.attron(region_attr)
+          elsif @current_highlight_attrs != 0
             @window.attron(@current_highlight_attrs)
           end
         elsif @buffer.point_before_mark?(point)
-          @window.attron(region_attr)
+          # Entering isearch - turn off region if active
+          if @in_region
+            @window.attroff(region_attr)
+          end
+          @window.attron(isearch_attr)
+          @in_isearch = true
+        end
+      end
+      # Handle transitions when point crosses visible mark
+      if current_or_minibuffer_selected? && @buffer.visible_mark &&
+          @buffer.point_at_mark?(@buffer.visible_mark)
+        if @buffer.point_after_mark?(point)
+          unless @in_isearch
+            @window.attroff(region_attr)
+            # Restore syntax highlighting colors after exiting region
+            if @current_highlight_attrs != 0
+              @window.attron(@current_highlight_attrs)
+            end
+          end
+          @in_region = false
+        elsif @buffer.point_before_mark?(point)
+          unless @in_isearch
+            @window.attron(region_attr)
+          end
           @in_region = true
         end
       end
@@ -915,6 +1007,10 @@ module Textbringer
     def region_attr
       @@has_colors ? Face[:region].attributes : Curses::A_REVERSE
     end
+
+    def isearch_attr
+      @@has_colors ? Face[:isearch].attributes : Curses::A_UNDERLINE
+    end
   end
 
   class EchoArea < Window
@@ -963,6 +1059,7 @@ module Textbringer
         @window.setpos(0, 0)
         @window.attrset(0)
         @in_region = false
+        @in_isearch = false
         @current_highlight_attrs = 0
         if @message
           @window.addstr(escape(@message))

data/lib/textbringer.rb

@@ -4,10 +4,14 @@ require_relative "textbringer/errors"
 require_relative "textbringer/ring"
 require_relative "textbringer/buffer"
 require_relative "textbringer/window"
+require_relative "textbringer/floating_window"
 require_relative "textbringer/keymap"
 require_relative "textbringer/utils"
 require_relative "textbringer/color"
 require_relative "textbringer/face"
+require_relative "textbringer/completion_popup"
+require_relative "textbringer/lsp/client"
+require_relative "textbringer/lsp/server_registry"
 require_relative "textbringer/commands"
 require_relative "textbringer/commands/buffers"
 require_relative "textbringer/commands/windows"
@@ -27,6 +31,8 @@ require_relative "textbringer/commands/server"
 require_relative "textbringer/commands/input_method"
 require_relative "textbringer/commands/ucs_normalize"
 require_relative "textbringer/commands/help"
+require_relative "textbringer/commands/completion"
+require_relative "textbringer/commands/lsp"
 require_relative "textbringer/mode"
 require_relative "textbringer/modes/fundamental_mode"
 require_relative "textbringer/modes/programming_mode"
@@ -44,6 +50,7 @@ require_relative "textbringer/input_method"
 require_relative "textbringer/input_methods/t_code_input_method"
 require_relative "textbringer/input_methods/hiragana_input_method"
 require_relative "textbringer/input_methods/hangul_input_method"
+require_relative "textbringer/input_methods/skk_input_method"
 require_relative "textbringer/plugin"
 require_relative "textbringer/controller"
 require_relative "textbringer/default_output"