textbringer 0.1.6 → 0.1.7

data/lib/textbringer/modes/ruby_mode.rb

@@ -7,46 +7,17 @@ module Textbringer
   CONFIG[:ruby_indent_tabs_mode] = false
 
   class RubyMode < ProgrammingMode
-    self.file_name_pattern = /\A(?:.*\.(?:rb|ru|rake|thor)|
-                              (?:Gem|Rake|Cap|Thor|Vagrant|Guard|Pod)file)\z/ix
+    self.file_name_pattern =
+      /\A(?:.*\.(?:rb|ru|rake|thor|jbuilder|gemspec|podspec)|
+            (?:Gem|Rake|Cap|Thor|Vagrant|Guard|Pod)file)\z/ix
     self.interpreter_name_pattern = /ruby/i
 
     def initialize(buffer)
       super(buffer)
+      @buffer[:indent_level] = CONFIG[:ruby_indent_level]
       @buffer[:indent_tabs_mode] = CONFIG[:ruby_indent_tabs_mode]
     end
 
-    # Return true if modified.
-    def indent_line
-      result = false
-      level = calculate_indentation
-      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)
-        end
-        result = true
-      end
-      pos = @buffer.point
-      @buffer.beginning_of_line
-      @buffer.forward_char while /[ \t]/ =~ @buffer.char_after
-      if @buffer.point < pos
-        @buffer.goto_char(pos)
-      end
-      result
-    end
-
     def forward_definition(n = number_prefix_arg || 1)
       tokens = Ripper.lex(@buffer.to_s)
       @buffer.forward_line
@@ -163,9 +134,11 @@ module Textbringer
         bol_pos = @buffer.point
         tokens = Ripper.lex(@buffer.substring(@buffer.point_min,
                                               @buffer.point))
-        _, event, = tokens.last
+        _, event, text = tokens.last
         if event == :on_tstring_beg ||
             event == :on_heredoc_beg ||
+            event == :on_regexp_beg ||
+            (event == :on_regexp_end && text.size > 1) ||
             event == :on_tstring_content
           return nil
         end
@@ -197,14 +170,14 @@ module Textbringer
           @buffer.looking_at?(/[ \t]*([}\])]|(end|else|elsif|when|rescue|ensure)\b)/)
           indentation = base_indentation
         else
-          indentation = base_indentation + @buffer[:ruby_indent_level]
+          indentation = base_indentation + @buffer[:indent_level]
         end
         _, last_event, last_text = tokens.reverse_each.find { |_, e, _|
           e != :on_sp && e != :on_nl && e != :on_ignored_nl
         }
         if (last_event == :on_op && last_text != "|") ||
             last_event == :on_period
-          indentation += @buffer[:ruby_indent_level]
+          indentation += @buffer[:indent_level]
         end
         indentation
       end

data/lib/textbringer/utils.rb

@@ -7,6 +7,7 @@ module Textbringer
     module_function
 
     def message(msg, log: true, sit_for: nil, sleep_for: nil)
+      str = msg.to_s
       if log && Buffer.current.name != "*Messages*"
         buffer = Buffer["*Messages*"] ||
           Buffer.new_buffer("*Messages*", undo_limit: 0).tap { |b|
@@ -15,7 +16,7 @@ module Textbringer
         buffer.read_only = false
         begin
           buffer.end_of_buffer
-          buffer.insert(msg + "\n")
+          buffer.insert(str + "\n")
           if buffer.current_line > 1000
             buffer.beginning_of_buffer
             10.times do
@@ -28,7 +29,7 @@ module Textbringer
           buffer.read_only = true
         end
       end
-      Window.echo_area.show(msg)
+      Window.echo_area.show(str)
       if sit_for
         sit_for(sit_for)
         Window.echo_area.clear_message
@@ -83,6 +84,11 @@ module Textbringer
       Window.beep
     end
 
+    COMPLETION = {
+      original_buffer: nil,
+      completions_window: nil
+    }
+
     def read_from_minibuffer(prompt, completion_proc: nil, default: nil,
                              keymap: MINIBUFFER_LOCAL_MAP)
       if Window.echo_area.active?
@@ -126,46 +132,31 @@ module Textbringer
         Buffer.minibuffer[:completion_proc] = old_completion_proc
         Buffer.minibuffer.keymap = old_minibuffer_map
         Controller.current.current_prefix_arg = old_current_prefix_arg
+        if COMPLETION[:original_buffer]
+          COMPLETION[:completions_window].buffer = COMPLETION[:original_buffer]
+          COMPLETION[:completions_window] = nil
+          COMPLETION[:original_buffer] = nil
+        end
       end
     end
 
     def read_file_name(prompt, default: nil)
       f = ->(s) {
         s = File.expand_path(s) if s.start_with?("~")
-        files = Dir.glob(s + "*")
-        if files.size > 0
-          x, *xs = files
-          file = x.size.downto(1).lazy.map { |i|
-            x[0, i]
-          }.find { |i|
-            xs.all? { |j| j.start_with?(i) }
-          }
-          if file && files.size == 1 &&
-             File.directory?(file) && !file.end_with?(?/)
+        Dir.glob(s + "*").map { |file|
+          if File.directory?(file) && !file.end_with?(?/)
             file + "/"
           else
             file
           end
-        else
-          nil
-        end
+        }
       }
       file = read_from_minibuffer(prompt, completion_proc: f, default: default)
       File.expand_path(file)
     end
 
     def complete_for_minibuffer(s, candidates)
-      xs = candidates.select { |i| i.start_with?(s) }
-      if xs.size > 0
-        y, *ys = xs
-        y.size.downto(1).lazy.map { |i|
-          y[0, i]
-        }.find { |i|
-          ys.all? { |j| j.start_with?(i) }
-        }
-      else
-        nil
-      end
+      candidates.select { |i| i.start_with?(s) }
     end
 
     def read_buffer(prompt, default: (Buffer.last || Buffer.current)&.name)

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/textbringer/window.rb

@@ -5,22 +5,40 @@ require "unicode/display_width"
 require "fiddle/import"
 
 module Textbringer
-  begin
-    # These features should be provided by curses.gem.
-    module PDCurses
+  # These features should be provided by curses.gem.
+  module PDCurses
+    KEY_OFFSET = 0xec00
+    ALT_0 = KEY_OFFSET + 0x97
+    ALT_9 = KEY_OFFSET + 0xa0
+    ALT_A = KEY_OFFSET + 0xa1
+    ALT_Z = KEY_OFFSET + 0xba
+    ALT_NUMBER_BASE = ALT_0 - ?0.ord
+    ALT_ALPHA_BASE = ALT_A - ?a.ord
+
+    KEY_MODIFIER_SHIFT   = 1
+    KEY_MODIFIER_CONTROL = 2
+    KEY_MODIFIER_ALT     = 4
+    KEY_MODIFIER_NUMLOCK = 8
+
+    @dll_loaded = false
+
+    class << self
+      attr_writer :dll_loaded
+
+      def dll_loaded?
+        @dll_loaded
+      end
+    end
+
+    begin
       extend Fiddle::Importer
       dlload "pdcurses.dll"
       extern "unsigned long PDC_get_key_modifiers(void)"
       extern "int PDC_save_key_modifiers(unsigned char)"
       extern "int PDC_return_key_modifiers(unsigned char)"
-
-      KEY_MODIFIER_SHIFT   = 1
-      KEY_MODIFIER_CONTROL = 2
-      KEY_MODIFIER_ALT     = 4
-      KEY_MODIFIER_NUMLOCK = 8
+      @dll_loaded = true
+    rescue Fiddle::DLError
     end
-  rescue
-    remove_const :PDCurses
   end
 
   class Window
@@ -30,18 +48,6 @@ module Textbringer
         name.slice(/\AKEY_(.*)/, 1).downcase.intern
     end
 
-    ALT_IS_FUNCTION_KEY =
-      /mswin32|mingw32/ =~ RUBY_PLATFORM && /PDCurses/ =~ Curses::VERSION
-    if ALT_IS_FUNCTION_KEY
-      KEY_OFFSET = 0xec00
-      ALT_0 = KEY_OFFSET + 0x97
-      ALT_9 = KEY_OFFSET + 0xa0
-      ALT_A = KEY_OFFSET + 0xa1
-      ALT_Z = KEY_OFFSET + 0xba
-      ALT_NUMBER_BASE = ALT_0 - ?0.ord
-      ALT_ALPHA_BASE = ALT_A - ?a.ord
-    end
-
     @@windows = []
     @@current = nil
     @@echo_area = nil
@@ -267,12 +273,12 @@ module Textbringer
     def read_char
       key = get_char
       if key.is_a?(Integer)
-        if ALT_IS_FUNCTION_KEY
-          if ALT_0 <= key && key <= ALT_9
-            @key_buffer.push((key - ALT_NUMBER_BASE).chr)
+        if PDCurses.dll_loaded?
+          if PDCurses::ALT_0 <= key && key <= PDCurses::ALT_9
+            @key_buffer.push((key - PDCurses::ALT_NUMBER_BASE).chr)
             return "\e"
-          elsif ALT_A <= key && key <= ALT_Z
-            @key_buffer.push((key - ALT_ALPHA_BASE).chr)
+          elsif PDCurses::ALT_A <= key && key <= PDCurses::ALT_Z
+            @key_buffer.push((key - PDCurses::ALT_ALPHA_BASE).chr)
             return "\e"
           end
         end
@@ -292,6 +298,9 @@ module Textbringer
     end
 
     def wait_input(msecs)
+      unless @key_buffer.empty?
+        return @key_buffer.first
+      end
       @window.timeout = msecs
       begin
         c = @window.get_char
@@ -305,6 +314,9 @@ module Textbringer
     end
 
     def has_input?
+      unless @key_buffer.empty?
+        return true
+      end
       @window.nodelay = true
       begin
         c = @window.get_char
@@ -446,6 +458,9 @@ module Textbringer
     end
 
     def scroll_up
+      if @bottom_of_window.location == @buffer.point_max
+        raise EditorError, "End of buffer"
+      end
       @buffer.point_to_mark(@bottom_of_window)
       @buffer.previous_line
       @buffer.beginning_of_line
@@ -453,6 +468,9 @@ module Textbringer
     end
 
     def scroll_down
+      if @top_of_window.location == @buffer.point_min
+        raise EditorError, "Beginning of buffer"
+      end
       @buffer.point_to_mark(@top_of_window)
       @buffer.next_line
       @buffer.beginning_of_line
@@ -607,11 +625,11 @@ module Textbringer
 
     def get_char
       if @key_buffer.empty?
-        PDCurses.PDC_save_key_modifiers(1) if defined?(PDCurses)
+        PDCurses.PDC_save_key_modifiers(1) if PDCurses.dll_loaded?
         begin
           need_retry = false
           key = @window.get_char
-          if defined?(PDCurses)
+          if PDCurses.dll_loaded?
             mods = PDCurses.PDC_get_key_modifiers
             if key.is_a?(String) && key.ascii_only?
               if (mods & PDCurses::KEY_MODIFIER_CONTROL) != 0

data/textbringer.gemspec

@@ -25,9 +25,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "unicode-display_width", "~> 1.1"
   spec.add_runtime_dependency "clipboard", "~> 1.1"
   spec.add_runtime_dependency "ffi"
+  spec.add_runtime_dependency "editorconfig"
 
   spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "test-unit"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "codecov"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-04 00:00:00.000000000 Z
+date: 2017-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: editorconfig
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -201,6 +215,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".gitignore"
 - ".travis.yml"
 - CHANGES.md
@@ -230,6 +245,8 @@ files:
 - lib/textbringer/keymap.rb
 - lib/textbringer/mode.rb
 - lib/textbringer/modes/backtrace_mode.rb
+- lib/textbringer/modes/c_mode.rb
+- lib/textbringer/modes/completion_list_mode.rb
 - lib/textbringer/modes/fundamental_mode.rb
 - lib/textbringer/modes/programming_mode.rb
 - lib/textbringer/modes/ruby_mode.rb