textbringer 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c42284ec820a6074794ed19f174f9ac393d5caa316f8408db5c5e43d5e87041
-  data.tar.gz: 95d805f94fbce11d2858c44a2fd275af3b8cdbfe6aed396a7807ac8543282d31
+  metadata.gz: 7239f854b8c82327c4ee8f1afc538f57d14dc083d51580ac79cf3b8b899ab251
+  data.tar.gz: be654b2f51c7e445826caadca3324feb3c13fce6c350fcb044768170311baaec
 SHA512:
-  metadata.gz: a849309d4b2d77f350619fced9d26555598777fcde6f42d26439576c0933316a796027c9bc82fa427c4f698cbe581fb3b3428db8cd09ea2b7ecdaf0b6f690e47
-  data.tar.gz: 186933b3607392f5b28d32ab22df7324f960821fb8abb651403db281973e92bd1715d8d0e7841d0a1e1bc57ed50659f28095684e9c7a199e44bc118190aa4c23
+  metadata.gz: 33d3d5398d6c35b76666cefc846e02930106520bfb8ac76f1ec32b1e9abf76f5a0cdde7fa425e3b46bdfe334daf6d6678a9cbf787564588068029bfb325a2288
+  data.tar.gz: c475825d5801f90bb1d5f960a811a195a8a7e7d5573e5bbe7c67ade0ab47d69d5055ac3831c23b4691b41bdcd98a489ae9d51027ef7feb14ec9ef4906b409b5e

data/CHANGES.md

@@ -1,3 +1,10 @@
+## 0.2.9
+
+* Add the following new commands:
+    * list_buffers
+    * jit_pause
+    * jit_resume
+
 ## 0.2.8
 
 * Highlight control characters.

data/lib/textbringer.rb

@@ -31,6 +31,7 @@ require_relative "textbringer/modes/ruby_mode"
 require_relative "textbringer/modes/c_mode"
 require_relative "textbringer/modes/backtrace_mode"
 require_relative "textbringer/modes/completion_list_mode"
+require_relative "textbringer/modes/buffer_list_mode"
 require_relative "textbringer/modes/help_mode"
 require_relative "textbringer/plugin"
 require_relative "textbringer/controller"

data/lib/textbringer/buffer.rb

@@ -58,13 +58,15 @@ module Textbringer
       end
     }
 
-    @@detect_encoding_proc = DEFAULT_DETECT_ENCODING
+    if !defined?(@@detect_encoding_proc)
+      @@detect_encoding_proc = DEFAULT_DETECT_ENCODING
 
-    @@table = {}
-    @@list = []
-    @@current = nil
-    @@minibuffer = nil
-    @@global_mark_ring = nil
+      @@table = {}
+      @@list = []
+      @@current = nil
+      @@minibuffer = nil
+      @@global_mark_ring = nil
+    end
 
     def self.auto_detect_encodings
       @@auto_detect_encodings
@@ -1104,14 +1106,15 @@ module Textbringer
       @match_offsets = []
       method = forward ? :index : :rindex
       adjust_gap(0, point_max)
+      s = @contents[0...@gap_start]
       if @binary
         offset = pos
       else
-        offset = @contents[0...pos].force_encoding(Encoding::UTF_8).size
-        @contents.force_encoding(Encoding::UTF_8)
+        offset = s.byteslice(0, pos).force_encoding(Encoding::UTF_8).size
+        s.force_encoding(Encoding::UTF_8)
       end
       begin
-        i = @contents.send(method, re, offset)
+        i = s.send(method, re, offset)
         if i
           m = Regexp.last_match
           if m.nil?
@@ -1143,8 +1146,6 @@ module Textbringer
         else
           nil
         end
-      ensure
-        @contents.force_encoding(Encoding::ASCII_8BIT)
       end
     end
 

data/lib/textbringer/commands/fill.rb

@@ -107,7 +107,7 @@ module Textbringer
     using FillExtension
 
     define_command(:fill_region,
-                   doc: "Fill paragraph.") do
+                   doc: "Fill region.") do
       |s = Buffer.current.point, e = Buffer.current.mark|
       Buffer.current.fill_region(s, e)
     end

data/lib/textbringer/commands/misc.rb

@@ -330,5 +330,13 @@ module Textbringer
                                   initial_value: CONFIG[:grep_command] + " ")|
       shell_execute(cmd, buffer_name: "*grep*", mode: BacktraceMode)
     end
+
+    define_command(:jit_pause) do
+      RubyVM::MJIT.pause
+    end
+
+    define_command(:jit_resume) do
+      RubyVM::MJIT.resume
+    end
   end
 end

data/lib/textbringer/commands/windows.rb

@@ -82,6 +82,20 @@ module Textbringer
       end
     end
 
+    define_command(:list_buffers, doc: <<~EOD) do
+        List the existing buffers.
+      EOD
+      buffer = Buffer.find_or_new("*Buffer List*",
+                                  undo_limit: 0, read_only: true)
+      buffer.apply_mode(BufferListMode)
+      buffer.read_only_edit do
+        buffer.clear
+        buffer.insert(Buffer.list.map(&:name).join("\n"))
+        buffer.beginning_of_buffer
+      end
+      switch_to_buffer(buffer)
+    end
+
     define_command(:bury_buffer, doc: <<~EOD) do
         Put buffer at the end of the buffer list.
       EOD

data/lib/textbringer/keymap.rb

@@ -158,6 +158,7 @@ module Textbringer
   GLOBAL_MAP.define_key("\C-z", :suspend_textbringer)
   GLOBAL_MAP.define_key("\C-x\C-f", :find_file)
   GLOBAL_MAP.define_key("\C-xb", :switch_to_buffer)
+  GLOBAL_MAP.define_key("\C-x\C-b", :list_buffers)
   GLOBAL_MAP.define_key("\C-x\C-s", :save_buffer)
   GLOBAL_MAP.define_key("\C-x\C-w", :write_file)
   GLOBAL_MAP.define_key("\C-xk", :kill_buffer)

data/lib/textbringer/modes/buffer_list_mode.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Textbringer
+  class BufferListMode < Mode
+    BUFFER_LIST_MODE_MAP = Keymap.new
+    BUFFER_LIST_MODE_MAP.define_key("\C-m", :this_window_command)
+
+    def initialize(buffer)
+      super(buffer)
+      buffer.keymap = BUFFER_LIST_MODE_MAP
+    end
+
+    define_local_command(:this_window,
+                         doc: "Change the current account.") do
+      name = @buffer.save_excursion {
+        @buffer.beginning_of_line
+        @buffer.looking_at?(/.*/)
+        @buffer.match_string(0)
+      }
+      switch_to_buffer(name)
+    end
+  end
+end

data/lib/textbringer/modes/ruby_mode.rb

@@ -151,7 +151,7 @@ module Textbringer
           prefix = File.exist?("Gemfile") ? "bundle exec " : ""
           prefix + "rake"
         elsif @buffer.file_name
-          "ruby " + @buffer.file_name
+          ruby_install_name + " " + @buffer.file_name
         else
           nil
         end
@@ -200,6 +200,27 @@ module Textbringer
 
     private
 
+    INDENT_BEG_RE = /^([ \t]*)((class|module|def|if|unless|case|while|until|for|begin|end)\b|\})/
+
+    def space_width(s)
+      s.gsub(/\t/, " " * @buffer[:tab_width]).size
+    end
+
+    def beginning_of_indentation
+      loop do
+        @buffer.re_search_backward(INDENT_BEG_RE)
+        space = @buffer.match_string(1)
+        s = @buffer.substring(@buffer.point_min, @buffer.point)
+        if PartialLiteralAnalyzer.in_literal?(s)
+          next
+        end
+        return space_width(space)
+      end
+    rescue SearchError
+      @buffer.beginning_of_buffer
+      0
+    end
+
     def calculate_indentation
       if @buffer.current_line == 1
         return 0
@@ -207,8 +228,10 @@ module Textbringer
       @buffer.save_excursion do
         @buffer.beginning_of_line
         bol_pos = @buffer.point
-        tokens = Ripper.lex(@buffer.substring(@buffer.point_min,
-                                              @buffer.point))
+        base_indentation = beginning_of_indentation
+        start_pos = @buffer.point
+        start_line = @buffer.current_line
+        tokens = Ripper.lex(@buffer.substring(start_pos, bol_pos))
         _, event, text = tokens.last
         if event == :on_tstring_beg ||
             event == :on_heredoc_beg ||
@@ -222,7 +245,7 @@ module Textbringer
           return column + 1
         end
         if line
-          @buffer.goto_line(line)
+          @buffer.goto_line(start_line - 1 + line)
           while !@buffer.beginning_of_buffer?
             if @buffer.save_excursion {
               @buffer.backward_char
@@ -235,18 +258,17 @@ module Textbringer
             end
           end
           @buffer.looking_at?(/[ \t]*/)
-          base_indentation = @buffer.match_string(0).
-            gsub(/\t/, " " * @buffer[:tab_width]).size
-        else
-          base_indentation = 0
+          base_indentation = space_width(@buffer.match_string(0))
         end
         @buffer.goto_char(bol_pos)
-        if line.nil? ||
-          @buffer.looking_at?(/[ \t]*([}\])]|(end|else|elsif|when|rescue|ensure)\b)/)
+        if line.nil?
           indentation = base_indentation
         else
           indentation = base_indentation + @buffer[:indent_level]
         end
+        if @buffer.looking_at?(/[ \t]*([}\])]|(end|else|elsif|when|rescue|ensure)\b)/)
+          indentation -= @buffer[:indent_level]
+        end
         _, last_event, last_text = tokens.reverse_each.find { |_, e, _|
           e != :on_sp && e != :on_nl && e != :on_ignored_nl
         }
@@ -306,5 +328,32 @@ module Textbringer
       end
       return nil
     end
+
+    class PartialLiteralAnalyzer < Ripper
+      def self.in_literal?(src)
+        new(src).in_literal?
+      end
+
+      def in_literal?
+        @literal_level = 0
+        parse
+        @literal_level > 0
+      end
+
+      private
+
+      %w(embdoc heredoc tstring regexp
+      symbols qsymbols words qwords).each do |name|
+        define_method("on_#{name}_beg") do |token|
+          @literal_level += 1
+        end
+      end
+
+      %w(embdoc heredoc tstring regexp).each do |name|
+        define_method("on_#{name}_end") do |token|
+          @literal_level -= 1
+        end
+      end
+    end
   end
 end

data/lib/textbringer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Textbringer
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2018-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -226,6 +226,7 @@ files:
 - lib/textbringer/keymap.rb
 - lib/textbringer/mode.rb
 - lib/textbringer/modes/backtrace_mode.rb
+- lib/textbringer/modes/buffer_list_mode.rb
 - lib/textbringer/modes/c_mode.rb
 - lib/textbringer/modes/completion_list_mode.rb
 - lib/textbringer/modes/fundamental_mode.rb
@@ -259,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.0.beta1
 signing_key: 
 specification_version: 4
 summary: An Emacs-like text editor