textbringer 0.1.8 → 0.1.9

data/lib/textbringer/modes/help_mode.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Textbringer
+  class HelpMode < Mode
+    define_generic_command :jump_to_link
+
+    HELP_MODE_MAP = Keymap.new
+    HELP_MODE_MAP.define_key(?\C-m, :jump_to_link_command)
+    HELP_MODE_MAP.define_key(?l, :help_go_back)
+    HELP_MODE_MAP.define_key("\C-c\C-b", :help_go_back)
+    HELP_MODE_MAP.define_key(?r, :help_go_forward)
+    HELP_MODE_MAP.define_key("\C-c\C-f", :help_go_forward)
+
+    define_syntax :link, /
+      (?: ^\S*?:\d+$ ) |
+      (?: \[[_a-zA-Z][_a-zA-Z0-9]*\] )
+    /x
+
+    def initialize(buffer)
+      super(buffer)
+      buffer.keymap = HELP_MODE_MAP
+    end
+
+    def jump_to_link
+      @buffer.save_excursion do
+        @buffer.skip_re_backward(/[_a-zA-Z0-9]/)
+        if @buffer.char_before == ?[ &&
+            @buffer.looking_at?(/([_a-zA-Z][_a-zA-Z0-9]*)\]/)
+          describe_command(match_string(1))
+        else
+          @buffer.beginning_of_line
+          if @buffer.looking_at?(/^(\S*?):(\d+)$/)
+            file_name = @buffer.match_string(1)
+            line_number = @buffer.match_string(2).to_i
+            find_file(file_name)
+            goto_line(line_number)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/textbringer/modes/programming_mode.rb

@@ -6,7 +6,8 @@ module Textbringer
     undefine_command(:programming_mode)
 
     define_generic_command :indent_line
-    define_generic_command :newline_and_reindent
+    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
@@ -14,7 +15,9 @@ module Textbringer
 
     PROGRAMMING_MODE_MAP = Keymap.new
     PROGRAMMING_MODE_MAP.define_key("\t", :indent_line_command)
-    PROGRAMMING_MODE_MAP.define_key("\C-m", :newline_and_reindent_command)
+    PROGRAMMING_MODE_MAP.define_key("\C-m",
+                                    :reindent_then_newline_and_indent_command)
+    PROGRAMMING_MODE_MAP.define_key("\e\C-\\", :indent_region_command)
     PROGRAMMING_MODE_MAP.define_key("\C-c\C-n", :forward_definition_command)
     PROGRAMMING_MODE_MAP.define_key("\C-c\C-p", :backward_definition_command)
     PROGRAMMING_MODE_MAP.define_key("\C-c\C-c", :compile_command)
@@ -32,18 +35,16 @@ module Textbringer
       return result if level.nil?
       @buffer.save_excursion do
         @buffer.beginning_of_line
-        has_space = @buffer.looking_at?(/[ \t]+/)
-        if has_space
-          s = @buffer.match_string(0)
-          break if /\t/ !~ s && s.size == level
-          @buffer.delete_region(@buffer.match_beginning(0),
-                                @buffer.match_end(0))
-        else
-          break if level == 0
-        end
-        @buffer.indent_to(level)
-        if has_space
-          @buffer.merge_undo(2)
+        @buffer.composite_edit do
+          if @buffer.looking_at?(/[ \t]+/)
+            s = @buffer.match_string(0)
+            break if /\t/ !~ s && s.size == level
+            @buffer.delete_region(@buffer.match_beginning(0),
+                                  @buffer.match_end(0))
+          else
+            break if level == 0
+          end
+          @buffer.indent_to(level)
         end
         result = true
       end
@@ -56,24 +57,30 @@ module Textbringer
       result
     end
 
-    def newline_and_reindent
-      n = 1
-      if indent_line
-        n += 1
+    def reindent_then_newline_and_indent
+      @buffer.composite_edit do
+        indent_line
+        @buffer.save_excursion do
+          pos = @buffer.point
+          @buffer.beginning_of_line
+          if /\A[ \t]+\z/ =~ @buffer.substring(@buffer.point, pos)
+            @buffer.delete_region(@buffer.point, pos)
+          end
+        end
+        @buffer.insert("\n")
+        indent_line
       end
+    end
+
+    def indent_region(s = @buffer.mark, e = @buffer.point)
+      s, e = Buffer.region_boundaries(s, e)
       @buffer.save_excursion do
-        pos = @buffer.point
-        @buffer.beginning_of_line
-        if /\A[ \t]+\z/ =~ @buffer.substring(@buffer.point, pos)
-          @buffer.delete_region(@buffer.point, pos)
-          n += 1
+        @buffer.goto_char(s)
+        while @buffer.point < e
+          indent_line
+          @buffer.forward_line
         end
       end
-      @buffer.insert("\n")
-      if indent_line
-        n += 1
-      end
-      @buffer.merge_undo(n) if n > 1
     end
 
     private

data/lib/textbringer/modes/ruby_mode.rb

@@ -27,13 +27,24 @@ module Textbringer
     /x
 
     define_syntax :string, /
-      (?: (?<! [a-zA-Z] ) \? (:? [^\\\s] | \\ . ) ) |
-      (?: %[qQrwWsix]?\{ (?: [^\\}] | \\ .  )* \} ) |
-      (?: %[qQrwWsix]?\( (?: [^\\)] | \\ .  )* \) ) |
-      (?: %[qQrwWsix]?\[ (?: [^\\\]] | \\ .  )* \] ) |
-      (?: %[qQrwWsix]?< (?: [^\\>] | \\ .  )* > ) |
+      (?: (?<! [a-zA-Z] ) \?
+              (:?
+                [^\\\s] |
+                \\ [0-7]{1,3} |
+                \\x [0-9a-fA-F]{2} |
+                \\u [0-9a-fA-F]{4} |
+                \\u \{ [0-9a-fA-F]+ \} |
+                \\C - . |
+                \\M - . |
+                \\ .
+              )
+      ) |
+      (?: %[qQrwWsiIx]?\{ (?: [^\\}] | \\ .  )* \} ) |
+      (?: %[qQrwWsiIx]?\( (?: [^\\)] | \\ .  )* \) ) |
+      (?: %[qQrwWsiIx]?\[ (?: [^\\\]] | \\ .  )* \] ) |
+      (?: %[qQrwWsiIx]?< (?: [^\\>] | \\ .  )* > ) |
       (?:
-         %[qQrwWsix]?
+         %[qQrwWsiIx]?
              (?<string_delimiter>[^{(\[<a-zA-Z0-9\s\u{0100}-\u{10ffff}])
              (?: (?! \k<string_delimiter> ) [^\\] | \\ .  )*
              \k<string_delimiter>
@@ -61,13 +72,18 @@ module Textbringer
       ) |
       (?:
         (?<! class | class \s | [\]})"'.] | :: | \w )
-            <<-?(?<heredoc_quote>['"`]?)
+            <<[\-~]?(?<heredoc_quote>['"`]?)
             (?<heredoc_terminator>
-              [_a-zA-Z\u{0100}-\u{10ffff}]
-              [_a-zA-Z0-9\u{0100}-\u{10ffff}]*
+              (?> [_a-zA-Z\u{0100}-\u{10ffff}]
+                  [_a-zA-Z0-9\u{0100}-\u{10ffff}]* )
             )
             \k<heredoc_quote>
-            (?> (?:.|\n)*? \k<heredoc_terminator> )
+            (?> (?:.|\n)*? ^ [\ \t]* \k<heredoc_terminator> $ )
+      ) |
+      (?:
+        (?<! : ) :
+            [_a-zA-Z\u{0100}-\u{10ffff}]
+            [_a-zA-Z0-9\u{0100}-\u{10ffff}]*
       )
     /x
 
@@ -256,6 +272,8 @@ module Textbringer
         (line, column), event, text = tokens[i]
         case event
         when :on_kw
+          _, prev_event, _ = tokens[i - 1]
+          next if prev_event == :on_symbeg
           case text
           when "class", "module", "def", "if", "unless", "case",
             "do", "for", "while", "until", "begin"

data/lib/textbringer/plugin.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Textbringer
+  module Plugin
+    def self.load_plugins
+      files = Gem.find_files("textbringer_plugin.rb")
+      files.group_by { |file|
+        file.slice(/([^\/]+)-[\w.]+\/lib\/textbringer_plugin\.rb\z/, 1)
+      }.map { |gem, versions|
+        versions.sort_by { |version|
+          v = version.slice(/[^\/]+-([\w.]+)\/lib\/textbringer_plugin\.rb\z/,
+                            1)
+          Gem::Version.create(v)
+        }.last
+      }.each do |file|
+        load(file)
+      end
+    end
+  end
+end
+

data/lib/textbringer/ring.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+module Textbringer
+  class Ring
+    include Enumerable
+
+    def initialize(max = 30, on_delete: ->(x) {})
+      @max = max
+      @ring = []
+      @current = -1
+      @on_delete = on_delete
+    end
+
+    def clear
+      @ring.clear
+      @current = -1
+    end
+
+    def push(obj)
+      @current += 1
+      if @ring.size < @max
+        @ring.insert(@current, obj)
+      else
+        if @current == @max
+          @current = 0
+        end
+        @on_delete.call(@ring[@current])
+        @ring[@current] = obj
+      end
+    end
+
+    def pop
+      x = @ring[@current]
+      rotate(1)
+      x
+    end
+
+    def current
+      if @ring.empty?
+        raise EditorError, "Ring is empty"
+      end
+      @ring[@current]
+    end
+
+    def rotate(n)
+      @current = get_index(n)
+      @ring[@current]
+    end
+
+    def [](n = 0)
+      @ring[get_index(n)]
+    end
+
+    def empty?
+      @ring.empty?
+    end
+
+    def size
+      @ring.size
+    end
+
+    def each(&block)
+      @ring.each(&block)
+    end
+
+    def to_a
+      @ring.to_a
+    end
+
+    private
+
+    def get_index(n)
+      if @ring.empty?
+        raise EditorError, "Ring is empty"
+      end
+      i = @current - n
+      if 0 <= i && i < @ring.size
+        i
+      else
+        i % @ring.size
+      end
+    end
+  end
+end

data/lib/textbringer/utils.rb

@@ -231,6 +231,34 @@ module Textbringer
       read_from_minibuffer(prompt + " (#{char_options}) ", keymap: map)
     end
 
+    def read_key_sequence(prompt)
+      buffer = Buffer.current
+      key_sequence = []
+      map = Keymap.new
+      map.define_key("\C-g", :abort_recursive_edit)
+      map.handle_undefined_key do |key|
+        -> {
+          key_sequence.push(key)
+          cmd = buffer.keymap&.lookup(key_sequence) ||
+            GLOBAL_MAP.lookup(key_sequence)
+          if !cmd.is_a?(Keymap)
+            exit_recursive_edit
+          end
+          Buffer.current.clear
+          keys = Keymap.key_sequence_string(key_sequence)
+          Buffer.current.insert("#{keys}-")
+        }
+      end
+      read_from_minibuffer(prompt, keymap: map)
+      if buffer.keymap&.lookup(key_sequence) ||
+          GLOBAL_MAP.lookup(key_sequence)
+        key_sequence
+      else
+        keys = Keymap.key_sequence_string(key_sequence)
+        raise EditorError, "#{keys} is undefined"
+      end
+    end
+
     HOOKS = Hash.new { |h, k| h[k] = [] }
 
     def add_hook(name, func)

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/lib/textbringer/window.rb

@@ -184,6 +184,7 @@ module Textbringer
     end
 
     def self.redisplay
+      return if Controller.current.executing_keyboard_macro?
       return if Window.current.has_input?
       @@windows.each do |window|
         window.redisplay unless window.current?
@@ -615,6 +616,25 @@ module Textbringer
       end
     end
 
+    def shrink(n)
+      enlarge(-n)
+    end
+
+    def shrink_if_larger_than_buffer
+      @buffer.save_point do
+        @buffer.end_of_buffer
+        @buffer.skip_re_backward(/\s/)
+        count = beginning_of_line_and_count(Window.lines) + 1
+        while !@buffer.beginning_of_buffer?
+          @buffer.backward_char
+          count += beginning_of_line_and_count(Window.lines) + 1
+        end
+        if lines - 1 > count
+          shrink(lines - 1 - count)
+        end
+      end
+    end
+
     private
 
     def initialize_window(num_lines, num_columns, y, x)
@@ -802,6 +822,7 @@ module Textbringer
 
     def clear
       @buffer.clear
+      @top_of_window.location = @buffer.point_min
       @message = nil
       @prompt = ""
     end
@@ -824,19 +845,25 @@ module Textbringer
         else
           prompt = escape(@prompt)
           @window.addstr(prompt)
+          framer
+          @buffer.point_to_mark(@top_of_window)
           y = x = 0
-          columns = @columns - Buffer.display_width(prompt)
-          beginning_of_line_and_count(1, columns)
           while !@buffer.end_of_buffer?
+            cury, curx = @window.cury, @window.curx
             if @buffer.point_at_mark?(saved)
-              y, x = @window.cury, @window.curx
+              y, x = cury, curx
             end
             c = @buffer.char_after
             if c == "\n"
               break
             end
-            @window.addstr(escape(c))
-            break if @window.curx == @columns
+            s = escape(c)
+            newx = curx + Buffer.display_width(s)
+            if newx > @columns
+              break
+            end
+            @window.addstr(s)
+            break if newx >= @columns
             @buffer.forward_char
           end
           if @buffer.point_at_mark?(saved)
@@ -869,5 +896,32 @@ module Textbringer
     def initialize_window(num_lines, num_columns, y, x)
       @window = Curses::Window.new(num_lines, num_columns, y, x)
     end
+
+    def escape(s)
+      super(s).gsub(/\t/, "^I")
+    end
+
+    def framer
+      @buffer.save_point do |saved|
+        max_width = @columns - @window.curx
+        width = 0
+        loop do
+          c = @buffer.char_after
+          if c.nil?
+            width += 1
+          else
+            width += Buffer.display_width(escape(c))
+          end
+          if width > max_width
+            @buffer.forward_char
+            break
+          elsif width == max_width || @buffer.beginning_of_line?
+            break
+          end
+          @buffer.backward_char
+        end
+        @top_of_window.location = @buffer.point
+      end
+    end
   end
 end