textbringer 1.0.1 → 1.1.0

data/lib/textbringer/utils.rb

@@ -66,6 +66,9 @@ def foreground(&block)
     alias next_tick foreground
 
     def foreground!
+      if Thread.current == Thread.main
+        return yield
+      end
       q = Queue.new
       foreground do
         begin
@@ -105,7 +108,7 @@ def show_exception(e)
       if e.is_a?(SystemExit) || e.is_a?(SignalException)
         raise
       end
-      if Buffer.current&.name != "*Backtrace*"
+      if !e.is_a?(Quit) && Buffer.current&.name != "*Backtrace*"
         buffer = Buffer.find_or_new("*Backtrace*", undo_limit: 0)
         if !buffer.mode.is_a?(BacktraceMode)
           buffer.apply_mode(BacktraceMode)
@@ -176,6 +179,7 @@ def read_from_minibuffer(prompt, completion_proc: nil, default: nil,
         Window.current.buffer = Buffer.current = old_buffer
         Buffer.minibuffer[:completion_proc] = old_completion_proc
         Buffer.minibuffer.keymap = old_minibuffer_map
+        Buffer.minibuffer.disable_input_method
         Controller.current.current_prefix_arg = old_current_prefix_arg
         if COMPLETION[:original_buffer]
           COMPLETION[:completions_window].buffer = COMPLETION[:original_buffer]
@@ -196,8 +200,9 @@ def read_file_name(prompt, default: nil)
           end
         }
       }
+      initial_value = default&.sub(%r"\A#{Regexp.quote(Dir.pwd)}/", "")
       file = read_from_minibuffer(prompt, completion_proc: f,
-                                  initial_value: default)
+                                  initial_value: initial_value)
       File.expand_path(file)
     end
 
@@ -238,7 +243,7 @@ def yes_or_no?(prompt)
       }
     end
 
-    Y_OR_N_MAP = Keymap.new
+    define_keymap :Y_OR_N_MAP
     Y_OR_N_MAP.define_key(?y, :self_insert_and_exit_minibuffer)
     Y_OR_N_MAP.define_key(?n, :self_insert_and_exit_minibuffer)
     Y_OR_N_MAP.define_key(?\C-g, :abort_recursive_edit)
@@ -313,8 +318,8 @@ def read_key_sequence(prompt)
 
     HOOKS = Hash.new { |h, k| h[k] = [] }
 
-    def add_hook(name, func = Proc.new)
-      HOOKS[name].unshift(func)
+    def add_hook(name, func = nil, &block)
+      HOOKS[name].unshift(func || block)
     end
 
     def remove_hook(name, func)

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/lib/textbringer/window.rb

@@ -43,24 +43,27 @@ def self.current=(window)
       Buffer.current = window.buffer
     end
 
-    def self.delete_window
-      if @@current.echo_area?
+    def self.delete_window(target = @@current)
+      if target.echo_area?
         raise EditorError, "Can't delete the echo area"
       end
       if @@list.size == 2
         raise EditorError, "Can't delete the sole window"
       end
-      i = @@list.index(@@current)
+      i = @@list.index(target)
+      return if i.nil?
       if i == 0
         window = @@list[1]
         window.move(0, 0)
       else
         window = @@list[i - 1]
       end
-      window.resize(@@current.lines + window.lines, window.columns)
-      @@current.delete
+      window.resize(target.lines + window.lines, window.columns)
+      target.delete
       @@list.delete_at(i)
-      self.current = window
+      if target == @@current
+        self.current = window
+      end
     end
 
     def self.delete_other_windows
@@ -455,7 +458,12 @@ def redisplay
               end
             end
           end
-          @window.addstr(c)
+          if Buffer.display_width(c) == 0
+            # ncurses on macOS prints U+FEFF, U+FE0F etc. as space,
+            # so ignore it
+          else
+            @window.addstr(c)
+          end
           break if newx == columns && cury == lines - 2
           @buffer.forward_char
         end
@@ -538,9 +546,16 @@ def scroll_down
       @top_of_window.location = 0
     end
 
-    def split
+    def split(other_lines = nil)
       old_lines = lines
-      new_lines = (old_lines / 2.0).ceil
+      if other_lines
+        if other_lines < CONFIG[:window_min_height]
+          raise EditorError, "Window too small"
+        end
+        new_lines = lines - other_lines
+      else
+        new_lines = (old_lines / 2.0).ceil
+      end
       if new_lines < CONFIG[:window_min_height]
         raise EditorError, "Window too small"
       end
@@ -645,7 +660,7 @@ def redisplay_mode_line
       @mode_line.setpos(0, 0)
       attrs = @@has_colors ? Face[:mode_line].attributes : Curses::A_REVERSE
       @mode_line.attrset(attrs)
-      @mode_line.addstr("#{@buffer.name} ")
+      @mode_line.addstr("#{@buffer.input_method_status} #{@buffer.name} ")
       @mode_line.addstr("[+]") if @buffer.modified?
       @mode_line.addstr("[RO]") if @buffer.read_only?
       @mode_line.addstr("[#{@buffer.file_encoding.name}/")

data/textbringer.gemspec

@@ -19,18 +19,17 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.4'
+  spec.required_ruby_version = '>= 2.6'
 
   spec.add_runtime_dependency "curses", ">= 1.2.7"
-  spec.add_runtime_dependency "unicode-display_width", "~> 1.1"
-  spec.add_runtime_dependency "clipboard", "~> 1.1"
+  spec.add_runtime_dependency "unicode-display_width", ">= 1.1"
+  spec.add_runtime_dependency "clipboard", ">= 1.1"
   spec.add_runtime_dependency "fiddley", ">= 0.0.5"
   spec.add_runtime_dependency "editorconfig"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rake", ">= 12.0"
   spec.add_development_dependency "test-unit"
   spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "codecov"
   spec.add_development_dependency "ripper-tags"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Shugo Maeda
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-07 00:00:00.000000000 Z
+date: 2021-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -28,28 +28,28 @@ dependencies:
   name: unicode-display_width
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: clipboard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
@@ -98,14 +98,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
 - !ruby/object:Gem::Dependency
@@ -136,20 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: codecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: ripper-tags
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +164,6 @@ files:
 - ".editorconfig"
 - ".gitattributes"
 - ".github/workflows/macos.yml"
-- ".github/workflows/ruby-head.yml"
 - ".github/workflows/ubuntu.yml"
 - ".github/workflows/windows.yml"
 - ".gitignore"
@@ -188,6 +173,7 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/merge_mazegaki_dic
 - exe/tbclient
 - exe/tbtags
 - exe/textbringer
@@ -202,6 +188,7 @@ files:
 - lib/textbringer/commands/files.rb
 - lib/textbringer/commands/fill.rb
 - lib/textbringer/commands/help.rb
+- lib/textbringer/commands/input_method.rb
 - lib/textbringer/commands/isearch.rb
 - lib/textbringer/commands/keyboard_macro.rb
 - lib/textbringer/commands/misc.rb
@@ -215,6 +202,10 @@ files:
 - lib/textbringer/face.rb
 - lib/textbringer/faces/basic.rb
 - lib/textbringer/faces/programming.rb
+- lib/textbringer/input_method.rb
+- lib/textbringer/input_methods/hiragana_input_method.rb
+- lib/textbringer/input_methods/t_code_input_method.rb
+- lib/textbringer/input_methods/t_code_input_method/tables.rb
 - lib/textbringer/keymap.rb
 - lib/textbringer/mode.rb
 - lib/textbringer/modes/backtrace_mode.rb
@@ -238,7 +229,7 @@ homepage: https://github.com/shugo/textbringer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -246,15 +237,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.0.pre2
-signing_key: 
+rubygems_version: 3.3.0.dev
+signing_key:
 specification_version: 4
 summary: An Emacs-like text editor
 test_files: []

data/.github/workflows/ruby-head.yml

@@ -1,30 +0,0 @@
-name: ruby-head
-
-on: [push]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@master
-    - name: Set up RVM
-      run: |
-        curl -sSL https://get.rvm.io | bash
-    - name: Set up Ruby
-      run: |
-        source $HOME/.rvm/scripts/rvm
-        rvm install ruby-head --binary
-        rvm --default use ruby-head
-    - name: Install dependencies
-      run: |
-        source $HOME/.rvm/scripts/rvm
-        sudo apt install libncursesw5-dev
-        gem install bundler --no-document
-        bundle install
-    - name: Run test
-      run: |
-        source $HOME/.rvm/scripts/rvm
-        xvfb-run bundle exec rake test
-      env:
-       UPLOAD_TO_CODECOV: 1
-       CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}}