textbringer 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43ad091e53d7d19724cd9e0cbeddcd71faa3cef5
-  data.tar.gz: 42455b6be377fee9ca997b77addbfa5fdf85dd9c
+  metadata.gz: 7a7999df616ed4ffd10a360bdf4f05981ca689e5
+  data.tar.gz: ec1adb45ac78222f521317d019a2c6f34d2bdbf3
 SHA512:
-  metadata.gz: f54811a073bff5d7583a50dde84b90e91620b6b9e6401ce694746edbad846f6bc2ae6bfdb466306f2ce28ac8221cf5914b827a31ecef077a43d5f27ac0465af6
-  data.tar.gz: 3241db0e8134b199e991a15a9affcad48894d823aad3becea9b48cfce05c99217604fbcbcb76f2d2f4d789146a08462cb94b06413d6bdd73f943ed284312fd68
+  metadata.gz: a42aebf208fc3570b68f068909665e185958c77d0f038cc60bc6d4e470b373245d56290712cc8e13065fce2c16eb02094b8f36bcbd5710ef7ee7423bc9019080
+  data.tar.gz: 974172125b75ae24a3156303988697d4cec95c9d1c1db61a3825cf66edbf522ffbcd774f9ef0d708edcd52e7a82ed68461a8d0b560ff2bc4bbbe441e208ee576

data/CHANGES.md

@@ -1,3 +1,12 @@
+## 0.2.6
+
+* Add the following new commands:
+    * fill_paragraph
+    * fill_region
+    * open_line
+* Complete encoding names in set_buffer_file_encoding and
+  revert_buffer_with_encoding.
+
 ## 0.2.5
 
 * Add next_tick!.

data/README.md

@@ -9,6 +9,10 @@
 Textbringer is a member of a demon race that takes on the form of an Emacs-like
 text editor.
 
+## Screenshot
+
+![Screenshot](screenshot.png)
+
 ## Demo
 
 * FizzBuzz: https://asciinema.org/a/103357
@@ -37,7 +41,11 @@ Install ncursesw before installing curses.gem, on which textbringer depends.
 
     $ textbringer
 
-You can quit the editor by C-x C-c.
+You can quit the editor by `Ctrl-x Ctrl-c`.
+
+Many commands and key bindings are similar to [Emacs](https://www.gnu.org/software/emacs/).
+
+Type `F1 b` or `Alt+x describe_bindings RET` to see key bindings.
 
 ## Configuration
 

data/lib/textbringer.rb

@@ -22,6 +22,7 @@ require_relative "textbringer/commands/ctags"
 require_relative "textbringer/commands/clipboard"
 require_relative "textbringer/commands/register"
 require_relative "textbringer/commands/keyboard_macro"
+require_relative "textbringer/commands/fill"
 require_relative "textbringer/commands/help"
 require_relative "textbringer/mode"
 require_relative "textbringer/modes/fundamental_mode"

data/lib/textbringer/buffer.rb

@@ -931,10 +931,11 @@ module Textbringer
       end
     end
 
-    def replace(s)
+    def replace(str, start: point_min, end: point_max)
       composite_edit do
-        delete_region(point_min, point_max)
-        insert(s)
+        delete_region(start, binding.local_variable_get(:end))
+        goto_char(start)
+        insert(str)
       end
     end
 

data/lib/textbringer/commands/buffers.rb

@@ -119,6 +119,14 @@ module Textbringer
       Buffer.current.newline
     end
 
+    define_command(:open_line,
+                   doc: "Insert a newline leaving point before it.") do
+      buffer = Buffer.current
+      buffer.save_excursion do
+        buffer.newline
+      end
+    end
+
     define_command(:delete_region,
                    doc: "Delete the region without copying.") do
       Buffer.current.delete_region

data/lib/textbringer/commands/files.rb

@@ -63,7 +63,7 @@ module Textbringer
       using the specified encoding.
       If the specified encoding is not valid, fall back to ASCII-8BIT.
     EOD
-      |encoding = read_from_minibuffer("File encoding: ")|
+      |encoding = read_encoding("File encoding: ")|
       unless yes_or_no?("Revert buffer from file?")
         message("Cancelled")
         next
@@ -104,8 +104,8 @@ module Textbringer
 
     define_command(:set_buffer_file_encoding,
                    doc: "Set the file encoding of the current buffer.") do
-      |enc = read_from_minibuffer("File encoding: ",
-                                  default: Buffer.current.file_encoding.name)|
+      |enc = read_encoding("File encoding: ",
+                           default: Buffer.current.file_encoding.name)|
       Buffer.current.file_encoding = enc
     end
 
@@ -121,7 +121,9 @@ module Textbringer
     end
 
     define_command(:chdir, doc: "Change the current working directory.") do
-      |dir_name = read_file_name("Change directory: ")|
+      |dir_name = read_file_name("Change directory: ",
+                                 default: Buffer.current.file_name && 
+                                 File.dirname(Buffer.current.file_name))|
       Dir.chdir(dir_name)
     end
   end

data/lib/textbringer/commands/fill.rb

@@ -0,0 +1,120 @@
+# frozen_string_literal: true
+
+module Textbringer
+  module FillExtension
+    refine Buffer do
+      def fill_region(s = Buffer.current.point, e = Buffer.current.mark)
+        s, e = Buffer.region_boundaries(s, e)
+        save_excursion do
+          str = substring(s, e)
+          goto_char(s)
+          pos = point
+          beginning_of_line
+          column = Buffer.display_width(substring(point, pos))
+          replace(fill_string(str, column), start: s, end: e)
+        end
+      end
+
+      def fill_paragraph
+        beginning_of_line
+        while !beginning_of_buffer? &&
+            !looking_at?(/^[ \t]*$/)
+          backward_line
+        end 
+        while looking_at?(/^[ \t]*$/)
+          forward_line
+        end
+        s = point
+        begin
+          forward_line
+        end while !end_of_buffer? && !looking_at?(/^[ \t]*$/)
+        if beginning_of_line?
+          backward_char
+        end
+        fill_region(s, point)
+      end
+
+      private
+
+      def fill_string(str, column)
+        input = StringIO.new(str)
+        output = String.new
+        fill_column = CONFIG[:fill_column]
+        prev_c = nil
+        while c = input.getc
+          if c == "\n"
+            if column < fill_column && !input.eof?
+              if /(?=[\u{0000}-\u{00FF}])[[:graph:]]/ =~ prev_c
+                column = insert_space_between_words(input, output, column)
+              end
+              next
+            end
+            column = insert_newline(output)
+          else
+            w = Buffer.display_width(c)
+            if column + w > fill_column || column >= fill_column
+              if /\w/ =~ prev_c && /\w/ =~ c
+                column = insert_newline_before_word(output, column)
+              else
+                column = insert_newline(output)
+              end
+            end
+            column = insert_char(output, column, c, w)
+          end
+          prev_c = c
+        end
+        output
+      end
+
+      def insert_space_between_words(input, output, column)
+        c = input.getc
+        input.ungetc(c)
+        if /(?=[\u{0000}-\u{00FF}])[[:graph:]]/ =~ c
+          output << " "
+          column + 1
+        else
+          column
+        end
+      end
+
+      def insert_newline_before_word(output, column)
+        if output.sub!(/(?:([^\w \t\n])|(\w)[ \t]+)(\w*)\z/, "\\1\\2\n")
+          output << $3
+          Buffer.display_width($3)
+        else
+          column
+        end
+      end
+
+      def insert_newline(output)
+        output.sub!(/[ \t]\z/, "")
+        output << "\n"
+        0
+      end
+
+      def insert_char(output, column, c, w)
+        if column == 0 && /[ \t]/ =~ c
+          column
+        else
+          output << c
+          column + w
+        end
+      end
+    end
+  end
+
+  module Commands
+    using FillExtension
+
+    define_command(:fill_region,
+                   doc: "Fill paragraph.") do
+      |s = Buffer.current.point, e = Buffer.current.mark|
+      Buffer.current.fill_region(s, e)
+    end
+
+    define_command(:fill_paragraph,
+                   doc: "Fill paragraph.") do
+      Buffer.current.fill_paragraph
+    end
+  end
+end

data/lib/textbringer/config.rb

@@ -16,6 +16,7 @@ module Textbringer
     highlight_buffer_size_limit: 102400,
     shell_file_name: ENV["SHELL"],
     shell_command_switch: "-c",
-    grep_command: "grep -nH -e"
+    grep_command: "grep -nH -e",
+    fill_column: 70
   }
 end

data/lib/textbringer/keymap.rb

@@ -135,6 +135,7 @@ module Textbringer
   GLOBAL_MAP.define_key("\C-t", :transpose_chars)
   GLOBAL_MAP.define_key("\C-j", :newline)
   GLOBAL_MAP.define_key("\C-m", :newline)
+  GLOBAL_MAP.define_key("\C-o", :open_line)
   GLOBAL_MAP.define_key("\em", :back_to_indentation)
   GLOBAL_MAP.define_key("\e^", :delete_indentation)
   GLOBAL_MAP.define_key("\C-l", :recenter)
@@ -180,6 +181,7 @@ module Textbringer
   GLOBAL_MAP.define_key("\C-x)", :end_keyboard_macro)
   GLOBAL_MAP.define_key("\C-xe", :end_and_call_keyboard_macro)
   GLOBAL_MAP.define_key(:f4, :end_or_call_keyboard_macro)
+  GLOBAL_MAP.define_key("\eq", :fill_paragraph)
   GLOBAL_MAP.define_key([:f1, "b"], :describe_bindings)
   GLOBAL_MAP.define_key([:f1, "f"], :describe_command)
   GLOBAL_MAP.define_key([:f1, "k"], :describe_key)

data/lib/textbringer/plugin.rb

@@ -12,7 +12,11 @@ module Textbringer
       files = Gem.find_latest_files("textbringer_plugin.rb", false) +
         Dir.glob(File.join(directory, "*/**/textbringer_plugin.rb"))
       files.each do |file|
-        load(file)
+        begin
+          load(file)
+        rescue Exception => e
+          show_exception(e)
+        end
       end
     end
   end

data/lib/textbringer/utils.rb

@@ -194,7 +194,8 @@ module Textbringer
           end
         }
       }
-      file = read_from_minibuffer(prompt, completion_proc: f, default: default)
+      file = read_from_minibuffer(prompt, completion_proc: f,
+                                  initial_value: default)
       File.expand_path(file)
     end
 
@@ -214,6 +215,13 @@ module Textbringer
       read_from_minibuffer(prompt, completion_proc: f)
     end
 
+    def read_encoding(prompt, **opts)
+      f = ->(s) {
+        complete_for_minibuffer(s.upcase, Encoding.list.map(&:name))
+      }
+      read_from_minibuffer(prompt, completion_proc: f, **opts)
+    end
+
     def yes_or_no?(prompt)
       loop {
         s = read_from_minibuffer(prompt + " (yes or no) ")

data/lib/textbringer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-08 00:00:00.000000000 Z
+date: 2017-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -209,6 +209,7 @@ files:
 - lib/textbringer/commands/ctags.rb
 - lib/textbringer/commands/dabbrev.rb
 - lib/textbringer/commands/files.rb
+- lib/textbringer/commands/fill.rb
 - lib/textbringer/commands/help.rb
 - lib/textbringer/commands/isearch.rb
 - lib/textbringer/commands/keyboard_macro.rb
@@ -236,6 +237,7 @@ files:
 - lib/textbringer/utils.rb
 - lib/textbringer/version.rb
 - lib/textbringer/window.rb
+- screenshot.png
 - textbringer.gemspec
 homepage: https://github.com/shugo/textbringer
 licenses: