textbringer 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '009c68bcdc928faff20b7ca1b75f92b21641dc6d29e392a05a279267418983d1'
-  data.tar.gz: cad85dfebd2dc1b70cdbf9212bcda296bcde8204e529b0d82ce1663434a05d4b
+  metadata.gz: '0950d5d14bd72c43ec2270cbb545c0dc464b66662f85099ec5eed8dc3a5a56db'
+  data.tar.gz: 1874b1aa43e1ba76fc2d1c9c74f9351a3dc28a15b85c7d6a085cd8d5b669adb3
 SHA512:
-  metadata.gz: 4923385439037b9ce5aa099a029f9ca6a3bc87205f85a74febaf165c3e512501303ad25c86cdc73191bf1fcd9cf9faa15b9633996bd1efdc69bb231fba781afe
-  data.tar.gz: 9a624d55143b47100a6fc9a538d29c9f1151d7c6c38d3fdb4865739fd8d2b7a9c76bda2f8a29a6921ddc9e9e8cd8e5c73f1c25031fc9244e81da3547946559a4
+  metadata.gz: 63431a1a5a0425007e119cf3573b86d61d3a1df8cca7c8658ee5fd479201696adfeddb80c2a085fca1df89fa16862d47664a5f85ae31fd09fd4f36ce73058d71
+  data.tar.gz: 95876e6af0b0be40b684ac3b0703aaa08370b23647f50b4231d61bd5c8e9411ad0798107cc77f4cb67bcf06fbcbfdaaaf47074322933052783b29a7722d2ffed

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.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,50 @@
+## 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.
+* Fix a bug of fourground! when it is called in the main thread.
+
+## 1.0.2
+
+* Add isearch_quoted_insert.
+* Use M- notation instead of ESC in define_key and help.
+* Add indent_new_comment_line_command.
+* Add find_alternate_file.
+* Fix indentation bugs in the Ruby mode.
+
 ## 1.0.1
 
 * Support pattern matching in the Ruby mode.

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.rb

@@ -22,6 +22,7 @@
 require_relative "textbringer/commands/keyboard_macro"
 require_relative "textbringer/commands/fill"
 require_relative "textbringer/commands/server"
+require_relative "textbringer/commands/input_method"
 require_relative "textbringer/commands/help"
 require_relative "textbringer/mode"
 require_relative "textbringer/modes/fundamental_mode"
@@ -32,5 +33,8 @@
 require_relative "textbringer/modes/completion_list_mode"
 require_relative "textbringer/modes/buffer_list_mode"
 require_relative "textbringer/modes/help_mode"
+require_relative "textbringer/input_method"
+require_relative "textbringer/input_methods/t_code_input_method"
+require_relative "textbringer/input_methods/hiragana_input_method"
 require_relative "textbringer/plugin"
 require_relative "textbringer/controller"

data/lib/textbringer/buffer.rb

@@ -11,6 +11,7 @@ class Buffer
     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 @@ def initialize(s = +"", name: nil,
       @visible_mark = nil
       @read_only = read_only
       @callbacks = {}
+      @input_method = nil
     end
 
     def inspect
@@ -410,6 +412,7 @@ def save(file_name = @file_name)
           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 @@ def insert_final_newline
       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 @@ def write_to_file(f)
 
     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 @@ class InsertAction < UndoableAction
     def initialize(buffer, location, string)
       super(buffer, location)
       @string = string
+      @copied = false
     end
 
     def undo
@@ -1662,6 +1695,10 @@ def redo
     end
 
     def merge(s)
+      unless @copied
+        @string = @string.dup
+        @copied = true
+      end
       @string.concat(s)
     end
   end

data/lib/textbringer/commands/clipboard.rb

@@ -11,12 +11,12 @@ module Commands
       (ENV["DISPLAY"] && system("which xclip > /dev/null 2>&1"))
 
     if CLIPBOARD_AVAILABLE
-      GLOBAL_MAP.define_key("\ew", :clipboard_copy_region)
+      GLOBAL_MAP.define_key("\M-w", :clipboard_copy_region)
       GLOBAL_MAP.define_key("\C-w", :clipboard_kill_region)
       GLOBAL_MAP.define_key(?\C-k, :clipboard_kill_line)
-      GLOBAL_MAP.define_key("\ed", :clipboard_kill_word)
+      GLOBAL_MAP.define_key("\M-d", :clipboard_kill_word)
       GLOBAL_MAP.define_key("\C-y", :clipboard_yank)
-      GLOBAL_MAP.define_key("\ey", :clipboard_yank_pop)
+      GLOBAL_MAP.define_key("\M-y", :clipboard_yank_pop)
     end
 
     define_command(:clipboard_copy_region, doc: <<~EOD) do

data/lib/textbringer/commands/ctags.rb

@@ -49,12 +49,12 @@ module Commands
       when /\A\d+\z/
         push_tag_mark_and_find_file(file)
         goto_line(addr.to_i)
-      when %r'\A/\^(.*)\$/\z'
+      when %r'\A/\^(.*?)(\$)?/\z'
+        re = "^" + Regexp.quote($1.gsub(/\\([\\\/])/, "\\1")) + $2.to_s
         push_tag_mark_and_find_file(file)
         beginning_of_buffer
         n.times do
-          s = Regexp.quote($1.gsub(/\\([\\\/])/, "\\1"))
-          re_search_forward("^" + s + "$")
+          re_search_forward(re)
         end
         beginning_of_line
       when %r'\A\?\^(.*)\$\?\z'

data/lib/textbringer/commands/dabbrev.rb

@@ -91,7 +91,7 @@ def dabbrev_regexp(stem, candidates)
   using DabbrevExtension
 
   module Commands
-    GLOBAL_MAP.define_key("\e/", :dabbrev_expand_command)
+    GLOBAL_MAP.define_key("\M-/", :dabbrev_expand_command)
 
     define_command(:dabbrev_expand_command) do
       contd = Controller.current.last_command == :dabbrev_expand_command

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 Commands
 
     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
@@ -124,5 +126,18 @@ module Commands
                                  File.dirname(Buffer.current.file_name))|
       Dir.chdir(dir_name)
     end
+
+    define_command(:find_alternate_file, doc: "Find an alternate file.") do
+      |file_name = read_file_name("Find alternate file: ",
+                                  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 @@ def show_help
     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