textbringer 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47f6bdcfb6e14bb36f75020192ade797779ea21a
-  data.tar.gz: 3e6b0199920134c9cbf6a88997496b14e5c5184c
+  metadata.gz: c4c0499915d9509f0f2ef8d8b30b8a3c87955c9c
+  data.tar.gz: 017b6339f497de93887ee252df2b1da9b3c20bae
 SHA512:
-  metadata.gz: e35304f6ffb881675a412b3d9b89cbe0841b6fb8092c59817391711b18115f73e6840e54f78f652347ebd2e22980f9067f45fa23407891626ea82cd08e5bbbe4
-  data.tar.gz: 3d30200f3833a1686a9ef6f33efec6e613bb247c4b446cae42fe3f31bc59e4c698431ce43f1a0e033303bd881e63df002f97845f7c4c938b263f94da9b8a1723
+  metadata.gz: 813608d1b0cd0f5a120256a49f5509a75f0d4c8a05c1f803e3b6625f8161f3a249a944fc447e16dc50eb9fb9754f2e8b6ab2d55bca0df4ef9a45887151d04637
+  data.tar.gz: a3b1267f21be52ef1e9136cc530cf7b0f0cd158d636940d0143980b79a54ef96cefbb354aae2e9eb877942097ee90044e2e8d4991cbfb55671c5f049fc8bb365

data/CHANGES.md

@@ -1,3 +1,10 @@
+## 0.1.4
+
+* Add dabbrev_expand (M-/).
+* Add find_tag (M-.) and pop_tag_mark (M-*).
+* Add toggle_test_command (C-c t).
+* Force binmode for Windows.
+
 ## 0.1.3
 
 * Fix an infinite loop bug on Windows.

data/Guardfile

@@ -0,0 +1,22 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Uncomment and set this to only include directories you want to watch
+# directories %w(app lib config test spec features) \
+#  .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")}
+
+## Note: if you are using the `directories` clause above and you are not
+## watching the project directory ('.'), then you will want to move
+## the Guardfile to a watched dir and symlink it back, e.g.
+#
+#  $ mkdir config
+#  $ mv Guardfile config/
+#  $ ln -s config/Guardfile .
+#
+# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
+
+guard :shell do
+  watch(%r'^(lib|test)/.+\.rb$') do
+    `ripper-tags -R`
+  end
+end

data/README.md

@@ -1,6 +1,8 @@
 # Textbringer
 
+[![Gem Version](https://badge.fury.io/rb/textbringer.svg)](https://badge.fury.io/rb/textbringer)
 [![Build Status](https://travis-ci.org/shugo/textbringer.svg?branch=master)](https://travis-ci.org/shugo/textbringer)
+[![Build status](https://ci.appveyor.com/api/projects/status/n20vtpfgcgii5jtc?svg=true)](https://ci.appveyor.com/project/shugo31737/textbringer)
 
 Textbringer is a member of a demon race that takes on the form of a text
 editor.
@@ -9,6 +11,14 @@ editor.
 
 [![asciicast](https://asciinema.org/a/100156.png)](https://asciinema.org/a/100156)
 
+## WARNING
+
+Textbringer is beta software, and you may lose your text.  Unsaved buffers will
+be dumped in ~/.textbringer/buffer_dump on crash.
+
+APIs are undocumented and unstable.  There is no compatibility even in the same
+minor versions.
+
 ## Installation
 
     $ gem install textbringer

data/Rakefile

@@ -6,4 +6,5 @@ Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = FileList["test/**/test_*.rb"]
   t.verbose = true
+  t.warning = true
 end

data/appveyor.yml

@@ -0,0 +1,13 @@
+---
+clone_depth: 10
+install:
+  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
+  - gem install bundler --no-document
+  - bundle install
+build: off
+test_script:
+  - rake
+deploy: off
+environment:
+  matrix:
+    - ruby_version: "23-x64"

data/lib/textbringer.rb

@@ -6,5 +6,7 @@ require_relative "textbringer/window"
 require_relative "textbringer/keymap"
 require_relative "textbringer/utils"
 require_relative "textbringer/commands"
+require_relative "textbringer/commands/dabbrev"
+require_relative "textbringer/commands/ctags"
 require_relative "textbringer/modes"
 require_relative "textbringer/controller"

data/lib/textbringer/buffer.rb

@@ -122,8 +122,8 @@ module Textbringer
 
     def self.find_file(file_name)
       file_name = File.expand_path(file_name)
-      buffer = @@table.each_value.find { |buffer|
-        buffer.file_name == file_name
+      buffer = @@table.each_value.find { |b|
+        b.file_name == file_name
       }
       if buffer.nil?
         name = File.basename(file_name)
@@ -154,7 +154,7 @@ module Textbringer
     end
 
     def self.each(&block)
-      @@table.each_value(&block)
+      @@list.each(&block)
     end
 
     def self.display_width(s)
@@ -164,7 +164,8 @@ module Textbringer
 
     # s might not be copied.
     def initialize(s = String.new, name: nil,
-                   file_name: nil, file_encoding: Encoding::UTF_8,
+                   file_name: nil,
+                   file_encoding: CONFIG[:default_file_encoding],
                    file_mtime: nil, new_file: true, undo_limit: UNDO_LIMIT,
                    read_only: false)
       case s.encoding
@@ -188,7 +189,7 @@ module Textbringer
         @file_format = :dos
         @contents.gsub!(/\r/, "")
       else
-        @file_format = :unix
+        @file_format = CONFIG[:default_file_format]
       end
       @new_file = new_file
       @undo_limit = undo_limit
@@ -206,7 +207,7 @@ module Textbringer
       @undoing = false
       @version = 0
       @modified = false
-      @mode = nil
+      @mode = FundamentalMode.new(self)
       @keymap = nil
       @attributes = {}
       @save_point_level = 0
@@ -303,7 +304,9 @@ module Textbringer
     end
 
     def self.open(file_name, name: File.basename(file_name))
-      s, mtime = File.open(file_name) { |f|
+      s, mtime = File.open(file_name,
+                           external_encoding: Encoding::ASCII_8BIT,
+                           binmode: true) { |f|
         f.flock(File::LOCK_SH)
         [f.read, f.mtime]
       }
@@ -324,7 +327,8 @@ module Textbringer
       end
       file_name = File.expand_path(file_name)
       begin
-        File.open(file_name, "w", external_encoding: @file_encoding) do |f|
+        File.open(file_name, "w",
+                  external_encoding: @file_encoding, binmode: true) do |f|
           f.flock(File::LOCK_EX)
           write_to_file(f)
           f.flush
@@ -394,6 +398,19 @@ module Textbringer
       end
     end
 
+    def char_before(location = @point)
+      if @binary
+        byte_before(location)
+      else
+        if beginning_of_buffer?
+          nil
+        else
+          pos = get_pos(location, -1)
+          substring(pos, location)
+        end
+      end
+    end
+
     def bytesize
       @contents.bytesize - gap_size
     end
@@ -549,28 +566,28 @@ module Textbringer
       forward_char(-n)
     end
 
-    def forward_word(n = 1)
+    def forward_word(n = 1, regexp: /\p{Letter}|\p{Number}/)
       n.times do
-        while !end_of_buffer? && /\p{Letter}|\p{Number}/ !~ char_after
+        while !end_of_buffer? && regexp !~ char_after
           forward_char
         end
-        while !end_of_buffer? && /\p{Letter}|\p{Number}/ =~ char_after
+        while !end_of_buffer? && regexp =~ char_after
           forward_char
         end
       end
     end
 
-    def backward_word(n = 1)
+    def backward_word(n = 1, regexp: /\p{Letter}|\p{Number}/)
       n.times do
         break if beginning_of_buffer?
         backward_char
-        while !beginning_of_buffer? && /\p{Letter}|\p{Number}/ !~ char_after
+        while !beginning_of_buffer? && regexp !~ char_after
           backward_char
         end
-        while !beginning_of_buffer? && /\p{Letter}|\p{Number}/ =~ char_after
+        while !beginning_of_buffer? && regexp =~ char_after
           backward_char
         end
-        if /\p{Letter}|\p{Number}/ !~ char_after
+        if regexp !~ char_after
           forward_char
         end
       end
@@ -914,26 +931,38 @@ module Textbringer
       end
     end
 
-    def re_search_forward(s)
+    def re_search_forward(s, raise_error: true)
       re = new_regexp(s)
       i = byteindex(true, re, @point)
       if i.nil?
-        raise SearchError, "Search failed"
+        if raise_error
+          raise SearchError, "Search failed"
+        else
+          return nil
+        end
       end
       goto_char(match_end(0))
     end
 
-    def re_search_backward(s)
+    def re_search_backward(s, raise_error: true)
       re = new_regexp(s)
       pos = @point
       begin
         i = byteindex(false, re, pos)
         if i.nil?
-          raise SearchError, "Search failed"
+          if raise_error
+            raise SearchError, "Search failed"
+          else
+            return nil
+          end
         end
         pos = get_pos(pos, -1)
       rescue RangeError
-        raise SearchError, "Search failed"
+        if raise_error
+          raise SearchError, "Search failed"
+        else
+          return nil
+        end
       end while match_end(0) > @point
       goto_char(match_beginning(0))
     end
@@ -1096,19 +1125,19 @@ module Textbringer
     end
 
     def dump(path)
-      File.write(path, to_s)
+      File.binwrite(path, to_s)
       metadata = {
         "name" => name,
         "file_name" => file_name,
         "file_encoding" => file_encoding.name,
         "file_format" => file_format.to_s
       }
-      File.write(path + ".metadata", metadata.to_json)
+      File.binwrite(path + ".metadata", metadata.to_json)
     end
 
     def self.load(path)
-      buffer = Buffer.new(File.read(path))
-      metadata = JSON.parse(File.read(path + ".metadata"))
+      buffer = Buffer.new(File.binread(path))
+      metadata = JSON.parse(File.binread(path + ".metadata"))
       buffer.name = metadata["name"]
       buffer.file_name = metadata["file_name"] if metadata["file_name"]
       buffer.file_encoding = Encoding.find(metadata["file_encoding"])
@@ -1141,6 +1170,24 @@ module Textbringer
       end
     end
 
+    def current_symbol
+      from = save_point { skip_re_backward(@mode.symbol_pattern); @point }
+      to = save_point { skip_re_forward(@mode.symbol_pattern); @point }
+      from < to ? substring(from, to) : nil
+    end
+
+    def skip_re_forward(re)
+      while re =~ char_after
+        forward_char
+      end
+    end
+
+    def skip_re_backward(re)
+      while re =~ char_before
+        backward_char
+      end
+    end
+
     private
 
     def adjust_gap(min_size = 0, pos = @point)
@@ -1293,6 +1340,7 @@ module Textbringer
   end
 
   class Mark
+    attr_reader :buffer
     attr_accessor :location
 
     def initialize(buffer, location)

data/lib/textbringer/commands.rb

@@ -52,7 +52,6 @@ module Textbringer
       :end_of_line,
       :beginning_of_buffer,
       :end_of_buffer,
-      :set_mark,
       :exchange_point_and_mark,
       :copy_region,
       :kill_region,
@@ -66,6 +65,11 @@ module Textbringer
       end
     end
 
+    define_command(:set_mark_command) do
+      Buffer.current.set_mark
+      message("Mark set")
+    end
+
     define_command(:goto_char) do
       |n = read_from_minibuffer("Go to char: ")|
       Buffer.current.goto_char(n.to_i)
@@ -125,6 +129,13 @@ module Textbringer
       Buffer.current.re_search_forward(s)
     end
 
+    define_command(:re_search_backward) do
+      |s = read_from_minibuffer("RE search backward: ",
+                                default: RE_SEARCH_STATUS[:last_regexp])|
+      RE_SEARCH_STATUS[:last_regexp] = s
+      Buffer.current.re_search_backward(s)
+    end
+
     def match_beginning(n)
       Buffer.current.match_beginning(n)
     end
@@ -143,7 +154,7 @@ module Textbringer
 
     define_command(:query_replace_regexp) do
       |regexp = read_from_minibuffer("Query replace regexp: "),
-       to_str = read_from_minibuffer("Query replace regexp #{regexp} with: ")|
+       to_str = read_from_minibuffer("with: ")|
       n = 0
       begin
         loop do
@@ -255,9 +266,15 @@ module Textbringer
         message("New file")
       end
       switch_to_buffer(buffer)
-      mode = Mode.list.find { |mode|
-        mode.file_name_pattern &&
-          mode.file_name_pattern =~ File.basename(buffer.file_name)
+      shebang = buffer.save_excursion {
+        buffer.beginning_of_buffer
+        buffer.looking_at?(/#!.*$/) ? buffer.match_string(0) : nil
+      }
+      mode = Mode.list.find { |m|
+        (m.file_name_pattern &&
+         m.file_name_pattern =~ File.basename(buffer.file_name)) ||
+          (m.interpreter_name_pattern &&
+           m.interpreter_name_pattern =~ shebang)
       } || FundamentalMode
       send(mode.command_name)
     end
@@ -630,7 +647,12 @@ module Textbringer
       Window.redisplay
       signals = [:INT, :TERM, :KILL]
       begin
-        Open3.popen2e(cmd, pgroup: true) do |input, output, wait_thread|
+        if /mswin32|mingw32/ =~ RUBY_PLATFORM
+          opts = {}
+        else
+          opts = {pgroup: true}
+        end
+        Open3.popen2e(cmd, opts) do |input, output, wait_thread|
           input.close
           loop do
             status = output.wait_readable(0.5)
@@ -639,7 +661,8 @@ module Textbringer
             end
             if status
               begin
-                s = output.read_nonblock(1024)
+                s = output.read_nonblock(1024).force_encoding("utf-8").
+                  scrub("\u{3013}").gsub(/\r\n/, "\n")
                 buffer.insert(s)
                 Window.redisplay
               rescue EOFError

data/lib/textbringer/commands/ctags.rb

@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+module Textbringer
+  module Commands
+    GLOBAL_MAP.define_key("\e.", :find_tag)
+    GLOBAL_MAP.define_key("\e*", :pop_tag_mark)
+
+    CTAGS = {
+      path: nil,
+      tags: nil,
+      tags_mtime: nil,
+      name: nil,
+      candidates: nil,
+      index: nil,
+      tag_mark_stack: []
+    }
+    TAG_MARK_LIMIT = 16
+
+    define_command(:find_tag) do |next_p = current_prefix_arg|
+      tags = get_tags
+      if next_p
+        name = CTAGS[:name]
+        if name.nil?
+          raise EditorError, "Tag search not started yet"
+        end
+        candidates = CTAGS[:candidates]
+        index = CTAGS[:index]
+        if next_p == :-
+          index -= 1
+        else
+          index += 1
+        end
+        if index < 0
+          raise EditorError, "No previous tags for #{name}"
+        end
+        if index >= candidates.size
+          raise EditorError, "No more tags for #{name}"
+        end
+      else
+        buffer = Buffer.current
+        name = buffer.current_symbol
+        if name.nil?
+          raise EditorError, "No name found at point"
+        end
+        candidates = tags[name]
+        if candidates.empty?
+          raise EditorError, "Tag not found: #{name}"
+        end
+        CTAGS[:name] = name
+        CTAGS[:candidates] = candidates
+        index = 0
+      end
+      tag_mark_stack = CTAGS[:tag_mark_stack]
+      if tag_mark_stack.size == TAG_MARK_LIMIT
+        mark = tag_mark_stack.shift
+        mark.delete
+      end
+      tag_mark_stack.push(Buffer.current.new_mark)
+      file, addr, n = candidates[index]
+      find_file(file)
+      case addr
+      when /\A\d+\z/
+        goto_line(addr.to_i)
+      when %r'\A/\^(.*)\$/\z'
+        beginning_of_buffer
+        n.times do
+          re_search_forward("^" + Regexp.quote($1) + "$")
+        end
+        beginning_of_line
+      when %r'\A\?\^(.*)\$\?\z'
+        end_of_buffer
+        n.times do
+          re_search_backward("^" + Regexp.quote($1) + "$")
+        end
+      else
+        raise EditorError, "Invalid address: #{addr}"
+      end
+      CTAGS[:index] = index
+      Window.current.recenter_if_needed
+    end
+
+    def get_tags
+      path = File.expand_path("tags")
+      mtime = File.mtime(path)
+      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
+          |name, file, addr|
+          n = tags[name].count { |f,| f == file } + 1
+          tags[name].push([file, addr, n])
+        end
+        CTAGS[:tags] = tags
+        CTAGS[:tags_mtime] = mtime
+        message("Loaded #{path}")
+      end
+      CTAGS[:tags]
+    end
+
+    define_command(:pop_tag_mark) do
+      tag_mark_stack = CTAGS[:tag_mark_stack]
+      if tag_mark_stack.empty?
+        raise EditorError, "No previous locations"
+      end
+      mark = tag_mark_stack.pop
+      begin
+        switch_to_buffer(mark.buffer)
+        mark.buffer.point_to_mark(mark)
+      ensure
+        mark.delete
+      end
+    end
+  end
+end

data/lib/textbringer/commands/dabbrev.rb

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+module Textbringer
+  using Module.new {
+    refine Buffer do
+      def dabbrev_expand(contd)
+        if contd && self[:dabbrev_stem]
+          buffers = self[:dabbrev_buffers]
+          buffer = self[:dabbrev_buffer]
+          stem = self[:dabbrev_stem]
+          pos = self[:dabbrev_pos]
+          direction = self[:dabbrev_direction]
+          candidates = self[:dabbrev_candidates]
+        else
+          buffers = Buffer.to_a
+          buffer = buffers.pop
+          stem = save_excursion {
+            pos = point
+            backward_word(regexp: /[\p{Letter}\p{Number}_\-]/)
+            substring(point, pos)
+          }
+          if stem.empty?
+            raise "No possible abbreviation"
+          end
+          pos = point
+          direction = :backward
+          candidates = []
+        end
+        candidates_exclusion = candidates.empty? ? "" :
+          "(?!(?:" + candidates.map { |s|
+            Regexp.quote(s)
+          }.join("|") + ")\\b)"
+        re = /\b#{Regexp.quote(stem)}#{candidates_exclusion}
+              ([\p{Letter}\p{Number}_\-]+)/x
+        candidate = nil
+        loop do
+          pos, candidate = buffer.dabbrev_search(re, pos, direction)
+          if pos
+            break
+          else
+            if direction == :backward
+              pos = buffer.point
+              direction = :forward
+            else
+              buffer = buffers.pop
+              if buffer
+                pos = buffer.point
+                direction = :backward
+              else
+                break
+              end
+            end
+          end
+        end
+        if !candidates.empty?
+          undo
+        end
+        if candidate
+          candidates.push(candidate)
+          insert(candidate)
+        else
+          self[:dabbrev_stem] = nil
+          raise EditorError, "No more abbreviation"
+        end
+        self[:dabbrev_buffers] = buffers
+        self[:dabbrev_buffer] = buffer
+        self[:dabbrev_stem] = stem
+        self[:dabbrev_pos] = pos
+        self[:dabbrev_direction] = direction
+        self[:dabbrev_candidates] = candidates
+      end
+
+      def dabbrev_search(re, pos, direction)
+        re_search_method = direction == :forward ?
+          :re_search_forward : :re_search_backward
+        save_excursion do
+          goto_char(pos)
+          if send(re_search_method, re, raise_error: false)
+            [point, match_string(1)]
+          else
+            nil
+          end
+        end
+      end
+    end
+  }
+
+  module Commands
+    GLOBAL_MAP.define_key("\e/", :dabbrev_expand_command)
+
+    define_command(:dabbrev_expand_command) do
+      contd = Controller.current.last_command == :dabbrev_expand_command
+      Buffer.current.dabbrev_expand(contd)
+    end
+  end
+end

data/lib/textbringer/config.rb

@@ -2,9 +2,11 @@
 
 module Textbringer
   CONFIG = {
-    buffer_dump_dir: File.expand_path("~/.textbringer/buffer_dump"),
+    default_file_encoding: Encoding::UTF_8,
+    default_file_format: :unix,
     tab_width: 8,
     indent_tabs_mode: false,
-    case_fold_search: true
+    case_fold_search: true,
+    buffer_dump_dir: File.expand_path("~/.textbringer/buffer_dump")
   }
 end

data/lib/textbringer/controller.rb

@@ -58,7 +58,7 @@ module Textbringer
               end
             else
               if cmd.nil?
-                keys = @key_sequence.map { |c| key_name(c) }.join(" ")
+                keys = @key_sequence.map { |ch| key_name(ch) }.join(" ")
                 @key_sequence.clear
                 Window.echo_area.show("#{keys} is undefined")
               end

data/lib/textbringer/keymap.rb

@@ -85,7 +85,7 @@ module Textbringer
   end
   GLOBAL_MAP.define_key(?\t, :self_insert)
   GLOBAL_MAP.define_key(?\C-q, :quoted_insert)
-  GLOBAL_MAP.define_key("\C- ", :set_mark)
+  GLOBAL_MAP.define_key("\C- ", :set_mark_command)
   GLOBAL_MAP.define_key("\C-x\C-x", :exchange_point_and_mark)
   GLOBAL_MAP.define_key("\ew", :copy_region)
   GLOBAL_MAP.define_key(?\C-w, :kill_region)
@@ -121,6 +121,7 @@ module Textbringer
   GLOBAL_MAP.define_key(?\C-g, :keyboard_quit)
   GLOBAL_MAP.define_key(?\C-s, :isearch_forward)
   GLOBAL_MAP.define_key(?\C-r, :isearch_backward)
+  GLOBAL_MAP.define_key("\e%", :query_replace_regexp)
   GLOBAL_MAP.define_key("\e!", :shell_execute)
   GLOBAL_MAP.handle_undefined_key do |key|
     if key.is_a?(String) && /[\0-\x7f]/ !~ key 

data/lib/textbringer/mode.rb

@@ -16,6 +16,7 @@ module Textbringer
       attr_accessor :command_name
       attr_accessor :hook_name
       attr_accessor :file_name_pattern
+      attr_accessor :interpreter_name_pattern
     end
 
     def self.define_generic_command(name)

data/lib/textbringer/modes/fundamental_mode.rb

@@ -2,5 +2,8 @@
 
 module Textbringer
   class FundamentalMode < Mode
+    def symbol_pattern
+      /[\p{Letter}\p{Number}_]/
+    end
   end
 end

data/lib/textbringer/modes/programming_mode.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Textbringer
-  class ProgrammingMode < Mode
+  class ProgrammingMode < FundamentalMode
     # abstract mode
     undefine_command(:programming_mode)
 
@@ -10,6 +10,7 @@ module Textbringer
     define_generic_command :forward_definition
     define_generic_command :backward_definition
     define_generic_command :compile
+    define_generic_command :toggle_test
 
     PROGRAMMING_MODE_MAP = Keymap.new
     PROGRAMMING_MODE_MAP.define_key("\t", :indent_line_command)
@@ -17,6 +18,7 @@ module Textbringer
     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)
+    PROGRAMMING_MODE_MAP.define_key("\C-ct", :toggle_test_command)
 
     def initialize(buffer)
       super(buffer)

data/lib/textbringer/modes/ruby_mode.rb

@@ -8,7 +8,8 @@ module Textbringer
 
   class RubyMode < ProgrammingMode
     self.file_name_pattern = /\A(?:.*\.(?:rb|ru|rake|thor)|
-                              (?:Gem|Rake|Cap|Thor|Vagrant|Guard|Pod)file)\z/x
+                              (?:Gem|Rake|Cap|Thor|Vagrant|Guard|Pod)file)\z/ix
+    self.interpreter_name_pattern = /ruby/i
 
     def initialize(buffer)
       super(buffer)
@@ -49,11 +50,11 @@ module Textbringer
       tokens = Ripper.lex(@buffer.to_s)
       @buffer.forward_line
       n.times do |i|
-        tokens = tokens.drop_while { |(l, c), e, t|
+        tokens = tokens.drop_while { |(l, _), e, t|
           l < @buffer.current_line ||
             e != :on_kw || /\A(?:class|module|def)\z/ !~ t
         }
-        (line, column), event, text = tokens.first
+        (line,), = tokens.first
         if line.nil?
           @buffer.end_of_buffer
           break
@@ -70,11 +71,11 @@ module Textbringer
       tokens = Ripper.lex(@buffer.to_s).reverse
       @buffer.beginning_of_line
       n.times do |i|
-        tokens = tokens.drop_while { |(l, c), e, t|
+        tokens = tokens.drop_while { |(l, _), e, t|
           l >= @buffer.current_line ||
             e != :on_kw || /\A(?:class|module|def)\z/ !~ t
         }
-        (line, column), event, text = tokens.first
+        (line,), = tokens.first
         if line.nil?
           @buffer.beginning_of_buffer
           break
@@ -93,6 +94,10 @@ module Textbringer
       backtrace_mode
     end
 
+    def symbol_pattern
+      /[\p{Letter}\p{Number}_$@!?]/
+    end
+
     private
 
     def calculate_indentation
@@ -104,7 +109,7 @@ module Textbringer
         bol_pos = @buffer.point
         tokens = Ripper.lex(@buffer.substring(@buffer.point_min,
                                               @buffer.point))
-        line, column, event, text = find_nearest_beginning_token(tokens)
+        line, column, event, = find_nearest_beginning_token(tokens)
         if event == :on_lparen
           return column + 1
         end
@@ -188,5 +193,46 @@ module Textbringer
           "ruby " + @buffer.file_name
         end
     end
+
+    def toggle_test
+      case @buffer.file_name
+      when %r'(.*)/test/(.*/)?test_(.*?)\.rb\z'
+        base = $1
+        namespace = $2
+        name = $3
+        if namespace
+          paths = Dir.glob("#{base}/{lib,app}/**/#{namespace}#{name}.rb")
+          if !paths.empty?
+            find_file(paths.first)
+            return
+          end
+        end
+        paths = Dir.glob("#{base}/{lib,app}/**/#{name}.rb")
+        if !paths.empty?
+          find_file(paths.first)
+          return
+        end
+        raise EditorError, "Test subject not found"
+      when %r'(.*)/(?:lib|app)/(.*/)?(.*?)\.rb\z'
+        base = $1
+        namespace = $2
+        name = $3
+        if namespace
+          paths = Dir.glob("#{base}/test/**/#{namespace}test_#{name}.rb")
+          if !paths.empty?
+            find_file(paths.first)
+            return
+          end
+        end
+        paths = Dir.glob("#{base}/test/**/#{name}.rb")
+        if !paths.empty?
+          find_file(paths.first)
+          return
+        end
+        raise EditorError, "Test not found"
+      else
+        raise EditorError, "Unknown file type"
+      end
+    end
   end
 end

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/textbringer/window.rb

@@ -137,6 +137,7 @@ module Textbringer
     end
 
     def self.redisplay
+      return if Window.current.has_input?
       @@windows.each do |window|
         window.redisplay unless window.current?
       end
@@ -316,7 +317,6 @@ module Textbringer
     end
 
     def redisplay
-      return if has_input?
       return if @buffer.nil?
       redisplay_mode_line
       @buffer.save_point do |saved|
@@ -537,13 +537,9 @@ module Textbringer
       n.nonzero? || tw
     end
 
-    def beginning_of_line_and_count(max_lines)
+    def beginning_of_line_and_count(max_lines, columns = @columns)
       e = @buffer.point
       @buffer.beginning_of_line
-      if e - @buffer.point < @columns
-        return 0
-      end
-      s = @buffer.substring(@buffer.point, e)
       bols = [@buffer.point]
       column = 0
       while @buffer.point < e
@@ -555,14 +551,14 @@ module Textbringer
           str = escape(c)
         end
         column += Buffer.display_width(str)
-        if column > @columns
-          # Don't forward_char if column > @window.columns
+        if column > columns
+          # Don't forward_char if column > columns
           # to handle multibyte characters across the end of lines.
           bols.push(@buffer.point)
           column = 0
         else
           @buffer.forward_char
-          if column == @columns
+          if column == columns
             bols.push(@buffer.point)
             column = 0
           end
@@ -664,8 +660,11 @@ module Textbringer
         if @message
           @window.addstr(escape(@message))
         else
-          @window.addstr(escape(@prompt))
-          @buffer.beginning_of_line
+          prompt = escape(@prompt)
+          @window.addstr(prompt)
+          y = x = 0
+          columns = @columns - Buffer.display_width(prompt)
+          beginning_of_line_and_count(1, columns)
           while !@buffer.end_of_buffer?
             if @buffer.point_at_mark?(saved)
               y, x = @window.cury, @window.curx
@@ -675,6 +674,7 @@ module Textbringer
               break
             end
             @window.addstr(escape(c))
+            break if @window.curx == @columns
             @buffer.forward_char
           end
           if @buffer.point_at_mark?(saved)

data/textbringer.gemspec

@@ -29,4 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "test-unit"
   spec.add_development_dependency "bundler-audit"
+  spec.add_development_dependency "guard"
+  spec.add_development_dependency "guard-shell"
+  spec.add_development_dependency "ripper-tags"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -108,6 +108,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-shell
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ripper-tags
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Textbringer is a member of a demon race that takes on the form of a text
   editor.
 email:
@@ -121,14 +163,18 @@ files:
 - ".travis.yml"
 - CHANGES.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- appveyor.yml
 - bin/console
 - exe/textbringer
 - lib/textbringer.rb
 - lib/textbringer/buffer.rb
 - lib/textbringer/commands.rb
+- lib/textbringer/commands/ctags.rb
+- lib/textbringer/commands/dabbrev.rb
 - lib/textbringer/config.rb
 - lib/textbringer/controller.rb
 - lib/textbringer/errors.rb