textbringer 0.3.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2244343a4baaddd8efff307da619579a102c66d61c14f5dcebdba589b7f809ba
-  data.tar.gz: 0e59492b0f35673c3d0658d7c96c55288734017ace2edb1c58fddcdf22ca9976
+  metadata.gz: 1cadae924b2e85758480d58a7f4ba6ff48fc6ac1971039159a8b81a1a0bbbd29
+  data.tar.gz: cb981c7fb394e1c4683cd1365f5da1ed1f372c4254d3e9d8ca5782cad18cf167
 SHA512:
-  metadata.gz: 680ea08b6a0c55e0a514f8da5708cbbcde48efe50747b9f7fdf96ec39264619abfbfbab32a7ca03577885e8691c2d221e563d2fcd98c8bc3dd4e3cd9b647ac10
-  data.tar.gz: bac76f72017761cb3c46ff83a0d3f0dee86e811940dc97bd79c6665231f621989c262be1c17ca70d75eb5f1885fd55190062240e5b6d886c29894172a2c3c39c
+  metadata.gz: a57df2132fc40661649106e25f523e7f866ae469020fb33b687d1bf05921f0b4f17915271df4745035737b3be0c65d34650ae55af3ca10d4f677d7c2ac4d7715
+  data.tar.gz: fd5081ffaa6a8f42466fdc9fd82d6acd4a732941c66d5e2d37fd1c2a66cafba947de668a08ea60ac87f171306aadcaeca6e815991666bcac47ac376a8cd16d73

data/.gitattributes

@@ -0,0 +1 @@
+*.rb diff=ruby

data/.github/workflows/macos.yml

@@ -0,0 +1,15 @@
+name: macos
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Install dependencies
+      run: |
+        gem install bundler --no-document
+        bundle install
+    - name: Run test
+      run: bundle exec rake test

data/.github/workflows/ubuntu.yml

@@ -0,0 +1,25 @@
+name: ubuntu
+
+on: [push]
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        ruby: [ head, 2.7, 2.6, 2.5, 2.4 ]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: |
+        sudo apt install libncursesw5-dev
+        gem install bundler --no-document
+        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

@@ -0,0 +1,19 @@
+name: windows
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        ruby: [ 'mingw', 'mswin', '2.7', '2.6', '2.5' ]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Run test
+      run: bundle exec rake test

data/CHANGES.md

@@ -1,3 +1,32 @@
+## 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.
+* Bug fixes.
+
+## 1.0.0
+
+* Add mark_whole_buffer.
+* Add zap_to_char.
+* Exit on SIGTERM, SIGHUP etc.
+
 ## 0.3.2
 
 * Drop Ruby 2.3 support.

data/README.md

@@ -1,8 +1,9 @@
-# Textbringer
+# ![Textbringer](logo/logo.png)
 
 [![Gem Version](https://badge.fury.io/rb/textbringer.svg)](https://badge.fury.io/rb/textbringer)
-[![Build Status](https://travis-ci.org/shugo/textbringer.svg?branch=master)](https://travis-ci.org/shugo/textbringer)
-[![Build status](https://ci.appveyor.com/api/projects/status/n20vtpfgcgii5jtc?svg=true)](https://ci.appveyor.com/project/shugo31737/textbringer)
+[![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
@@ -18,14 +19,6 @@ text editor.
 * Ruby Programming: https://asciinema.org/a/100156
 * Japanese Text Editing: https://asciinema.org/a/100166
 
-## WARNING
-
-Textbringer is beta software, and you may lose your text.  Unsaved buffers will
-be dumped in ~/.textbringer/buffer_dump on crash.
-
-APIs are undocumented and unstable.  There is no compatibility even in the same
-minor versions.
-
 ## Installation
 
     $ gem install textbringer

data/exe/textbringer

@@ -15,6 +15,11 @@ end
 
 $VERBOSE = nil
 
+unless STDIN.tty?
+  STDERR.puts("textbringer: standard input is not a tty")
+  exit 1
+end
+
 Controller.current = Controller.new
 begin
   Window.start do

data/lib/textbringer.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative "textbringer/version"
 require_relative "textbringer/config"
 require_relative "textbringer/errors"

data/lib/textbringer/buffer.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "nkf"
 require "unicode/display_width"
 require "json"
@@ -205,7 +203,7 @@ def display_width(s)
     end
 
     # s might not be copied.
-    def initialize(s = String.new, name: nil,
+    def initialize(s = +"", name: nil,
                    file_name: nil,
                    file_encoding: CONFIG[:default_file_encoding],
                    file_mtime: nil, new_file: true, undo_limit: UNDO_LIMIT,
@@ -524,7 +522,7 @@ def goto_char(pos)
       if pos < 0 || pos > size
         raise RangeError, "Out of buffer"
       end
-      if !@binary && /[\x80-\xbf]/n.match?(byte_after(pos))
+      if !@binary && byte_after(pos)&.match?(/[\x80-\xbf]/n)
         raise ArgumentError, "Position is in the middle of a character"
       end
       @goal_column = nil
@@ -578,12 +576,12 @@ def insert(x, merge_undo = false)
 
     def newline
       indentation = save_point { |saved|
-        if /[ \t]/.match?(char_after)
+        if char_after&.match?(/[ \t]/)
           next ""
         end
         beginning_of_line
         s = @point
-        while /[ \t]/.match?(char_after)
+        while char_after&.match?(/[ \t]/)
           forward_char
         end
         str = substring(s, @point)
@@ -964,7 +962,7 @@ def replace(str, start: point_min, end: point_max)
 
     def clear
       check_read_only_flag
-      @contents = String.new
+      @contents = +""
       @point = @gap_start = @gap_end = 0
       @marks.each do |m|
         m.location = 0
@@ -1065,40 +1063,54 @@ def redo
       end
     end
 
-    def re_search_forward(s, raise_error: true)
+    def re_search_forward(s, raise_error: true, count: 1)
+      if count < 0
+        return re_search_backward(s, raise_error: raise_error, count: -count)
+      end
       re = new_regexp(s)
-      i = byteindex(true, re, @point)
-      if i.nil?
-        if raise_error
-          raise SearchError, "Search failed"
-        else
-          return nil
+      pos = @point
+      count.times do
+        i = byteindex(true, re, pos)
+        if i.nil?
+          if raise_error
+            raise SearchError, "Search failed"
+          else
+            return nil
+          end
         end
+        pos = match_end(0)
       end
-      goto_char(match_end(0))
+      goto_char(pos)
     end
 
-    def re_search_backward(s, raise_error: true)
+    def re_search_backward(s, raise_error: true, count: 1)
+      if count < 0
+        return re_search_forward(s, raise_error: raise_error, count: -count)
+      end
       re = new_regexp(s)
       pos = @point
-      begin
-        i = byteindex(false, re, pos)
-        if i.nil?
+      count.times do
+        p = pos
+        begin
+          i = byteindex(false, re, p)
+          if i.nil?
+            if raise_error
+              raise SearchError, "Search failed"
+            else
+              return nil
+            end
+          end
+          p = get_pos(p, -1)
+        rescue RangeError
           if raise_error
             raise SearchError, "Search failed"
           else
             return nil
           end
-        end
-        pos = get_pos(pos, -1)
-      rescue RangeError
-        if raise_error
-          raise SearchError, "Search failed"
-        else
-          return nil
-        end
-      end while match_end(0) > @point
-      goto_char(match_beginning(0))
+        end while match_end(0) > pos
+        pos = match_beginning(0)
+      end
+      goto_char(pos)
     end
 
     def looking_at?(re)
@@ -1233,7 +1245,7 @@ def transpose_chars
     end
 
     def gap_filled_with_nul?
-      /\A\0*\z/ =~ @contents[@gap_start...@gap_end] ? true : false
+      @contents[@gap_start...@gap_end]&.match?(/\A\0*\z/)
     end
 
     def composite_edit
@@ -1338,7 +1350,7 @@ def skip_re_backward(re)
     def gsub(*args, &block)
       if block
         s = to_s.gsub(*args) { |*params|
-          set_block_backref(block, $~)
+          block.binding.eval('->(backref) { $~ = backref }').call($~)
           block.call(*params)
         }
       else
@@ -1576,17 +1588,6 @@ def fire_callbacks(name)
         callback.call(self)
       end
     end
-
-    def set_block_backref(block, backref)
-      Thread.current[:__textbringer_backref] = backref
-      begin
-        block.binding.eval(<<-EOC)
-          $~ = Thread.current[:__textbringer_backref]
-        EOC
-      ensure
-        Thread.current[:__textbringer_backref] = nil
-      end
-    end
   end
 
   class Mark

data/lib/textbringer/color.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "curses"
 
 module Textbringer

data/lib/textbringer/commands.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "open3"
 require "io/wait"
 

data/lib/textbringer/commands/buffers.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   module Commands
     define_command(:forward_char,
@@ -244,5 +242,27 @@ module Commands
       buffer.insert(" ")
       buffer.backward_char
     end
+
+    define_command(:mark_whole_buffer,
+                   doc: <<~EOD) do
+        Put point at beginning and mark at end of buffer.
+      EOD
+      buffer = Buffer.current
+      buffer.push_mark
+      buffer.push_mark(buffer.point_max)
+      buffer.beginning_of_buffer
+    end
+
+    define_command(:zap_to_char,
+                   doc: <<~EOD) do
+        Kill up to and including count-th occurrence of char.
+      EOD
+      |char = read_char, count: number_prefix_arg|
+
+      buffer = Buffer.current
+      s = buffer.point
+      e = buffer.re_search_forward(Regexp.quote(char), count: count)
+      buffer.kill_region(s, e)
+    end
   end
 end

data/lib/textbringer/commands/clipboard.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Clipboard
   @implementation = nil
 end
@@ -13,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

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   module Commands
     CTAGS = {
@@ -51,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

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   module DabbrevExtension
     refine Buffer do
@@ -93,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,11 +1,9 @@
-# frozen_string_literal: true
-
 require "editorconfig"
 
 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?
@@ -88,12 +86,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
@@ -126,5 +125,11 @@ 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
   end
 end