textbringer 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acc4214c3d7c5b5535435505b2504db1f80d46ba
-  data.tar.gz: e0ad741989368ad91ce5d2b5100896297d28a059
+  metadata.gz: b6dafe6a94443fe1e79c7a9316973fc43ec01525
+  data.tar.gz: 8332b5d2ef6dd7cbb4df030b9e2ce79a4551be83
 SHA512:
-  metadata.gz: f4adfeefebf234a5329c2bfda93f8d9ffe4a83fc029a57579fa8e72d58802aa92be479949a1243f540047ad495efa6507dbbd1d1f61cd5c27e8e3f17225160f3
-  data.tar.gz: 8edab0edf73fbff79c8a16b62a9863a6aa5ee5867abbc494e9bb261c2885fc5e277ac9957731e80adf8806fbcfa15a8e11096094259f0e4ebf7390ba16e3a21e
+  metadata.gz: 5d7687449b608e273a1a0a11155e80e07543095e0bf73deab13740767166274590803d28e203a5816a6526d44a25bf49ac36855deecc1833a007b4a84525b933
+  data.tar.gz: 4cf790621ce7c55960cc7e0087fb6dac140280d60adf20e2e0b9b88f69eef252226cf9bdbf975614bdf56658cbc90de074f568c4a9775fb0c983206fa5951293

data/.travis.yml

@@ -1,12 +1,25 @@
 sudo: false
+os:
+  - linux
+  - osx
 language: ruby
 rvm:
-- 2.3.3
-- 2.4.0
+  - 2.3.3
+  - 2.4.0
+  - ruby-head
+matrix:
+  allow_failures:
+    - os: osx
+    - rvm: ruby-head
+  fast_finish: true
 cache: bundler
 script:
-- xvfb-run bundle exec rake test
-- bundle exec bundle-audit check --update
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
+        xvfb-run bundle exec rake test;
+    else
+        bundle exec rake test;
+    fi
+  - bundle exec bundle-audit check --update
 env:
   global:
     UPLOAD_TO_CODECOV: 1
@@ -14,3 +27,7 @@ notifications:
   email:
     on_success: never
     on_failure: always
+addons:
+  apt:
+    packages:
+      - xclip

data/CHANGES.md

@@ -1,3 +1,9 @@
+## 0.1.8
+
+* Support syntax highlighting.
+* Add the commands grep, gsub, and enlarge_window.
+* Don't translate CR into LF.
+
 ## 0.1.7
 
 * Support EditorConfig.

data/README.md

@@ -11,7 +11,9 @@ text editor.
 
 ## Demo
 
-[![asciicast](https://asciinema.org/a/100156.png)](https://asciinema.org/a/100156)
+* FizzBuzz: https://asciinema.org/a/103357
+* Ruby Programming: https://asciinema.org/a/100156
+* Japanese Text Editing: https://asciinema.org/a/100166
 
 ## WARNING
 
@@ -25,6 +27,12 @@ minor versions.
 
     $ gem install textbringer
 
+You need ncursesw to use multibyte characters.
+Install ncursesw before installing curses.gem, on which textbringer depends.
+
+    $ sudo apt-get install libncursesw5-dev
+    $ gem install curses
+
 ## Usage
 
     $ textbringer

data/exe/textbringer

@@ -33,7 +33,7 @@ Window.start do
       end
     end
   rescue Exception => e
-    handle_exception(e)
+    show_exception(e)
   end
   Window.redisplay
   begin

data/lib/textbringer.rb

@@ -5,6 +5,8 @@ require_relative "textbringer/buffer"
 require_relative "textbringer/window"
 require_relative "textbringer/keymap"
 require_relative "textbringer/utils"
+require_relative "textbringer/color"
+require_relative "textbringer/face"
 require_relative "textbringer/commands"
 require_relative "textbringer/commands/buffers"
 require_relative "textbringer/commands/windows"

data/lib/textbringer/buffer.rb

@@ -162,7 +162,7 @@ module Textbringer
     end
 
     def expand_tab(s)
-      # TOOD: Support multibyte characters
+      # TODO: Support multibyte characters
       tw = self[:tab_width]
       fmt = "A#{tw}"
       s.b.gsub(/([^\t]{#{tw}})|([^\t]*)\t/n) {
@@ -481,7 +481,8 @@ module Textbringer
       @goal_column = nil
     end
 
-    def insert(s, merge_undo = false)
+    def insert(x, merge_undo = false)
+      s = x.to_s
       check_read_only_flag
       pos = @point
       size = s.bytesize
@@ -504,6 +505,7 @@ module Textbringer
       end
       @modified = true
       @goal_column = nil
+      self
     end
 
     def newline
@@ -1185,6 +1187,14 @@ module Textbringer
       end
     end
 
+    def gsub(*args, &block)
+      s = to_s.gsub(*args, &block)
+      delete_region(point_min, point_max)
+      insert(s)
+      merge_undo(2)
+      self
+    end
+
     private
 
     def adjust_gap(min_size = 0, pos = @point)

data/lib/textbringer/color.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require "curses"
+
+module Textbringer
+  module Color
+    BASIC_COLORS = {
+      "default" => -1,
+      "black" => Curses::COLOR_BLACK,
+      "red" => Curses::COLOR_RED,
+      "green" => Curses::COLOR_GREEN,
+      "yellow" => Curses::COLOR_YELLOW,
+      "blue" => Curses::COLOR_BLUE,
+      "magenta" => Curses::COLOR_MAGENTA,
+      "cyan" => Curses::COLOR_CYAN,
+      "white" => Curses::COLOR_WHITE,
+      "brightblack" => 8,
+      "brightred" => 9,
+      "brightgreen" => 10,
+      "brightyellow" => 11,
+      "brightblue" => 12,
+      "brightmagenta" => 13,
+      "brightcyan" => 14,
+      "brightwhite" => 15
+    }
+
+    RGBColor = Struct.new(:r, :g, :b, :number)
+
+    ADDITIONAL_COLORS = []
+    rgb_values = [0, 0x5F, 0x87, 0xAF, 0xD7, 0xFF]
+    rgb_values.product(rgb_values, rgb_values).each_with_index do
+      |(r, g, b), i|
+      ADDITIONAL_COLORS << RGBColor.new(r, g, b, 16 + i)
+    end
+    [
+      0x08, 0x12, 0x1c, 0x26, 0x30, 0x3A, 0x44, 0x4E, 0x58, 0x62, 0x6C, 0x76,
+      0x80, 0x8a, 0x94, 0x9E, 0xA8, 0xB2, 0xBC, 0xC6, 0xD0, 0xDA, 0xE4, 0xEE
+    ].each_with_index do |v, i|
+      ADDITIONAL_COLORS << RGBColor.new(v, v, v, 232 + i)
+    end
+
+    def self.[](name)
+      n = find_color_number(name)
+      if n < Window.colors
+        n
+      else
+        -1
+      end
+    end
+
+    def self.find_color_number(name)
+      if name.is_a?(Integer)
+        return name
+      end
+      case name
+      when /\A\#([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})\z/
+        r = $1.to_i(16)
+        g = $2.to_i(16)
+        b = $3.to_i(16)
+        ADDITIONAL_COLORS.sort_by { |c|
+          (r - c.r) ** 2 + (g - c.g) ** 2 + (b - c.b) ** 2
+        }.first.number
+      else
+        unless BASIC_COLORS.key?(name)
+          raise EditorError, "No such color: #{name}"
+        end
+        BASIC_COLORS[name]
+      end
+    end
+  end
+end

data/lib/textbringer/commands.rb

@@ -16,6 +16,7 @@ module Textbringer
     def define_command(name, &block)
       Commands.send(:define_method, name, &block)
       @@command_list << name if !@@command_list.include?(name)
+      name
     end
     module_function :define_command
 

data/lib/textbringer/commands/clipboard.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+module Clipboard
+  @implementation = nil
+end
+
 require "clipboard"
 
 module Textbringer

data/lib/textbringer/commands/ctags.rb

@@ -14,7 +14,6 @@ module Textbringer
       index: nil,
       tag_mark_stack: []
     }
-    TAG_MARK_LIMIT = 16
 
     define_command(:find_tag) do |next_p = current_prefix_arg|
       tags = get_tags
@@ -111,7 +110,7 @@ module Textbringer
 
     def push_tag_mark_and_find_file(file)
       tag_mark_stack = CTAGS[:tag_mark_stack]
-      if tag_mark_stack.size == TAG_MARK_LIMIT
+      if tag_mark_stack.size == CONFIG[:tag_mark_limit]
         tag_mark_stack.shift.delete
       end
       tag_mark_stack.push(Buffer.current.new_mark)

data/lib/textbringer/commands/misc.rb

@@ -227,16 +227,21 @@ module Textbringer
 
     define_command(:shell_execute) do
       |cmd = read_from_minibuffer("Shell execute: "),
-       buffer_name = "*Shell output*"|
+       buffer_name: "*Shell output*",
+       mode: FundamentalMode|
       buffer = Buffer.find_or_new(buffer_name)
       switch_to_buffer(buffer)
+      buffer.apply_mode(mode)
       buffer.read_only = false
       buffer.clear
       Window.redisplay
       signals = [:INT, :TERM, :KILL]
       begin
         opts = /mswin32|mingw32/ =~ RUBY_PLATFORM ? {} : {pgroup: true}
-        Open3.popen2e(cmd, opts) do |input, output, wait_thread|
+        if CONFIG[:shell_file_name]
+          cmd = [CONFIG[:shell_file_name], CONFIG[:shell_command_switch], cmd]
+        end
+        Open3.popen2e(*cmd, opts) do |input, output, wait_thread|
           input.close
           loop do
             status = output.wait_readable(0.5)
@@ -278,5 +283,11 @@ module Textbringer
         buffer.read_only = true
       end
     end
+
+    define_command(:grep) do
+      |cmd = read_from_minibuffer("Grep: ",
+                                  initial_value: CONFIG[:grep_command] + " ")|
+      shell_execute(cmd, buffer_name: "*grep*", mode: BacktraceMode)
+    end
   end
 end

data/lib/textbringer/commands/windows.rb

@@ -35,6 +35,10 @@ module Textbringer
       Window.other_window
     end
 
+    define_command(:enlarge_window) do |n = number_prefix_arg|
+      Window.current.enlarge(n)
+    end
+
     define_command(:switch_to_buffer) do
       |buffer_name = read_buffer("Switch to buffer: ")|
       if buffer_name.is_a?(Buffer)

data/lib/textbringer/config.rb

@@ -8,6 +8,13 @@ module Textbringer
     tab_width: 8,
     indent_tabs_mode: false,
     case_fold_search: true,
-    buffer_dump_dir: File.expand_path("~/.textbringer/buffer_dump")
+    buffer_dump_dir: File.expand_path("~/.textbringer/buffer_dump"),
+    tag_mark_limit: 16,
+    window_min_height: 4,
+    syntax_highlight: true,
+    highlight_buffer_size_limit: 102400,
+    shell_file_name: ENV["SHELL"],
+    shell_command_switch: "-c",
+    grep_command: "grep -nH -e"
   }
 end

data/lib/textbringer/controller.rb

@@ -7,7 +7,7 @@ module Textbringer
   class Controller
     attr_accessor :this_command, :last_command, :overriding_map
     attr_accessor :prefix_arg, :current_prefix_arg
-    attr_reader :last_key, :recursive_edit_level
+    attr_reader :key_sequence, :last_key, :recursive_edit_level
 
     @@current = nil
 
@@ -114,7 +114,7 @@ module Textbringer
         "<#{key}>"
       when "\e"
         "ESC"
-      when "\n"
+      when "\C-m"
         "RET"
       when /\A[\0-\b\v-\x1f\x7f]\z/
         "C-" + (key.ord ^ 0x40).chr.downcase
@@ -123,14 +123,6 @@ module Textbringer
       end
     end
 
-    private
-
-    def key_binding(key_sequence)
-      @overriding_map&.lookup(key_sequence) ||
-      Buffer.current&.keymap&.lookup(key_sequence) ||
-        GLOBAL_MAP.lookup(key_sequence)
-    end
-
     def echo_input
       if @prefix_arg || !@key_sequence.empty?
         if !@echo_immediately
@@ -157,5 +149,13 @@ module Textbringer
         @echo_immediately = false
       end
     end
+
+    private
+
+    def key_binding(key_sequence)
+      @overriding_map&.lookup(key_sequence) ||
+      Buffer.current&.keymap&.lookup(key_sequence) ||
+        GLOBAL_MAP.lookup(key_sequence)
+    end
   end
 end

data/lib/textbringer/face.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require "curses"
+
+module Textbringer
+  class Face
+    attr_reader :name, :attributes
+
+    @@face_table = {}
+    @@next_color_pair = 1
+
+    def self.[](name)
+      @@face_table[name]
+    end
+
+    def self.define(name, **opts)
+      if @@face_table.key?(name)
+        @@face_table[name].update(**opts)
+      else
+        @@face_table[name] = new(name, **opts)
+      end
+    end
+
+    def self.delete(name)
+      @@face_table.delete(name)
+    end
+
+    def initialize(name, **opts)
+      @name = name
+      @color_pair = @@next_color_pair
+      @@next_color_pair += 1
+      update(**opts)
+    end
+
+    def update(foreground: -1, background: -1,
+               bold: false, underline: false, reverse: false)
+      @foreground = foreground
+      @background = background
+      @bold = bold
+      @underline = underline
+      @reverse = reverse
+      Curses.init_pair(@color_pair,
+                       Color[foreground], Color[background])
+      @attributes = 0
+      @attributes |= Curses.color_pair(@color_pair)
+      @attributes |= Curses::A_BOLD if bold
+      @attributes |= Curses::A_UNDERLINE if underline
+      @attributes |= Curses::A_REVERSE if reverse
+      self
+    end
+  end
+end

data/lib/textbringer/faces/basic.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Textbringer
+  Face.define :mode_line, reverse: true
+  Face.define :link, foreground: "blue", bold: true
+end

data/lib/textbringer/faces/programming.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Textbringer
+  Face.define :comment, foreground: "yellow"
+  Face.define :preprocessing_directive, foreground: "green"
+  Face.define :keyword, foreground: "magenta", bold: true
+  Face.define :string, foreground: "blue", bold: true
+end

data/lib/textbringer/keymap.rb

@@ -96,7 +96,8 @@ module Textbringer
   GLOBAL_MAP.define_key(?\C-_, :undo)
   GLOBAL_MAP.define_key("\C-x\C-_", :redo)
   GLOBAL_MAP.define_key("\C-t", :transpose_chars)
-  GLOBAL_MAP.define_key(?\n, :newline)
+  GLOBAL_MAP.define_key("\C-j", :newline)
+  GLOBAL_MAP.define_key("\C-m", :newline)
   GLOBAL_MAP.define_key("\C-l", :recenter)
   GLOBAL_MAP.define_key("\C-v", :scroll_up)
   GLOBAL_MAP.define_key(:npage, :scroll_up)
@@ -106,6 +107,7 @@ module Textbringer
   GLOBAL_MAP.define_key("\C-x1", :delete_other_windows)
   GLOBAL_MAP.define_key("\C-x2", :split_window)
   GLOBAL_MAP.define_key("\C-xo", :other_window)
+  GLOBAL_MAP.define_key("\C-x^", :enlarge_window)
   GLOBAL_MAP.define_key("\C-x\C-c", :exit_textbringer)
   GLOBAL_MAP.define_key("\C-z", :suspend_textbringer)
   GLOBAL_MAP.define_key("\C-x\C-f", :find_file)
@@ -113,8 +115,8 @@ module Textbringer
   GLOBAL_MAP.define_key("\C-x\C-s", :save_buffer)
   GLOBAL_MAP.define_key("\C-x\C-w", :write_file)
   GLOBAL_MAP.define_key("\C-xk", :kill_buffer)
-  GLOBAL_MAP.define_key("\C-x\nf", :set_buffer_file_encoding)
-  GLOBAL_MAP.define_key("\C-x\nn", :set_buffer_file_format)
+  GLOBAL_MAP.define_key("\C-x\C-mf", :set_buffer_file_encoding)
+  GLOBAL_MAP.define_key("\C-x\C-mn", :set_buffer_file_format)
   GLOBAL_MAP.define_key("\ex", :execute_command)
   GLOBAL_MAP.define_key("\e:", :eval_expression)
   GLOBAL_MAP.define_key(?\C-u, :universal_argument)
@@ -132,7 +134,8 @@ module Textbringer
   end
 
   MINIBUFFER_LOCAL_MAP = Keymap.new
-  MINIBUFFER_LOCAL_MAP.define_key(?\n, :exit_recursive_edit)
+  MINIBUFFER_LOCAL_MAP.define_key("\C-j", :exit_recursive_edit)
+  MINIBUFFER_LOCAL_MAP.define_key("\C-m", :exit_recursive_edit)
   MINIBUFFER_LOCAL_MAP.define_key(?\t, :complete_minibuffer)
   MINIBUFFER_LOCAL_MAP.define_key(?\C-g, :abort_recursive_edit)
 end

data/lib/textbringer/mode.rb

@@ -17,6 +17,7 @@ module Textbringer
       attr_accessor :hook_name
       attr_accessor :file_name_pattern
       attr_accessor :interpreter_name_pattern
+      attr_reader :syntax_table
     end
 
     def self.define_generic_command(name)
@@ -35,6 +36,10 @@ module Textbringer
       end
     end
 
+    def self.define_syntax(face_name, re)
+      @syntax_table[face_name] = re
+    end
+
     def self.inherited(child)
       base_name = child.name.slice(/[^:]*\z/)
       child.mode_name = base_name.sub(/Mode\z/, "")
@@ -50,6 +55,7 @@ module Textbringer
         Buffer.current.apply_mode(child)
       end
       @@mode_list.push(child)
+      child.instance_variable_set(:@syntax_table, {})
     end
 
     attr_reader :buffer
@@ -61,5 +67,9 @@ module Textbringer
     def name
       self.class.mode_name
     end
+
+    def syntax_table
+      self.class.syntax_table
+    end
   end
 end

data/lib/textbringer/modes/backtrace_mode.rb

@@ -5,7 +5,9 @@ module Textbringer
     define_generic_command :jump_to_source_location
 
     BACKTRACE_MODE_MAP = Keymap.new
-    BACKTRACE_MODE_MAP.define_key("\n", :jump_to_source_location_command)
+    BACKTRACE_MODE_MAP.define_key("\C-m", :jump_to_source_location_command)
+
+    define_syntax :link, /^\S*?:\d+:(?:\d+:)?/
 
     def initialize(buffer)
       super(buffer)
@@ -13,10 +15,11 @@ module Textbringer
     end
 
     def jump_to_source_location
-      file_name, line_number = get_source_location
+      file_name, line_number, column_number = get_source_location
       if file_name
         find_file(file_name)
         goto_line(line_number)
+        forward_char(column_number - 1)
       end
     end
 
@@ -25,10 +28,11 @@ module Textbringer
     def get_source_location
       @buffer.save_excursion do
         @buffer.beginning_of_line
-        if @buffer.looking_at?(/^(\S*?):(\d+):/)
+        if @buffer.looking_at?(/^(\S*?):(\d+):(?:(\d+):)?/)
           file_name = @buffer.match_string(1)
           line_number = @buffer.match_string(2).to_i
-          [file_name, line_number]
+          column_number = (@buffer.match_string(3) || 1).to_i
+          [file_name, line_number, column_number]
         else
           nil
         end

data/lib/textbringer/modes/c_mode.rb

@@ -10,6 +10,32 @@ module Textbringer
   class CMode < ProgrammingMode
     self.file_name_pattern =  /\A.*\.[ch]\z/i
 
+    KEYWORDS = %w(
+      auto break case char const continue default double do
+      else enum extern float for goto if inline int long
+      register restrict return short signed sizeof static struct
+      switch typedef union unsigned void volatile while _Bool
+      _Complex _Imaginary
+    )
+
+    define_syntax :comment, /
+      (?: \/\* (?> (?:.|\n)*? \*\/ ) ) |
+      (?: \/\/ .*(?:\\\n.*)*(?:\z|(?<!\\)\n) )
+    /x
+
+    define_syntax :preprocessing_directive, /
+      ^ [\ \t]* (?: \# | %: ) [\ \t]* [_a-zA-Z][_a-zA-Z0-9]*
+    /x
+
+    define_syntax :keyword, /
+      \b (?: #{KEYWORDS.join("|")} ) \b
+    /x
+
+    define_syntax :string, /
+      (?: " (?: [^\\"] | \\ (?:.|\n)  )* " ) |
+      (?: ' (?: [^\\'] | \\ (?:.|\n)  )* ' )
+    /x
+    
     def initialize(buffer)
       super(buffer)
       @buffer[:indent_level] = CONFIG[:c_indent_level]
@@ -18,7 +44,8 @@ module Textbringer
 
     def compile(cmd = read_from_minibuffer("Compile: ",
                                            default: default_compile_command))
-      shell_execute(cmd, "*Compile result*")
+      shell_execute(cmd, buffer_name: "*Compile result*",
+                    mode: BacktraceMode)
     end
 
     def symbol_pattern
@@ -55,13 +82,7 @@ module Textbringer
   (?<singleline_comment> \/\/ .*? \\\n (?:.|\n)* )
 ) |
 (?<keyword>
-  (?:
-    auto | break | case | char | const | continue | default | double | do |
-    else | enum | extern | float | for | goto | if | inline | int | long |
-    register | restrict | return | short | signed | sizeof | static | struct |
-    switch | typedef | union | unsigned | void | volatile | while | _Bool |
-    _Complex | _Imaginary
-  ) \b
+  (?: #{KEYWORDS.join("|")} ) \b
 ) |
 (?<constant>
   (?<floating_constant>

data/lib/textbringer/modes/completion_list_mode.rb

@@ -7,6 +7,8 @@ module Textbringer
     COMPLETION_LIST_MODE_MAP = Keymap.new
     COMPLETION_LIST_MODE_MAP.define_key("\n", :choose_completion_command)
 
+    define_syntax :link, /^.+$/
+
     def initialize(buffer)
       super(buffer)
       buffer.keymap = COMPLETION_LIST_MODE_MAP

data/lib/textbringer/modes/programming_mode.rb

@@ -14,11 +14,11 @@ module Textbringer
 
     PROGRAMMING_MODE_MAP = Keymap.new
     PROGRAMMING_MODE_MAP.define_key("\t", :indent_line_command)
-    PROGRAMMING_MODE_MAP.define_key("\n", :newline_and_reindent_command)
+    PROGRAMMING_MODE_MAP.define_key("\C-m", :newline_and_reindent_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-ct", :toggle_test_command)
+    PROGRAMMING_MODE_MAP.define_key("\C-c\C-t", :toggle_test_command)
 
     def initialize(buffer)
       super(buffer)
@@ -64,7 +64,7 @@ module Textbringer
       @buffer.save_excursion do
         pos = @buffer.point
         @buffer.beginning_of_line
-        if /\A\s+\z/ =~ @buffer.substring(@buffer.point, pos)
+        if /\A[ \t]+\z/ =~ @buffer.substring(@buffer.point, pos)
           @buffer.delete_region(@buffer.point, pos)
           n += 1
         end

data/lib/textbringer/modes/ruby_mode.rb

@@ -12,6 +12,65 @@ module Textbringer
             (?:Gem|Rake|Cap|Thor|Vagrant|Guard|Pod)file)\z/ix
     self.interpreter_name_pattern = /ruby/i
 
+    define_syntax :comment, /
+      (?: \#.*(?:\\\n.*)*(?:\z|(?<!\\)\n) ) |
+      (?: ^=begin (?:.|\n)* (?> ^=end \b ) )
+    /x
+
+    define_syntax :keyword, /
+      (?<![$@.]) \b (?: (?:
+        class | module | def | undef | begin | rescue | ensure | end |
+        if | unless | then | elsif | else | case | when | while | until |
+        for | break | next | redo | retry | in | do | return | yield |
+        super | self | nil | true | false | and | or | not | alias
+      ) \b | defined\? )
+    /x
+
+    define_syntax :string, /
+      (?: (?<! [a-zA-Z] ) \? (:? [^\\\s] | \\ . ) ) |
+      (?: %[qQrwWsix]?\{ (?: [^\\}] | \\ .  )* \} ) |
+      (?: %[qQrwWsix]?\( (?: [^\\)] | \\ .  )* \) ) |
+      (?: %[qQrwWsix]?\[ (?: [^\\\]] | \\ .  )* \] ) |
+      (?: %[qQrwWsix]?< (?: [^\\>] | \\ .  )* > ) |
+      (?:
+         %[qQrwWsix]?
+             (?<string_delimiter>[^{(\[<a-zA-Z0-9\s\u{0100}-\u{10ffff}])
+             (?: (?! \k<string_delimiter> ) [^\\] | \\ .  )*
+             \k<string_delimiter>
+      ) |
+      (?:
+        (?<! \$ )
+            " (?: [^\\"] | \\ .  )* "
+      ) |
+      (?:
+        (?<! \$ )
+            ' (?: [^\\'] | \\ .  )* '
+      ) |
+      (?:
+         (?<! [$.] | def | def \s )
+             ` (?: [^\\`] | \\ .  )* `
+      ) |
+      (?:
+        (?<=
+          ^ |
+          \b and | \b or | \b while | \b until | \b unless | \b if |
+          \b elsif | \b when | \b not | \b then | \b else |
+          [;~=!|&(,\[<>?:*+-]
+        ) \s*
+        \/ (?: [^\\\/] | \\ .  )* \/[iomxneus]*
+      ) |
+      (?:
+        (?<! class | class \s | [\]})"'.] | :: | \w )
+            <<-?(?<heredoc_quote>['"`]?)
+            (?<heredoc_terminator>
+              [_a-zA-Z\u{0100}-\u{10ffff}]
+              [_a-zA-Z0-9\u{0100}-\u{10ffff}]*
+            )
+            \k<heredoc_quote>
+            (?> (?:.|\n)*? \k<heredoc_terminator> )
+      )
+    /x
+
     def initialize(buffer)
       super(buffer)
       @buffer[:indent_level] = CONFIG[:ruby_indent_level]
@@ -62,8 +121,8 @@ module Textbringer
 
     def compile(cmd = read_from_minibuffer("Compile: ",
                                            default: default_compile_command))
-      shell_execute(cmd, "*Ruby compile result*")
-      backtrace_mode
+      shell_execute(cmd, buffer_name: "*Ruby compile result*",
+                    mode: BacktraceMode)
     end
 
     def symbol_pattern
@@ -176,7 +235,9 @@ module Textbringer
           e != :on_sp && e != :on_nl && e != :on_ignored_nl
         }
         if (last_event == :on_op && last_text != "|") ||
-            last_event == :on_period
+            last_event == :on_period ||
+            (last_event == :on_comma &&
+             event != :on_lbrace && event != :on_lbracket)
           indentation += @buffer[:indent_level]
         end
         indentation

data/lib/textbringer/utils.rb

@@ -90,6 +90,7 @@ module Textbringer
     }
 
     def read_from_minibuffer(prompt, completion_proc: nil, default: nil,
+                             initial_value: nil,
                              keymap: MINIBUFFER_LOCAL_MAP)
       if Window.echo_area.active?
         raise EditorError,
@@ -104,9 +105,9 @@ module Textbringer
       Buffer.minibuffer[:completion_proc] = completion_proc
       Window.echo_area.active = true
       begin
-        Buffer.minibuffer.delete_region(Buffer.minibuffer.point_min,
-                                        Buffer.minibuffer.point_max)
         Window.current = Window.echo_area
+        Buffer.minibuffer.clear
+        Buffer.minibuffer.insert(initial_value) if initial_value
         if default
           prompt = prompt.sub(/:/, " (default #{default}):")
         end
@@ -275,8 +276,17 @@ module Textbringer
       RbConfig::CONFIG["ruby_install_name"]
     end
 
-    def insert(s)
-      Buffer.current.insert(s)
+    [
+      :beginning_of_buffer?,
+      :end_of_buffer?,
+      :beginning_of_line?,
+      :end_of_line?,
+      :insert,
+      :gsub
+    ].each do |name|
+      define_method(name) do |*args, &block|
+        Buffer.current.send(name, *args, &block)
+      end
     end
   end
 end

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/textbringer/window.rb

@@ -48,9 +48,11 @@ module Textbringer
         name.slice(/\AKEY_(.*)/, 1).downcase.intern
     end
 
+    @@started = false
     @@windows = []
     @@current = nil
     @@echo_area = nil
+    @@has_colors = false
 
     def self.windows
       @@windows
@@ -119,10 +121,42 @@ module Textbringer
       @@echo_area
     end
 
+    def self.has_colors=(value)
+      @@has_colors = value
+    end
+
+    def self.has_colors?
+      @@has_colors
+    end
+
+    def self.colors
+      Curses.colors
+    end
+
+    def self.set_default_colors(fg, bg)
+      Curses.assume_default_colors(Color[fg], Color[bg])
+      Window.redraw
+    end
+
+    def self.load_faces
+      require_relative "faces/basic"
+      require_relative "faces/programming"
+    end
+
     def self.start
+      if @@started
+        raise EditorError, "Already started"
+      end
       Curses.init_screen
       Curses.noecho
       Curses.raw
+      Curses.nonl
+      self.has_colors = Curses.has_colors?
+      if has_colors?
+        Curses.start_color
+        Curses.use_default_colors
+        load_faces
+      end
       begin
         window =
           Textbringer::Window.new(Window.lines - 1, Window.columns, 0, 0)
@@ -134,11 +168,18 @@ module Textbringer
         Buffer.minibuffer.keymap = MINIBUFFER_LOCAL_MAP
         @@echo_area.buffer = Buffer.minibuffer
         @@windows.push(@@echo_area)
+        @@started = true
         yield
       ensure
+        @@windows.each do |win|
+          win.delete
+        end
+        @@windows.clear
         Curses.echo
         Curses.noraw
+        Curses.nl
         Curses.close_screen
+        @@started = false
       end
     end
 
@@ -173,7 +214,8 @@ module Textbringer
 
     def self.resize
       @@windows.delete_if do |window|
-        if !window.echo_area? && window.y > Window.lines - 4
+        if !window.echo_area? &&
+            window.y > Window.lines - CONFIG[:window_min_height]
           window.delete
           true
         else
@@ -284,7 +326,7 @@ module Textbringer
         end
         KEY_NAMES[key] || key
       else
-        key&.encode(Encoding::UTF_8)&.tr("\r", "\n")
+        key&.encode(Encoding::UTF_8)
       end
     end
 
@@ -329,6 +371,40 @@ module Textbringer
       end
     end
 
+    def highlight
+      @highlight_on = {}
+      @highlight_off = {}
+      return if !@@has_colors || !CONFIG[:syntax_highlight]
+      syntax_table = @buffer.mode.syntax_table
+      return if syntax_table.empty?
+      if @buffer.bytesize < CONFIG[:highlight_buffer_size_limit]
+        base_pos = @buffer.point_min
+        s = @buffer.to_s
+      else
+        base_pos = @buffer.point
+        len = columns * (lines - 1) / 2 * 3
+        s = @buffer.substring(@buffer.point, @buffer.point + len).scrub("")
+      end
+      re_str = syntax_table.map { |name, re|
+        "(?<#{name}>#{re})"
+      }.join("|")
+      re = Regexp.new(re_str)
+      names = syntax_table.keys
+      s.scan(re) do
+        b = base_pos + $`.bytesize
+        e = b + $&.bytesize
+        if b < @buffer.point && @buffer.point < e
+          b = @buffer.point
+        end
+        name = names.find { |n| $~[n] }
+        attributes = Face[name]&.attributes
+        if attributes
+          @highlight_on[b] = attributes
+          @highlight_off[e] = attributes
+        end
+      end
+    end
+
     def redisplay
       return if @buffer.nil?
       redisplay_mode_line
@@ -342,8 +418,10 @@ module Textbringer
         framer
         y = x = 0
         @buffer.point_to_mark(@top_of_window)
+        highlight
         @window.erase
         @window.setpos(0, 0)
+        @window.attrset(0)
         if current? && @buffer.visible_mark &&
            @buffer.point_after_mark?(@buffer.visible_mark)
           @window.attron(Curses::A_REVERSE)
@@ -368,6 +446,12 @@ module Textbringer
               @window.attron(Curses::A_REVERSE)
             end
           end
+          if attrs = @highlight_off[@buffer.point]
+            @window.attroff(attrs)
+          end
+          if attrs = @highlight_on[@buffer.point]
+            @window.attron(attrs)
+          end
           c = @buffer.char_after
           if c == "\n"
             @window.clrtoeol
@@ -478,11 +562,11 @@ module Textbringer
     end
 
     def split
-      if lines < 6
-        raise EditorError, "Window too small"
-      end
       old_lines = lines
       new_lines = (old_lines / 2.0).ceil
+      if new_lines < CONFIG[:window_min_height]
+        raise EditorError, "Window too small"
+      end
       resize(new_lines, columns)
       new_window = Window.new(old_lines - new_lines, columns, y + new_lines, x)
       new_window.buffer = buffer
@@ -490,6 +574,47 @@ module Textbringer
       @@windows.insert(i + 1, new_window)
     end
 
+    def enlarge(n)
+      if n > 0
+        max_height = Window.lines -
+          CONFIG[:window_min_height] * (@@windows.size - 2) - 1
+        new_lines = [lines + n, max_height].min
+        needed_lines = new_lines - lines
+        resize(new_lines, columns)
+        i = @@windows.index(self)
+        indices = (i + 1).upto(@@windows.size - 2).to_a +
+          (i - 1).downto(0).to_a
+        indices.each do |j|
+          break if needed_lines == 0
+          window = @@windows[j]
+          extended_lines = [
+            window.lines - CONFIG[:window_min_height],
+            needed_lines
+          ].min
+          window.resize(window.lines - extended_lines, window.columns)
+          needed_lines -= extended_lines
+        end
+        y = 0
+        @@windows.each do |win|
+          win.move(y, win.x)
+          y += win.lines
+        end
+      elsif n < 0 && @@windows.size > 2
+        new_lines = [lines + n, CONFIG[:window_min_height]].max
+        diff = lines - new_lines
+        resize(new_lines, columns)
+        i = @@windows.index(self)
+        if i < @@windows.size - 2
+          window = @@windows[i + 1]
+          window.move(window.y - diff, window.x)
+        else
+          window = @@windows[i - 1]
+          move(self.y + diff, self.x)
+        end
+        window.resize(window.lines + diff, window.columns)
+      end
+    end
+
     private
 
     def initialize_window(num_lines, num_columns, y, x)
@@ -522,7 +647,8 @@ module Textbringer
     def redisplay_mode_line
       @mode_line.erase
       @mode_line.setpos(0, 0)
-      @mode_line.attron(Curses::A_REVERSE)
+      attrs = @@has_colors ? Face[:mode_line].attributes : Curses::A_REVERSE
+      @mode_line.attrset(attrs)
       @mode_line.addstr("#{@buffer.name} ")
       @mode_line.addstr("[+]") if @buffer.modified?
       @mode_line.addstr("[RO]") if @buffer.read_only?
@@ -540,7 +666,7 @@ module Textbringer
       @mode_line.addstr(" #{line},#{column}")
       @mode_line.addstr(" (#{@buffer.mode&.name || 'None'})")
       @mode_line.addstr(" " * (columns - @mode_line.curx))
-      @mode_line.attroff(Curses::A_REVERSE)
+      @mode_line.attrset(0)
       @mode_line.noutrefresh
     end
 

data/textbringer.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3'
 
-  spec.add_runtime_dependency "curses", "~> 1.1"
+  spec.add_runtime_dependency "curses", "~> 1.2"
   spec.add_runtime_dependency "unicode-display_width", "~> 1.1"
   spec.add_runtime_dependency "clipboard", "~> 1.1"
   spec.add_runtime_dependency "ffi"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-12 00:00:00.000000000 Z
+date: 2017-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: unicode-display_width
   requirement: !ruby/object:Gem::Requirement
@@ -229,6 +229,7 @@ files:
 - exe/textbringer
 - lib/textbringer.rb
 - lib/textbringer/buffer.rb
+- lib/textbringer/color.rb
 - lib/textbringer/commands.rb
 - lib/textbringer/commands/buffers.rb
 - lib/textbringer/commands/clipboard.rb
@@ -242,6 +243,9 @@ files:
 - lib/textbringer/config.rb
 - lib/textbringer/controller.rb
 - lib/textbringer/errors.rb
+- lib/textbringer/face.rb
+- lib/textbringer/faces/basic.rb
+- lib/textbringer/faces/programming.rb
 - lib/textbringer/keymap.rb
 - lib/textbringer/mode.rb
 - lib/textbringer/modes/backtrace_mode.rb