textbringer 1.0.9 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42dc4dbbf6e190e38d32657942af39c2bf5afec5035a6674d54a7d621c755086
-  data.tar.gz: dbaa67ad2fca2b24d661610e7467b94022da87928473a2a37a7169deda7a27ac
+  metadata.gz: 9641c360dd5bb038429536d85e666ff3518e37413eeece13898fa1a730665193
+  data.tar.gz: e2e9f71f90e060e30aac0bfa273fe65349eacc633f83c7c6dda034aa160436c6
 SHA512:
-  metadata.gz: c765b54dc47b490c8fe9d53b84b00734281a1d5e5e22714eaba7c9a69c71480271fb0b34a2883fed4f7ad4be1fc2933871e1c0fe5585e16e12b87f569a8ee662
-  data.tar.gz: '0684345317fcf495d5cf0f7951e120f88f24f025f8c14960dac33874c131f70f2c6a24e1ee6b8b8774783deea8b80c9047a063a8f0fe79666824578e5e54f5dc'
+  metadata.gz: 285df14ab50ac3b27e5c61a3c24503c7ce724b84a918072ada9e920c323f94c46564b329a3217950bddeee5e1c4b5e83f426ad577bb8cb6596004c2b374fd12d
+  data.tar.gz: 6ed66854359cdd89310f77cb79c2b14cdafe4b5c7636aee662c7d1a4103563388e183bf11b5b7aab45fd691b70fa16c5d33f66231f109c6a733d05c98f1087e2

data/.github/workflows/macos.yml

@@ -5,6 +5,7 @@ on: [push]
 jobs:
   build:
     runs-on: macos-latest
+    timeout-minutes: 10
     steps:
     - uses: actions/checkout@master
     - name: Install dependencies

data/.github/workflows/ubuntu.yml

@@ -6,8 +6,9 @@ jobs:
   test:
     strategy:
       matrix:
-        ruby: [ head, 3.0, 2.7, 2.6 ]
+        ruby: [ head, 3.1, 3.0, 2.7, 2.6 ]
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
@@ -20,6 +21,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

@@ -8,6 +8,7 @@ jobs:
     strategy:
       matrix:
         ruby: [ 'mingw', 'mswin', '3.0', '2.7', '2.6' ]
+    timeout-minutes: 10
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby

data/CHANGES.md

@@ -1,3 +1,16 @@
+## 1.1.2
+
+* Buf fixes.
+
+## 1.1.1
+
+* Bug fixes.
+
+## 1.1.0
+
+* Show unsaved buffers on exit
+* Bug fixes.
+
 ## 1.0.9
 
 * Remove mazegaki.dic and bushu.rev

data/README.md

@@ -4,7 +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)
-[![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

@@ -1,5 +1,7 @@
 #!/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|

data/exe/textbringer

@@ -1,5 +1,10 @@
 #!/usr/bin/env ruby
 
+require "warning"
+
+Warning.ignore(/already initialized constant /)
+Warning.ignore(/previous definition of /)
+
 require "textbringer"
 
 include Textbringer
@@ -13,8 +18,6 @@ def load_user_config(path)
   end
 end
 
-$VERBOSE = nil
-
 unless STDIN.tty?
   STDERR.puts("textbringer: standard input is not a tty")
   exit 1

data/lib/textbringer/buffer.rb

@@ -58,6 +58,8 @@ module Textbringer
       end
     }
 
+    STRING_HAS_BYTE_BASED_METHODS = String.instance_methods.include?(:bytesplice)
+
     if !defined?(@@detect_encoding_proc)
       @@detect_encoding_proc = DEFAULT_DETECT_ENCODING
 
@@ -268,7 +270,14 @@ module Textbringer
 
     def file_encoding=(enc)
       @file_encoding = Encoding.find(enc)
-      @binary = enc == Encoding::ASCII_8BIT
+      @binary = @file_encoding == Encoding::ASCII_8BIT
+      if STRING_HAS_BYTE_BASED_METHODS
+        if @binary
+          @contents.force_encoding(Encoding::ASCII_8BIT)
+        else
+          @contents.force_encoding(Encoding::UTF_8)
+        end
+      end
     end
 
     def binary?
@@ -437,20 +446,26 @@ module Textbringer
     end
 
     def to_s
-      result = (@contents[0...@gap_start] + @contents[@gap_end..-1])
-      result.force_encoding(Encoding::UTF_8) unless @binary
+      result = @contents.byteslice(0...@gap_start) +
+        @contents.byteslice(@gap_end..-1)
+      if !@binary && !STRING_HAS_BYTE_BASED_METHODS
+        result.force_encoding(Encoding::UTF_8)
+      end
       result
     end
 
     def substring(s, e)
       result =
         if s > @gap_start || e <= @gap_start
-          @contents[user_to_gap(s)...user_to_gap(e)]
+          @contents.byteslice(user_to_gap(s)...user_to_gap(e))
         else
           len = @gap_start - s
-          @contents[user_to_gap(s), len] + @contents[@gap_end, e - s - len]
+          @contents.byteslice(user_to_gap(s), len) +
+            @contents.byteslice(@gap_end, e - s - len)
         end
-      result.force_encoding(Encoding::UTF_8) unless @binary
+      if !@binary && !STRING_HAS_BYTE_BASED_METHODS
+        result.force_encoding(Encoding::UTF_8)
+      end
       result
     end
 
@@ -459,7 +474,7 @@ module Textbringer
         @contents.byteslice(location)
       else
         @contents.byteslice(location + gap_size)
-      end
+      end&.force_encoding(Encoding::ASCII_8BIT)
     end
 
     def byte_before(location = @point)
@@ -506,11 +521,19 @@ module Textbringer
     end
 
     def get_line_and_column(pos)
-      line = 1 + @contents[0...user_to_gap(pos)].count("\n")
+      line = 1 + @contents.byteslice(0...user_to_gap(pos)).count("\n")
       if pos == point_min
         column = 1
       else
-        i = @contents.rindex("\n", user_to_gap(pos - 1))
+        if STRING_HAS_BYTE_BASED_METHODS
+          begin
+            i = @contents.byterindex("\n", user_to_gap(get_pos(pos, -1)))
+          rescue RangeError
+            i = nil
+          end
+        else
+          i = @contents.rindex("\n", user_to_gap(pos - 1))
+        end
         if i
           i += 1
         else
@@ -539,7 +562,11 @@ module Textbringer
       pos = point_min
       i = 1
       while i < n && pos < @contents.bytesize
-        pos = @contents.index("\n", pos)
+        if STRING_HAS_BYTE_BASED_METHODS
+          pos = @contents.byteindex("\n", pos)
+        else
+          pos = @contents.index("\n", pos)
+        end
         break if pos.nil?
         i += 1
         pos += 1
@@ -552,11 +579,14 @@ module Textbringer
 
     def insert(x, merge_undo = false)
       s = x.to_s
+      if !binary? && !s.valid_encoding?
+        raise EditorError, "Invalid encoding: #{s.dump}"
+      end
       check_read_only_flag
       pos = @point
       size = s.bytesize
       adjust_gap(size)
-      @contents[@point, size] = s.b
+      splice_contents(@point, size, STRING_HAS_BYTE_BASED_METHODS ? s : s.b)
       @marks.each do |m|
         if m.location > @point
           m.location += size
@@ -604,7 +634,7 @@ module Textbringer
       if n > 0
         str = substring(s, pos)
         # fill the gap with NUL to avoid invalid byte sequence in UTF-8
-        @contents[@gap_end...user_to_gap(pos)] = "\0" * (pos - @point)
+        splice_contents(@gap_end...user_to_gap(pos), "\0" * (pos - @point))
         @gap_end += pos - @point
         @marks.each do |m|
           if m.location > pos
@@ -619,7 +649,7 @@ module Textbringer
         str = substring(pos, s)
         update_line_and_column(@point, pos)
         # fill the gap with NUL to avoid invalid byte sequence in UTF-8
-        @contents[user_to_gap(pos)...@gap_start] = "\0" * (@point - pos)
+        splice_contents(user_to_gap(pos)...@gap_start, "\0" * (@point - pos))
         @marks.each do |m|
           if m.location >= @point
             m.location -= @point - pos
@@ -941,7 +971,7 @@ module Textbringer
         adjust_gap
         len = e - s
         # fill the gap with NUL to avoid invalid byte sequence in UTF-8
-        @contents[@gap_end, len] = "\0" * len
+        splice_contents(@gap_end, len, "\0" * len)
         @gap_end += len
         @marks.each do |m|
           if m.location > e
@@ -966,6 +996,9 @@ module Textbringer
     def clear
       check_read_only_flag
       @contents = +""
+      if binary? || !STRING_HAS_BYTE_BASED_METHODS
+        @contents.force_encoding(Encoding::ASCII_8BIT)
+      end
       @point = @gap_start = @gap_end = 0
       @marks.each do |m|
         m.location = 0
@@ -1125,49 +1158,71 @@ module Textbringer
       byteindex(true, r, @point) == @point
     end
 
-    def byteindex(forward, re, pos)
-      @match_offsets = []
-      method = forward ? :index : :rindex
-      adjust_gap(0, point_max)
-      s = @contents[0...@gap_start]
-      if @binary
-        offset = pos
-      else
-        offset = s.byteslice(0, pos).force_encoding(Encoding::UTF_8).size
-        s.force_encoding(Encoding::UTF_8)
-      end
-      begin
-        i = s.send(method, re, offset)
+    if STRING_HAS_BYTE_BASED_METHODS
+      def byteindex(forward, re, pos)
+        @match_offsets = []
+        method = forward ? :byteindex : :byterindex
+        adjust_gap(0, 0)
+        s = @contents.byteslice(@gap_end..-1)
+        unless binary?
+          s.force_encoding(Encoding::UTF_8)
+        end
+        i = s.send(method, re, pos)
         if i
           m = Regexp.last_match
-          if m.nil?
-            # A bug of rindex
-            @match_offsets.push([pos, pos])
-            pos
-          else
-            b = m.pre_match.bytesize
-            e = b + m.to_s.bytesize
-            if e <= bytesize
-              @match_offsets.push([b, e])
-              match_beg = m.begin(0)
-              match_str = m.to_s
-              (1 .. m.size - 1).each do |j|
-                cb, ce = m.offset(j)
-                if cb.nil?
-                  @match_offsets.push([nil, nil])
-                else
-                  bb = b + match_str[0, cb - match_beg].bytesize
-                  be = b + match_str[0, ce - match_beg].bytesize
-                  @match_offsets.push([bb, be])
+          (0 .. m.size - 1).each do |j|
+            @match_offsets.push(m.byteoffset(j))
+          end
+          i
+        else
+          nil
+        end
+      end
+    else
+      def byteindex(forward, re, pos)
+        @match_offsets = []
+        method = forward ? :index : :rindex
+        adjust_gap(0, 0)
+        s = @contents[@gap_end..-1]
+        if @binary
+          offset = pos
+        else
+          offset = s.byteslice(0, pos).force_encoding(Encoding::UTF_8).size
+          s.force_encoding(Encoding::UTF_8)
+        end
+        begin
+          i = s.send(method, re, offset)
+          if i
+            m = Regexp.last_match
+            if m.nil?
+              # A bug of rindex
+              @match_offsets.push([pos, pos])
+              pos
+            else
+              b = m.pre_match.bytesize
+              e = b + m.to_s.bytesize
+              if e <= bytesize
+                @match_offsets.push([b, e])
+                match_beg = m.begin(0)
+                match_str = m.to_s
+                (1 .. m.size - 1).each do |j|
+                  cb, ce = m.offset(j)
+                  if cb.nil?
+                    @match_offsets.push([nil, nil])
+                  else
+                    bb = b + match_str[0, cb - match_beg].bytesize
+                    be = b + match_str[0, ce - match_beg].bytesize
+                    @match_offsets.push([bb, be])
+                  end
                 end
+                b
+              else
+                nil
               end
-              b
-            else
-              nil
             end
+          else
+            nil
           end
-        else
-          nil
         end
       end
     end
@@ -1248,7 +1303,7 @@ module Textbringer
     end
 
     def gap_filled_with_nul?
-      @contents[@gap_start...@gap_end]&.match?(/\A\0*\z/)
+      @contents.byteslice(@gap_start...@gap_end)&.match?(/\A\0*\z/)
     end
 
     def composite_edit
@@ -1425,40 +1480,79 @@ module Textbringer
       else
         @contents = s.encode(Encoding::UTF_8)
       end
-      @contents.force_encoding(Encoding::ASCII_8BIT)
+      if !STRING_HAS_BYTE_BASED_METHODS
+        @contents.force_encoding(Encoding::ASCII_8BIT)
+      end
       self.file_encoding = enc
-      case @contents
-      when /(?<!\r)\n/
+      begin
+        case @contents
+        when /(?<!\r)\n/
+          @file_format = :unix
+        when /\r(?!\n)/
+          @file_format = :mac
+          @contents.gsub!(/\r/, "\n")
+        when /\r\n/
+          @file_format = :dos
+          @contents.gsub!(/\r/, "")
+        else
+          @file_format = CONFIG[:default_file_format]
+        end
+      rescue ArgumentError
         @file_format = :unix
-      when /\r(?!\n)/
-        @file_format = :mac
-        @contents.gsub!(/\r/, "\n")
-      when /\r\n/
-        @file_format = :dos
-        @contents.gsub!(/\r/, "")
-      else
-        @file_format = CONFIG[:default_file_format]
+      end
+    end
+
+    if STRING_HAS_BYTE_BASED_METHODS
+      def splice_contents(*args)
+        @contents.bytesplice(*args)
+      end
+    else
+      def splice_contents(*args)
+        @contents.[]=(*args)
       end
     end
 
     def adjust_gap(min_size = 0, pos = @point)
       if @gap_start < pos
         len = user_to_gap(pos) - @gap_end
-        @contents[@gap_start, len] = @contents[@gap_end, len]
-        @gap_start += len
-        @gap_end += len
+        s = @contents.byteslice(@gap_end, len)
+        new_gap_start = @gap_start + len
+        new_gap_end = @gap_end + len
+        nul_filling_start = new_gap_start > @gap_end ? new_gap_start : @gap_end
+        unless @binary
+          # find the character boundary
+          while nul_filling_start > @gap_end &&
+              @contents.byteslice(nul_filling_start)&.b&.match?(/[\x80-\xbf]/n)
+            nul_filling_start -= 1
+          end
+        end
+        splice_contents(nul_filling_start...new_gap_end,
+                        "\0" * (new_gap_end - nul_filling_start))
+        splice_contents(@gap_start...new_gap_start, s)
+        @gap_start = new_gap_start
+        @gap_end = new_gap_end
       elsif @gap_start > pos
         len = @gap_start - pos
-        @contents[@gap_end - len, len] = @contents[pos, len]
-        @gap_start -= len
-        @gap_end -= len
+        s = @contents.byteslice(pos, len)
+        new_gap_start = @gap_start - len
+        new_gap_end = @gap_end - len
+        nul_filling_end = new_gap_end < @gap_start ? new_gap_end : @gap_start
+        unless @binary
+          # find the character boundary
+          while nul_filling_end < @gap_start &&
+              @contents.byteslice(nul_filling_end)&.b&.match?(/[\x80-\xbf]/n)
+            nul_filling_end += 1
+          end
+        end
+        splice_contents(pos...nul_filling_end, "\0" * (nul_filling_end - pos))
+        splice_contents(new_gap_end...@gap_end, s)
+        @gap_start = new_gap_start
+        @gap_end = new_gap_end
       end
-      # fill the gap with NUL to avoid invalid byte sequence in UTF-8
-      @contents[@gap_start...@gap_end] = "\0" * (@gap_end - @gap_start)
       if gap_size < min_size
         new_gap_size = GAP_SIZE + min_size
         extended_size = new_gap_size - gap_size
-        @contents[@gap_end, 0] = "\0" * extended_size
+        splice_contents(@gap_end, 0, "\0" * extended_size)
         @gap_end += extended_size
       end
     end
@@ -1520,12 +1614,20 @@ module Textbringer
     def update_line_and_column(pos, new_pos)
       return if @save_point_level > 0
       if pos < new_pos
-        n = @contents[user_to_gap(pos)...user_to_gap(new_pos)].count("\n")
+        n = @contents.byteslice(user_to_gap(pos)...user_to_gap(new_pos)).count("\n")
         if n == 0
           @current_column += substring(pos, new_pos).size
         else
           @current_line += n
-          i = @contents.rindex("\n", user_to_gap(new_pos - 1))
+          if STRING_HAS_BYTE_BASED_METHODS
+            begin
+              i = @contents.byterindex("\n", user_to_gap(get_pos(new_pos, -1)))
+            rescue RangeError
+              i = nil
+            end
+          else
+            i = @contents.rindex("\n", user_to_gap(new_pos - 1))
+          end
           if i
             i += 1
           else
@@ -1534,12 +1636,20 @@ module Textbringer
           @current_column = 1 + substring(gap_to_user(i), new_pos).size
         end
       elsif pos > new_pos
-        n = @contents[user_to_gap(new_pos)...user_to_gap(pos)].count("\n")
+        n = @contents.byteslice(user_to_gap(new_pos)...user_to_gap(pos)).count("\n")
         if n == 0
           @current_column -= substring(new_pos, pos).size
         else
           @current_line -= n
-          i = @contents.rindex("\n", user_to_gap(new_pos - 1))
+          if STRING_HAS_BYTE_BASED_METHODS
+            begin
+              i = @contents.byterindex("\n", user_to_gap(get_pos(new_pos, - 1)))
+            rescue RangeError
+              i = nil
+            end
+          else
+            i = @contents.rindex("\n", user_to_gap(new_pos - 1))
+          end
           if i
             i += 1
           else
@@ -1573,8 +1683,13 @@ module Textbringer
     end
 
     def write_to_file(f)
-      [@contents[0...@gap_start], @contents[@gap_end..-1]].each do |s|
-        s.force_encoding(Encoding::UTF_8) unless @binary
+      [
+        @contents.byteslice(0...@gap_start),
+        @contents.byteslice(@gap_end..-1)
+      ].each do |s|
+        if !STRING_HAS_BYTE_BASED_METHODS
+          s.force_encoding(Encoding::UTF_8) unless @binary
+        end
         case @file_format
         when :dos
           s.gsub!(/\n/, "\r\n")
@@ -1587,15 +1702,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

data/lib/textbringer/commands/files.rb

@@ -72,7 +72,11 @@ module Textbringer
 
     define_command(:save_buffer, doc: "Save the current buffer to a file.") do
       if Buffer.current.file_name.nil?
-        Buffer.current.file_name = read_file_name("File to save in: ")
+        file_name = read_file_name("File to save in: ")
+        if File.directory?(file_name)
+          file_name = File.expand_path(Buffer.current.name, file_name)
+        end
+        Buffer.current.file_name = file_name
         next if Buffer.current.file_name.nil?
       end
       if Buffer.current.file_modified?

data/lib/textbringer/commands/isearch.rb

@@ -138,7 +138,18 @@ module Textbringer
                 end
       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 forward
+        offset = last_pos
+      else
+        Buffer.current.save_excursion do
+          pos = last_pos - ISEARCH_STATUS[:string].bytesize
+          goto_char(last_pos)
+          while Buffer.current.point > pos
+            backward_char
+          end
+          offset = Buffer.current.point
+        end
+      end
       if offset >= 0 && Buffer.current.byteindex(forward, re, offset)
         if Buffer.current != Buffer.minibuffer
           message(isearch_prompt + ISEARCH_STATUS[:string], log: false)

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)
@@ -120,6 +125,7 @@ module Textbringer
     define_command(:complete_minibuffer) do
       minibuffer = Buffer.minibuffer
       completion_proc = minibuffer[:completion_proc]
+      ignore_case = minibuffer[:completion_ignore_case]
       if completion_proc
         xs = completion_proc.call(minibuffer.to_s)
         update_completions(xs)
@@ -131,7 +137,11 @@ module Textbringer
         s = y.size.downto(1).lazy.map { |i|
           y[0, i]
         }.find { |i|
-          ys.all? { |j| j.start_with?(i) }
+          i = i.downcase if ignore_case
+          ys.all? { |j|
+            j = j.downcase if ignore_case
+            j.start_with?(i)
+          }
         }
         if s
           complete_minibuffer_with_string(s)

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

@@ -84,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*",
@@ -92,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

@@ -16,6 +16,7 @@ module Textbringer
     shell_command_switch: "-c",
     grep_command: "grep -nH -e",
     fill_column: 70,
+    read_file_name_completion_ignore_case: RUBY_PLATFORM.match?(/darwin/),
     default_input_method: "t_code"
   }
 end

data/lib/textbringer/controller.rb

@@ -55,7 +55,15 @@ module Textbringer
             @last_key = c
             @key_sequence << @last_key
             cmd = key_binding(@key_sequence)
-            if cmd.is_a?(Symbol) || cmd.respond_to?(:call)
+            if cmd.nil?
+              keys = Keymap.key_sequence_string(@key_sequence)
+              @key_sequence.clear
+              @prefix_arg = nil
+              message("#{keys} is undefined")
+              Window.beep
+            elsif cmd.is_a?(Keymap)
+              # multi-stroke key binding?
+            else
               @this_command_keys = @key_sequence
               @key_sequence = []
               @this_command = cmd
@@ -73,13 +81,6 @@ module Textbringer
                 @last_command = @this_command
                 @this_command = nil
               end
-            else
-              if cmd.nil?
-                keys = Keymap.key_sequence_string(@key_sequence)
-                @key_sequence.clear
-                @prefix_arg = nil
-                message("#{keys} is undefined")
-              end
             end
             Window.redisplay
           rescue Exception => e

data/lib/textbringer/modes/ruby_mode.rb

@@ -276,7 +276,8 @@ module Textbringer
             (last_event == :on_kw && /\A(and|or)\z/.match?(last_text)) ||
             last_event == :on_period ||
             (last_event == :on_comma && event != :on_lbrace &&
-             event != :on_lparen && event != :on_lbracket)
+             event != :on_lparen && event != :on_lbracket) ||
+            last_event == :on_label
           indentation += @buffer[:indent_level]
         end
         indentation

data/lib/textbringer/utils.rb

@@ -137,7 +137,7 @@ module Textbringer
     }
 
     def read_from_minibuffer(prompt, completion_proc: nil, default: nil,
-                             initial_value: nil,
+                             initial_value: nil, completion_ignore_case: false,
                              keymap: MINIBUFFER_LOCAL_MAP)
       if Window.echo_area.active?
         raise EditorError,
@@ -146,10 +146,12 @@ module Textbringer
       old_buffer = Buffer.current
       old_window = Window.current
       old_completion_proc = Buffer.minibuffer[:completion_proc]
+      old_completion_ignore_case = Buffer.minibuffer[:completion_ignore_case]
       old_current_prefix_arg = Controller.current.current_prefix_arg
       old_minibuffer_map = Buffer.minibuffer.keymap
       Buffer.minibuffer.keymap = keymap
       Buffer.minibuffer[:completion_proc] = completion_proc
+      Buffer.minibuffer[:completion_ignore_case] = completion_ignore_case
       Window.echo_area.active = true
       begin
         Window.current = Window.echo_area
@@ -177,6 +179,7 @@ module Textbringer
         # Just in case old_window has been deleted by resize,
         # in which case Window.current is set to the first window.
         Window.current.buffer = Buffer.current = old_buffer
+        Buffer.minibuffer[:completion_ignore_case] = old_completion_ignore_case
         Buffer.minibuffer[:completion_proc] = old_completion_proc
         Buffer.minibuffer.keymap = old_minibuffer_map
         Buffer.minibuffer.disable_input_method
@@ -201,8 +204,10 @@ module Textbringer
         }
       }
       initial_value = default&.sub(%r"\A#{Regexp.quote(Dir.pwd)}/", "")
+      ignore_case = CONFIG[:read_file_name_completion_ignore_case]
       file = read_from_minibuffer(prompt, completion_proc: f,
-                                  initial_value: initial_value)
+                                  initial_value: initial_value,
+                                  completion_ignore_case: ignore_case)
       File.expand_path(file)
     end
 
@@ -223,8 +228,10 @@ module Textbringer
     end
 
     def read_encoding(prompt, **opts)
+      encoding_names = (Encoding.list.map(&:name) + Encoding.aliases.keys).
+        map(&:downcase).uniq
       f = ->(s) {
-        complete_for_minibuffer(s.upcase, Encoding.list.map(&:name))
+        complete_for_minibuffer(s.downcase, encoding_names)
       }
       read_from_minibuffer(prompt, completion_proc: f, **opts)
     end

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "1.0.9"
+  VERSION = "1.1.2"
 end

data/lib/textbringer/window.rb

@@ -687,6 +687,8 @@ module Textbringer
       else
         "U+%04X" % c.ord
       end
+    rescue ArgumentError
+      "0x" + c.unpack("H*")[0]
     end
 
     def escape(s)

data/textbringer.gemspec

@@ -22,15 +22,15 @@ Gem::Specification.new do |spec|
   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_runtime_dependency "warning"
 
   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.9
+  version: 1.1.2
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2022-09-08 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
@@ -81,13 +81,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: warning
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -95,35 +95,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codecov
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -258,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
+rubygems_version: 3.4.0.dev
 signing_key:
 specification_version: 4
 summary: An Emacs-like text editor