textbringer 1.0.3 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a50dd7957ac593c31d5f1f0102d2240b277f419cd7ea431af422afe53cb3746b
-  data.tar.gz: 7c4ad8bca8b8ec2ca21bea0a855872f4de39f7e18e22c64e072a4723fbf8a029
+  metadata.gz: 8b83487edc5f542afe9444b4393375aedd1ea82b4893997b17c6c4a33a3a4d76
+  data.tar.gz: 60b6f47109aad0c55ed9832b97a8a54a65ad7cf7cac95341a20b2f01ba23234d
 SHA512:
-  metadata.gz: 96b9ca053d2efeef296ff47db39aa1ef8d345456a5bd3a762025a4928ffb63dc8a3f63cdab5c60e6280a1cf47d56eedfa7734ddd0a23d0bd368fece0e58a96a3
-  data.tar.gz: 1cbe3d4cc148f6d837913c5080199bff92417a584fd6b9a452d2f414e1b9e3a09259ce16cc7bfd5a05c2987ac2bc4a55f1d417d42314c59155100d5d0c98764c
+  metadata.gz: 17399f8a6297f0b77cd03cdac6c24c64b6e6da82dc596b6e5bdfa7ba807cdcb8c9e32d12e376b219941ee14a2ef4a60e63bab9e2a07723a107b5e01b259eb034
+  data.tar.gz: 27b5e0e6011257b5beafc563b439944a72c7018cd058060bde55618369a55ec2c6596840f0de661a075f361485f5f27e76d908c6b04360f1342986a48b78797d

data/.github/workflows/ubuntu.yml

@@ -3,15 +3,14 @@ name: ubuntu
 on: [push]
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
+  test:
     strategy:
       matrix:
-        ruby: [ '2.6.x', '2.5.x', '2.4.x' ]
+        ruby: [ head, 3.1, 3.0, 2.7, 2.6 ]
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@master
-    - name: Set up Ruby
-      uses: actions/setup-ruby@v1
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
     - name: Install dependencies
@@ -21,6 +20,3 @@ jobs:
         bundle install
     - name: Run test
       run: xvfb-run bundle exec rake test
-      env:
-       UPLOAD_TO_CODECOV: 1
-       CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}}

data/.github/workflows/windows.yml

@@ -7,16 +7,13 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        ruby: [ '2.6.x', '2.5.x', '2.4.x' ]
+        ruby: [ 'mingw', 'mswin', '3.0', '2.7', '2.6' ]
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v2
     - name: Set up Ruby
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-    - name: Set up Bundler
-      run: gem install bundler --no-document
-    - name: Install dependencies
-      run: bundle install
+        bundler-cache: true
     - name: Run test
       run: bundle exec rake test

data/CHANGES.md

@@ -1,3 +1,41 @@
+## 1.1.1
+
+* Bug fixes.
+
+## 1.1.0
+
+* Show unsaved buffers on exit
+* Bug fixes.
+
+## 1.0.9
+
+* Remove mazegaki.dic and bushu.rev
+
+## 1.0.8
+
+* Updated mazegaki.dic
+* Add licenses of dictionary data to LEGAL.txt
+
+## 1.0.7
+
+* Support endless method definitions in ruby-mode.
+* Updated mazegaki.dic.
+
+## 1.0.6
+
+* Add the Hiragana input method.
+* Add make_directory.
+* Bug fixes.
+
+## 1.0.5
+
+* Support the Japanese input method T-Code.
+
+## 1.0.4
+
+* Support Ruby 3.0.
+* Do not record backtrace of Quit (C-g).
+
 ## 1.0.3
 
 * Fix indentation bugs.

data/README.md

@@ -4,8 +4,6 @@
 [![ubuntu](https://github.com/shugo/textbringer/workflows/ubuntu/badge.svg)](https://github.com/shugo/textbringer/actions?query=workflow%3Aubuntu)
 [![windows](https://github.com/shugo/textbringer/workflows/windows/badge.svg)](https://github.com/shugo/textbringer/actions?query=workflow%3Awindows)
 [![macos](https://github.com/shugo/textbringer/workflows/macos/badge.svg)](https://github.com/shugo/textbringer/actions?query=workflow%3Amacos)
-[![ruby-head](https://github.com/shugo/textbringer/workflows/ruby-head/badge.svg)](https://github.com/shugo/textbringer/actions?query=workflow%3Aruby-head)
-[![codecov](https://codecov.io/gh/shugo/textbringer/branch/master/graph/badge.svg)](https://codecov.io/gh/shugo/textbringer)
 
 Textbringer is a member of a demon race that takes on the form of an Emacs-like
 text editor.

data/bin/merge_mazegaki_dic

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+
+# Usage: merge_mazegaki_dic /path/to/mazegaki.dic /path/to/skkdic/SKK-JISYO.* > ~/.textbringer/tcode/mazegaki.dic
+
+MAZEGAKI_DIC = Hash.new([])
+
+ARGF.each_line do |line|
+  next if /^\p{ascii}/.match?(line)
+  x, y = line.split
+  key = x.sub(/\A(\p{hiragana}+)[a-z>]\z/, "\\1—")
+  values = y.split("/").map { |i|
+    i.sub(/;.*/, "")
+  }.reject { |i|
+    i.empty? || i == key
+  }
+  MAZEGAKI_DIC[key] |= values
+end
+
+MAZEGAKI_DIC.sort_by { |key,|
+  key
+}.each do |key, values|
+  puts "#{key} /#{values.join('/')}/"
+end
+
+

data/exe/textbringer

@@ -1,20 +1,20 @@
 #!/usr/bin/env ruby
 
+$VERBOSE = nil
+
 require "textbringer"
 
 include Textbringer
 include Commands
 
-def load_user_config
-  config_file = File.expand_path("~/.textbringer.rb")
+def load_user_config(path)
+  config_file = File.expand_path(path)
   begin
     load(config_file)
   rescue LoadError
   end
 end
 
-$VERBOSE = nil
-
 unless STDIN.tty?
   STDERR.puts("textbringer: standard input is not a tty")
   exit 1
@@ -24,8 +24,9 @@ Controller.current = Controller.new
 begin
   Window.start do
     begin
+      load_user_config("~/.textbringer/init.rb")
       Plugin.load_plugins
-      load_user_config
+      load_user_config("~/.textbringer.rb")
       ruby_mode
       if ARGV.size > 0
         ARGV.each do |arg|

data/lib/textbringer/buffer.rb

@@ -11,6 +11,7 @@ module Textbringer
     attr_accessor :mode, :keymap
     attr_reader :name, :file_name, :file_encoding, :file_format, :point, :marks
     attr_reader :current_line, :current_column, :visible_mark
+    attr_reader :input_method
 
     GAP_SIZE = 256
     UNDO_LIMIT = 1000
@@ -240,6 +241,7 @@ module Textbringer
       @visible_mark = nil
       @read_only = read_only
       @callbacks = {}
+      @input_method = nil
     end
 
     def inspect
@@ -410,6 +412,7 @@ module Textbringer
           f.flock(File::LOCK_EX)
           write_to_file(f)
           f.flush
+          f.fsync
         end
         @file_mtime = File.mtime(file_name)
       rescue Errno::EISDIR
@@ -1384,6 +1387,35 @@ module Textbringer
       end
     end
 
+    def toggle_input_method(name)
+      if name.nil?
+        @input_method ||= InputMethod.find(CONFIG[:default_input_method])
+      else
+        @input_method = InputMethod.find(name)
+      end
+      @input_method.toggle
+    end
+
+    def disable_input_method
+      @input_method&.disable
+    end
+
+    def filter_event(event)
+      if @input_method
+        @input_method.filter_event(event)
+      else
+        event
+      end
+    end
+
+    def input_method_status
+      if @input_method&.enabled?
+        @input_method.status
+      else
+        "--"
+      end
+    end
+
     private
 
     def set_contents(s, enc)
@@ -1555,15 +1587,15 @@ module Textbringer
 
     def push_undo(action)
       return if @undoing || @undo_limit == 0
+      if !modified?
+        action.version = @version
+      end
       if @composite_edit_level > 0
         @composite_edit_actions.push(action)
       else
         if @undo_stack.size >= @undo_limit
           @undo_stack[0, @undo_stack.size + 1 - @undo_limit] = []
         end
-        if !modified?
-          action.version = @version
-        end
         @undo_stack.push(action)
         @redo_stack.clear
       end
@@ -1649,6 +1681,7 @@ module Textbringer
     def initialize(buffer, location, string)
       super(buffer, location)
       @string = string
+      @copied = false
     end
 
     def undo
@@ -1662,6 +1695,10 @@ module Textbringer
     end
 
     def merge(s)
+      unless @copied
+        @string = @string.dup
+        @copied = true
+      end
       @string.concat(s)
     end
   end

data/lib/textbringer/commands/files.rb

@@ -1,9 +1,10 @@
 require "editorconfig"
+require "fileutils"
 
 module Textbringer
   module Commands
     define_command(:find_file, doc: "Open or create a file.") do
-      |file_name = read_file_name("Find file: ")|
+      |file_name = read_file_name("Find file: ", default: (Buffer.current.file_name ? File.dirname(Buffer.current.file_name) : Dir.pwd) + "/")|
       config = EditorConfig.load_file(file_name)
       buffer = Buffer.find_file(file_name)
       if buffer.new_file?
@@ -86,12 +87,13 @@ module Textbringer
 
     define_command(:write_file,
                    doc: "Save the current buffer as the specified file.") do
-      |file_name = read_file_name("Write file: ")|
+      |file_name = read_file_name("Write file: ",
+                                  default: Buffer.current.file_name)|
       if File.directory?(file_name)
         file_name = File.expand_path(Buffer.current.name, file_name)
       end
       if File.exist?(file_name)
-        unless y_or_n?("File `#{file_name}' exists; overwrite?")
+        unless y_or_n?("File exists; overwrite?")
           message("Cancelled")
           next
         end
@@ -130,5 +132,12 @@ module Textbringer
                                   default: Buffer.current.file_name)|
       find_file(file_name)
     end
+
+    define_command(:make_directory, doc: "Create a new directory.") do
+      |dir_name = read_file_name("Make directory: ",
+                                 default: Buffer.current.file_name &&
+                                 File.dirname(Buffer.current.file_name))|
+      FileUtils.mkdir_p(dir_name)
+    end
   end
 end

data/lib/textbringer/commands/help.rb

@@ -21,27 +21,36 @@ module Textbringer
     end
     private :show_help
 
+    def keymap_bindings(keymap)
+      s = format("%-16s  %s\n", "Key", "Binding")
+      s << format("%-16s  %s\n", "---", "-------")
+      s << "\n"
+      keymap.each do |key_sequence, command|
+        if command != :self_insert
+          s << format("%-16s  [%s]\n",
+                      Keymap.key_sequence_string(key_sequence),
+                      command)
+        end
+      end
+      s
+    end
+
     define_command(:describe_bindings,
                    doc: "Display the key bindings.") do
       show_help do |help|
-        s = format("%-16s  %s\n", "Key", "Binding")
-        s << format("%-16s  %s\n", "---", "-------")
-        s << "\n"
-        bindings = {}
-        [
-          GLOBAL_MAP,
-          Buffer.current.keymap,
-          Controller.current.overriding_map
-        ].each do |map|
-          map&.each do |key_sequence, command|
-            bindings[key_sequence] = command
-          end
+        s = ""
+        if Controller.current.overriding_map
+          s << "Overriding Bindings:\n"
+          s << keymap_bindings(Controller.current.overriding_map)
+          s << "\n"
         end
-        bindings.each do |key_sequence, command|
-          s << format("%-16s  [%s]\n",
-                      Keymap.key_sequence_string(key_sequence),
-                      command)
+        if Buffer.current.keymap
+          s << "Current Buffer Bindings:\n"
+          s << keymap_bindings(Buffer.current.keymap)
+          s << "\n"
         end
+        s << "Global Bindings:\n"
+        s << keymap_bindings(GLOBAL_MAP)
         help.insert(s)
       end
       push_help_command([:describe_bindings])

data/lib/textbringer/commands/input_method.rb

@@ -0,0 +1,18 @@
+module Textbringer
+  module Commands
+    define_command(:toggle_input_method,
+                   doc: "Toggel input method.") do |name = nil|
+      if name.nil? && current_prefix_arg
+        name = read_input_method_name("Input method: ")
+      end
+      Buffer.current.toggle_input_method(name)
+    end
+
+    def read_input_method_name(prompt, default: CONFIG[:default_input_method])
+      f = ->(s) {
+        complete_for_minibuffer(s.tr("-", "_"), InputMethod.list)
+      }
+      read_from_minibuffer(prompt, completion_proc: f, default: default)
+    end
+  end
+end

data/lib/textbringer/commands/isearch.rb

@@ -14,12 +14,14 @@ module Textbringer
     end
     ISEARCH_MODE_MAP.define_key(:backspace, :isearch_delete_char)
     ISEARCH_MODE_MAP.define_key(?\C-h, :isearch_delete_char)
+    ISEARCH_MODE_MAP.define_key(?\C-?, :isearch_delete_char)
     ISEARCH_MODE_MAP.define_key(?\C-s, :isearch_repeat_forward)
     ISEARCH_MODE_MAP.define_key(?\C-r, :isearch_repeat_backward)
     ISEARCH_MODE_MAP.define_key(?\C-w, :isearch_yank_word_or_char)
     ISEARCH_MODE_MAP.define_key(?\C-m, :isearch_exit)
     ISEARCH_MODE_MAP.define_key(?\C-g, :isearch_abort)
     ISEARCH_MODE_MAP.define_key(?\C-q, :isearch_quoted_insert)
+    ISEARCH_MODE_MAP.define_key(?\C-\\, :isearch_toggle_input_method)
 
     ISEARCH_STATUS = {
       forward: true,
@@ -56,6 +58,10 @@ module Textbringer
       end
     end
 
+    def isearch_mode?
+      Controller.current.overriding_map == ISEARCH_MODE_MAP
+    end
+
     def isearch_prompt
       if ISEARCH_STATUS[:forward]
         "I-search: "
@@ -133,7 +139,7 @@ module Textbringer
       re = Regexp.new(Regexp.quote(ISEARCH_STATUS[:string]), options)
       last_pos = ISEARCH_STATUS[:last_pos]
       offset = forward ? last_pos : last_pos - ISEARCH_STATUS[:string].bytesize
-      if Buffer.current.byteindex(forward, re, offset)
+      if offset >= 0 && Buffer.current.byteindex(forward, re, offset)
         if Buffer.current != Buffer.minibuffer
           message(isearch_prompt + ISEARCH_STATUS[:string], log: false)
         end
@@ -164,5 +170,11 @@ module Textbringer
       end
       isearch_search
     end
+
+    define_command(:isearch_toggle_input_method,
+                   doc: "Toggle input method.") do
+      toggle_input_method
+      message(isearch_prompt + ISEARCH_STATUS[:string], log: false)
+    end
   end
 end

data/lib/textbringer/commands/misc.rb

@@ -6,7 +6,12 @@ module Textbringer
     end
 
     define_command(:exit_textbringer) do |status = 0|
-      if Buffer.any? { |buffer| /\A\*/ !~ buffer.name && buffer.modified? }
+      unsaved_buffers = Buffer.filter { |buffer|
+        /\A\*/ !~ buffer.name && buffer.modified?
+      }
+      if !unsaved_buffers.empty?
+        list_buffers(unsaved_buffers)
+        Window.redisplay
         return unless yes_or_no?("Unsaved buffers exist; exit anyway?")
       end
       exit(status)
@@ -276,7 +281,7 @@ module Textbringer
       Window.redisplay
       signals = [:INT, :TERM, :KILL]
       begin
-        opts = /mswin32|mingw32/ =~ RUBY_PLATFORM ? {} : {pgroup: true}
+        opts = /mswin|mingw/ =~ RUBY_PLATFORM ? {} : {pgroup: true}
         if CONFIG[:shell_file_name]
           cmd = [CONFIG[:shell_file_name], CONFIG[:shell_command_switch], cmd]
         end

data/lib/textbringer/commands/server.rb

@@ -6,7 +6,7 @@ module Textbringer
                    doc: "Start Textbringer server.") do
       uri = CONFIG[:server_uri] ||
         "drbunix:" + File.expand_path("server.sock", "~/.textbringer")
-      options = CONFIG[:server_options] || { UNIXFileMode: 0600 }
+      options = { UNIXFileMode: 0600 }.merge(CONFIG[:server_options] || {})
       DRb.start_service(uri, Server.new, options)
     end
 

data/lib/textbringer/commands/windows.rb

@@ -69,9 +69,13 @@ module Textbringer
     define_command(:switch_to_buffer, doc: <<~EOD) do
         Display buffer in the current window.
       EOD
-      |buffer = read_buffer("Switch to buffer: ")|
+      |buffer = read_buffer("Switch to buffer: "), arg = current_prefix_arg|
       if buffer.is_a?(String)
-        buffer = Buffer[buffer]
+        if arg
+          buffer = Buffer.find_or_new(buffer)
+        else
+          buffer = Buffer[buffer]
+        end
       end
       if buffer
         Window.current.buffer = Buffer.current = buffer
@@ -80,7 +84,7 @@ module Textbringer
       end
     end
 
-    define_command(:list_buffers, doc: <<~EOD) do
+    define_command(:list_buffers, doc: <<~EOD) do |buffers = Buffer.list|
         List the existing buffers.
       EOD
       buffer = Buffer.find_or_new("*Buffer List*",
@@ -88,7 +92,7 @@ module Textbringer
       buffer.apply_mode(BufferListMode)
       buffer.read_only_edit do
         buffer.clear
-        buffer.insert(Buffer.list.map(&:name).join("\n"))
+        buffer.insert(buffers.map(&:name).join("\n"))
         buffer.beginning_of_buffer
       end
       switch_to_buffer(buffer)

data/lib/textbringer/config.rb

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

data/lib/textbringer/controller.rb

@@ -264,7 +264,13 @@ module Textbringer
     end
 
     def call_read_event_method(read_event_method)
-      Window.current.send(read_event_method)
+      Window.current.send(read_event_method)&.then { |event|
+        if @key_sequence.empty?
+          Buffer.current.filter_event(event)
+        else
+          event
+        end
+      }
     end
   end
 end

data/lib/textbringer/input_method.rb

@@ -0,0 +1,63 @@
+module Textbringer
+  class InputMethod
+    extend Commands
+    include Commands
+
+    @@list = []
+
+    def self.inherited(subclass)
+      name = subclass.name.sub(/Textbringer::/, "").sub(/InputMethod/, "").
+        gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').gsub(/([a-z\d])([A-Z])/, '\1_\2').
+        downcase
+      @@list.push(name)
+    end
+
+    def self.list
+      @@list
+    end
+
+    def self.find(name)
+      class_name = name.split(/_/).map(&:capitalize).join + "InputMethod"
+      Textbringer.const_get(class_name).new
+    rescue NameError
+      raise EditorError, "No such input method: #{name}"
+    end
+
+    def initialize
+      @enabled = false
+      @skip_next_event = false
+    end
+
+    def toggle
+      @enabled = !@enabled
+    end
+
+    def disable
+      @enabled = false
+    end
+
+    def enabled?
+      @enabled
+    end
+
+    def filter_event(event)
+      if @enabled
+        if event == "\e"
+          @skip_next_event = true
+          event
+        elsif @skip_next_event
+          @skip_next_event = false
+          event
+        else
+          handle_event(event)
+        end
+      else
+        event
+      end
+    end
+
+    def handle_event(event)
+      raise EditorError, "subclass must override InputMethod#handle_event"
+    end
+  end
+end

data/lib/textbringer/input_methods/hiragana_input_method.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module Textbringer
+  class HiraganaInputMethod < InputMethod
+    HIRAGANA_TABLE = {
+      "a" => "あ", "i" => "い", "u" => "う", "e" => "え", "o" => "お",
+      "ka" => "か", "ki" => "き", "ku" => "く", "ke" => "け", "ko" => "こ",
+      "ga" => "が", "gi" => "ぎ", "gu" => "ぐ", "ge" => "げ", "go" => "ご",
+      "sa" => "さ", "si" => "し", "su" => "す", "se" => "せ", "so" => "そ",
+      "za" => "ざ", "zi" => "じ", "zu" => "ず", "ze" => "ぜ", "zo" => "ぞ",
+      "sha" => "しゃ", "shi" => "し", "shu" => "しゅ", "she" => "しぇ", "sho" => "しょ",
+      "ja" => "じゃ", "ji" => "じ", "ju" => "じゅ", "je" => "じぇ", "jo" => "じょ",
+      "ta" => "た", "ti" => "ち", "tu" => "つ", "te" => "て", "to" => "と",
+      "da" => "だ", "di" => "ぢ", "du" => "づ", "de" => "で", "do" => "ど",
+      "cha" => "ちゃ", "chi" => "ち", "chu" => "ちゅ", "che" => "ちぇ", "cho" => "ちょ",
+      "na" => "な", "ni" => "に", "nu" => "ぬ", "ne" => "ね", "no" => "の",
+      "ha" => "は", "hi" => "ひ", "hu" => "ふ", "he" => "へ", "ho" => "ほ",
+      "ba" => "ば", "bi" => "び", "bu" => "ぶ", "be" => "べ", "bo" => "ぼ",
+      "pa" => "ぱ", "pi" => "ぴ", "pu" => "ぷ", "pe" => "ぺ", "po" => "ぽ",
+      "ma" => "ま", "mi" => "み", "mu" => "む", "me" => "め", "mo" => "も",
+      "ya" => "や", "yi" => "い", "yu" => "ゆ", "ye" => "いぇ", "yo" => "よ",
+      "ra" => "ら", "ri" => "り", "ru" => "る", "re" => "れ", "ro" => "ろ",
+      "wa" => "わ", "wi" => "ゐ", "wu" => "う", "we" => "ゑ", "wo" => "を",
+      "nn" => "ん"
+    }
+    HIRAGANA_PREFIXES = HIRAGANA_TABLE.keys.flat_map { |s|
+      (s.size - 1).times.map { |i| s[0, i + 1] }
+    }.uniq
+
+    def initialize
+      super
+      @input_buffer = +""
+    end
+
+    def status
+      "あ"
+    end
+
+    def handle_event(event)
+      if !event.is_a?(String)
+        if !@input_buffer.empty?
+          @input_buffer = +""
+        end
+        return event
+      end
+      @input_buffer << event
+      s = HIRAGANA_TABLE[@input_buffer]
+      if s
+        return flush(s)
+      end
+      if HIRAGANA_PREFIXES.include?(@input_buffer)
+        return nil
+      end
+      flush(@input_buffer)
+    end
+
+    def flush(s)
+      if !@input_buffer.empty?
+        @input_buffer = +""
+      end
+      if s.size == 1
+        s
+      else
+        Buffer.current.insert(s)
+        Window.redisplay
+        nil
+      end
+    end
+  end
+end