textbringer 0.3.2 → 1.0.4

data/lib/textbringer/modes/backtrace_mode.rb

@@ -1,10 +1,8 @@
-# frozen_string_literal: true
-
 module Textbringer
   class BacktraceMode < Mode
     define_generic_command :jump_to_source_location
 
-    BACKTRACE_MODE_MAP = Keymap.new
+    define_keymap :BACKTRACE_MODE_MAP
     BACKTRACE_MODE_MAP.define_key("\C-m", :jump_to_source_location_command)
 
     define_syntax :link, /^\S*?:\d+:(?:\d+:)?/

data/lib/textbringer/modes/buffer_list_mode.rb

@@ -1,8 +1,6 @@
-# frozen_string_literal: true
-
 module Textbringer
   class BufferListMode < Mode
-    BUFFER_LIST_MODE_MAP = Keymap.new
+    define_keymap :BUFFER_LIST_MODE_MAP
     BUFFER_LIST_MODE_MAP.define_key("\C-m", :this_window_command)
 
     def initialize(buffer)

data/lib/textbringer/modes/c_mode.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   CONFIG[:c_indent_level] = 4
   CONFIG[:c_indent_tabs_mode] = true
@@ -36,6 +34,10 @@ class CMode < ProgrammingMode
       (?: ' (?: [^\\'] | \\ (?:.|\n)  )* ' )
     /x
 
+    def comment_start
+      "//"
+    end
+
     def initialize(buffer)
       super(buffer)
       @buffer[:indent_level] = CONFIG[:c_indent_level]

data/lib/textbringer/modes/completion_list_mode.rb

@@ -1,10 +1,8 @@
-# frozen_string_literal: true
-
 module Textbringer
   class CompletionListMode < Mode
     define_generic_command :choose_completion
 
-    COMPLETION_LIST_MODE_MAP = Keymap.new
+    define_keymap :COMPLETION_LIST_MODE_MAP
     COMPLETION_LIST_MODE_MAP.define_key("\C-m", :choose_completion_command)
 
     define_syntax :link, /^.+$/

data/lib/textbringer/modes/fundamental_mode.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   class FundamentalMode < Mode
     def symbol_pattern

data/lib/textbringer/modes/help_mode.rb

@@ -1,10 +1,8 @@
-# frozen_string_literal: true
-
 module Textbringer
   class HelpMode < Mode
     define_generic_command :jump_to_link
 
-    HELP_MODE_MAP = Keymap.new
+    define_keymap :HELP_MODE_MAP
     HELP_MODE_MAP.define_key(?\C-m, :jump_to_link_command)
     HELP_MODE_MAP.define_key(?l, :help_go_back)
     HELP_MODE_MAP.define_key("\C-c\C-b", :help_go_back)

data/lib/textbringer/modes/programming_mode.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   class ProgrammingMode < FundamentalMode
     # abstract mode
@@ -12,16 +10,18 @@ class ProgrammingMode < FundamentalMode
     define_generic_command :backward_definition
     define_generic_command :compile
     define_generic_command :toggle_test
+    define_generic_command :indent_new_comment_line
 
-    PROGRAMMING_MODE_MAP = Keymap.new
+    define_keymap :PROGRAMMING_MODE_MAP
     PROGRAMMING_MODE_MAP.define_key("\t", :indent_line_command)
     PROGRAMMING_MODE_MAP.define_key("\C-m",
                                     :reindent_then_newline_and_indent_command)
-    PROGRAMMING_MODE_MAP.define_key("\e\C-\\", :indent_region_command)
+    PROGRAMMING_MODE_MAP.define_key("\M-\C-\\", :indent_region_command)
     PROGRAMMING_MODE_MAP.define_key("\C-c\C-n", :forward_definition_command)
     PROGRAMMING_MODE_MAP.define_key("\C-c\C-p", :backward_definition_command)
     PROGRAMMING_MODE_MAP.define_key("\C-c\C-c", :compile_command)
     PROGRAMMING_MODE_MAP.define_key("\C-c\C-t", :toggle_test_command)
+    PROGRAMMING_MODE_MAP.define_key("\ej", :indent_new_comment_line_command)
 
     def initialize(buffer)
       super(buffer)
@@ -32,7 +32,7 @@ def initialize(buffer)
     def indent_line
       result = false
       level = calculate_indentation
-      return result if level.nil?
+      return result if level.nil? || level < 0
       @buffer.save_excursion do
         @buffer.beginning_of_line
         @buffer.composite_edit do
@@ -88,6 +88,26 @@ def indent_region(s = @buffer.mark, e = @buffer.point)
       end
     end
 
+    def indent_new_comment_line
+      if comment_start.nil?
+        @buffer.newline
+        return
+      end
+      s = @buffer.save_excursion {
+        @buffer.beginning_of_line
+        if @buffer.looking_at?(/[ \t]*#{comment_start}+[ \t]*/)
+          @buffer.match_string(0)
+        else
+          ""
+        end
+      }
+      @buffer.insert("\n" + s)
+    end
+
+    def comment_start
+      nil
+    end
+
     private
 
     def calculate_indentation

data/lib/textbringer/modes/ruby_mode.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "ripper"
 
 module Textbringer
@@ -87,6 +85,10 @@ class | module | def | undef | begin | rescue | ensure | end |
       )
     /x
 
+    def comment_start
+      "#"
+    end
+
     def initialize(buffer)
       super(buffer)
       @buffer[:indent_level] = CONFIG[:ruby_indent_level]
@@ -175,7 +177,7 @@ def toggle_test
 
     private
 
-    INDENT_BEG_RE = /^([ \t]*)((class|module|def|if|unless|case|while|until|for|begin|end)\b|\})/
+    INDENT_BEG_RE = /^([ \t]*)(class|module|def|if|unless|case|while|until|for|begin)\b/
 
     def space_width(s)
       s.gsub(/\t/, " " * @buffer[:tab_width]).size
@@ -196,6 +198,22 @@ def beginning_of_indentation
       0
     end
 
+    def lex(source)
+      line_count = source.count("\n")
+      s = source
+      lineno = 1
+      tokens = []
+      loop do
+        lexer = Ripper::Lexer.new(s, "-", lineno)
+        tokens.concat(lexer.lex)
+        last_line = tokens.dig(-1, 0, 0)
+        return tokens if last_line.nil? || last_line >= line_count
+        s = source.sub(/(.*\n?){#{last_line}}/, "")
+        return tokens if last_line + 1 <= lineno
+        lineno = last_line + 1
+      end
+    end
+
     def calculate_indentation
       if @buffer.current_line == 1
         return 0
@@ -207,8 +225,11 @@ def calculate_indentation
         base_indentation = beginning_of_indentation
         start_pos = @buffer.point
         start_line = @buffer.current_line
-        tokens = Ripper.lex(@buffer.substring(start_pos, bol_pos))
+        tokens = lex(@buffer.substring(start_pos, bol_pos))
         _, event, text = tokens.last
+        if event == :on_nl
+          _, event, text = tokens[-2]
+        end
         if event == :on_tstring_beg ||
             event == :on_heredoc_beg ||
             event == :on_regexp_beg ||
@@ -216,7 +237,7 @@ def calculate_indentation
             event == :on_tstring_content
           return nil
         end
-        i = find_nearest_beginning_token(tokens)
+        i, extra_end_count = find_nearest_beginning_token(tokens)
         (line, column), event, = i ? tokens[i] : nil
         if event == :on_lparen && tokens.dig(i + 1, 1) != :on_ignored_nl
           return column + 1
@@ -239,11 +260,12 @@ def calculate_indentation
         end
         @buffer.goto_char(bol_pos)
         if line.nil?
-          indentation = base_indentation
+          indentation =
+            base_indentation - extra_end_count * @buffer[:indent_level]
         else
           indentation = base_indentation + @buffer[:indent_level]
         end
-        if @buffer.looking_at?(/[ \t]*([}\])]|(end|else|elsif|when|rescue|ensure)\b)/)
+        if @buffer.looking_at?(/[ \t]*([}\])]|(end|else|elsif|when|in|rescue|ensure)\b)/)
           indentation -= @buffer[:indent_level]
         end
         _, last_event, last_text = tokens.reverse_each.find { |_, e, _|
@@ -261,6 +283,7 @@ def calculate_indentation
     end
 
     BLOCK_END = {
+      '#{' => "}",
       "{" => "}",
       "(" => ")",
       "[" => "]"
@@ -292,9 +315,9 @@ def find_nearest_beginning_token(tokens)
           when "end"
             stack.push(text)
           end
-        when :on_rbrace, :on_rparen, :on_rbracket
+        when :on_rbrace, :on_rparen, :on_rbracket, :on_embexpr_end
           stack.push(text)
-        when :on_lbrace, :on_lparen, :on_lbracket, :on_tlambeg
+        when :on_lbrace, :on_lparen, :on_lbracket, :on_tlambeg, :on_embexpr_beg
           if stack.empty?
             return i
           end
@@ -304,7 +327,7 @@ def find_nearest_beginning_token(tokens)
           stack.pop
         end
       end
-      return nil
+      return nil, stack.grep_v(/[)\]]/).size
     end
 
     def find_test_target_path(base, namespace, name)

data/lib/textbringer/plugin.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   module Plugin
     class << self

data/lib/textbringer/ring.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   class Ring
     include Enumerable

data/lib/textbringer/utils.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "rbconfig"
 
 module Textbringer
@@ -68,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
@@ -104,10 +105,10 @@ def received_keyboard_quit?
     end
 
     def show_exception(e)
-      if e.is_a?(SystemExit)
+      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)
@@ -240,7 +241,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)
@@ -315,8 +316,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,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
-  VERSION = "0.3.2"
+  VERSION = "1.0.4"
 end

data/lib/textbringer/window.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "curses"
 require "unicode/display_width"
 
@@ -457,7 +455,11 @@ def redisplay
               end
             end
           end
-          @window.addstr(c)
+          if c == "\uFEFF"
+            # ncurses on macOS prints U+FEFF as space, so ignore it
+          else
+            @window.addstr(c)
+          end
           break if newx == columns && cury == lines - 2
           @buffer.forward_char
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Shugo Maeda
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-02-08 00:00:00.000000000 Z
+date: 2020-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -176,14 +176,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".gitattributes"
+- ".github/workflows/macos.yml"
+- ".github/workflows/ubuntu.yml"
+- ".github/workflows/windows.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- appveyor.yml
 - bin/console
 - exe/tbclient
 - exe/tbtags
@@ -227,13 +229,15 @@ files:
 - lib/textbringer/utils.rb
 - lib/textbringer/version.rb
 - lib/textbringer/window.rb
+- logo/logo.jpg
+- logo/logo.png
 - screenshot.png
 - textbringer.gemspec
 homepage: https://github.com/shugo/textbringer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -248,9 +252,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 3.0.0.beta3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: An Emacs-like text editor
 test_files: []

data/.travis.yml

@@ -1,56 +0,0 @@
-language: ruby
-matrix:
-  include:
-    - os: linux
-      dist: trusty
-      sudo: false
-      rvm: 2.4.5
-    - os: linux
-      dist: trusty
-      sudo: false
-      rvm: 2.5.2
-    - os: linux
-      dist: trusty
-      sudo: false
-      rvm: 2.6.0
-    - os: linux
-      dist: trusty
-      sudo: false
-      rvm: ruby-head
-    - os: osx
-      osx_image: xcode8.2
-      rvm: 2.4.5
-    - os: osx
-      osx_image: xcode8.2
-      rvm: 2.5.2
-    - os: osx
-      osx_image: xcode8.2
-      rvm: 2.6.0
-    - os: osx
-      osx_image: xcode8.2
-      rvm: ruby-head
-  allow_failures:
-    - os: osx
-    - rvm: ruby-head
-  fast_finish: true
-cache: bundler
-before_install:
-  - gem update --system
-  - gem install bundler-audit
-script:
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
-        xvfb-run bundle exec rake test;
-    else
-        bundle exec rake test;
-    fi
-env:
-  global:
-    UPLOAD_TO_CODECOV: 1
-notifications:
-  email:
-    on_success: never
-    on_failure: always
-addons:
-  apt:
-    packages:
-      - xclip