textbringer 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 57386322dcb1c04c07b26ccc281b10dc86fff8e1
-  data.tar.gz: 1dc85e31122a28561a9e47bb750b0602ec8619f7
+SHA256:
+  metadata.gz: 7c42284ec820a6074794ed19f174f9ac393d5caa316f8408db5c5e43d5e87041
+  data.tar.gz: 95d805f94fbce11d2858c44a2fd275af3b8cdbfe6aed396a7807ac8543282d31
 SHA512:
-  metadata.gz: 29a2f745379f31d22b838691f1f61ef8fd5502786cdd32a9fd698cd603b96ffb9d48c93091ed3186ee6c677d5c495bc9a51d6b358deb1a21da93b9ab179ded7f
-  data.tar.gz: c9e02c3d2161d3f5a4d1fe52bee20c7bb66972fa9c716737e94fbdd56fc59db1b5bd3a22500a5d34d48629dfea8bf324f9d9b748c1c4645e803adc284a80787e
+  metadata.gz: a849309d4b2d77f350619fced9d26555598777fcde6f42d26439576c0933316a796027c9bc82fa427c4f698cbe581fb3b3428db8cd09ea2b7ecdaf0b6f690e47
+  data.tar.gz: 186933b3607392f5b28d32ab22df7324f960821fb8abb651403db281973e92bd1715d8d0e7841d0a1e1bc57ed50659f28095684e9c7a199e44bc118190aa4c23

data/.travis.yml

@@ -4,21 +4,28 @@ matrix:
     - os: linux
       dist: trusty
       sudo: false
-      rvm: 2.3.4
+      rvm: 2.3.5
     - os: linux
       dist: trusty
       sudo: false
-      rvm: 2.4.1
+      rvm: 2.4.3
+    - os: linux
+      dist: trusty
+      sudo: false
+      rvm: 2.5.0
     - os: linux
       dist: trusty
       sudo: false
       rvm: ruby-head
     - os: osx
       osx_image: xcode8.2
-      rvm: 2.3.3
+      rvm: 2.3.5
+    - os: osx
+      osx_image: xcode8.2
+      rvm: 2.4.3
     - os: osx
       osx_image: xcode8.2
-      rvm: 2.4.0
+      rvm: 2.5.0
     - os: osx
       osx_image: xcode8.2
       rvm: ruby-head
@@ -27,6 +34,7 @@ matrix:
     - rvm: ruby-head
   fast_finish: true
 cache: bundler
+before_install: gem update --system
 script:
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
         xvfb-run bundle exec rake test;

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 0.2.8
+
+* Highlight control characters.
+
 ## 0.2.7
 
 * Add isearch_yank_word_or_char.

data/appveyor.yml

@@ -2,7 +2,6 @@
 clone_depth: 10
 install:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - gem install bundler --no-document
   - bundle install
   - ps: '[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12'
   - ps: Invoke-WebRequest -Uri https://curl.haxx.se/ca/cacert.pem -OutFile C:\projects\textbringer\cacert.pem

data/lib/textbringer/config.rb

@@ -13,7 +13,7 @@ module Textbringer
     global_mark_ring_max: 16,
     window_min_height: 4,
     syntax_highlight: true,
-    highlight_buffer_size_limit: 102400,
+    highlight_buffer_size_limit: 1024,
     shell_file_name: ENV["SHELL"],
     shell_command_switch: "-c",
     grep_command: "grep -nH -e",

data/lib/textbringer/faces/basic.rb

@@ -3,4 +3,5 @@
 module Textbringer
   Face.define :mode_line, reverse: true
   Face.define :link, foreground: "blue", bold: true
+  Face.define :control
 end

data/lib/textbringer/keymap.rb

@@ -31,7 +31,12 @@ module Textbringer
         @map[key_sequence.first]
       else
         k, *ks = key_sequence
-        @map[k]&.lookup(ks)
+        km = @map[k]
+        if km.is_a?(Keymap)
+          km.lookup(ks)
+        else
+          nil
+        end
       end
     end
 

data/lib/textbringer/mode.rb

@@ -6,6 +6,10 @@ module Textbringer
     include Commands
     
     @@mode_list = []
+
+    DEFAULT_SYNTAX_TABLE = {
+      control: /[\0-\t\v-\x1f\x7f\u{3000}]+/
+    }
     
     def self.list
       @@mode_list
@@ -61,7 +65,7 @@ module Textbringer
         Buffer.current.apply_mode(child)
       end
       @@mode_list.push(child)
-      child.instance_variable_set(:@syntax_table, {})
+      child.instance_variable_set(:@syntax_table, DEFAULT_SYNTAX_TABLE.dup)
     end
 
     attr_reader :buffer

data/lib/textbringer/modes/ruby_mode.rb

@@ -234,12 +234,12 @@ module Textbringer
               break
             end
           end
+          @buffer.looking_at?(/[ \t]*/)
+          base_indentation = @buffer.match_string(0).
+            gsub(/\t/, " " * @buffer[:tab_width]).size
         else
-          @buffer.backward_line
+          base_indentation = 0
         end
-        @buffer.looking_at?(/[ \t]*/)
-        base_indentation = @buffer.match_string(0).
-          gsub(/\t/, " " * @buffer[:tab_width]).size
         @buffer.goto_char(bol_pos)
         if line.nil? ||
           @buffer.looking_at?(/[ \t]*([}\])]|(end|else|elsif|when|rescue|ensure)\b)/)

data/lib/textbringer/utils.rb

@@ -311,7 +311,7 @@ module Textbringer
 
     HOOKS = Hash.new { |h, k| h[k] = [] }
 
-    def add_hook(name, func)
+    def add_hook(name, func = Proc.new)
       HOOKS[name].unshift(func)
     end
 

data/lib/textbringer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Textbringer
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/lib/textbringer/window.rb

@@ -354,8 +354,7 @@ module Textbringer
       @highlight_on = {}
       @highlight_off = {}
       return if !@@has_colors || !CONFIG[:syntax_highlight] || @buffer.binary?
-      syntax_table = @buffer.mode.syntax_table
-      return if syntax_table.empty?
+      syntax_table = @buffer.mode.syntax_table || DEFAULT_SYNTAX_TABLE
       if @buffer.bytesize < CONFIG[:highlight_buffer_size_limit]
         base_pos = @buffer.point_min
         s = @buffer.to_s
@@ -364,6 +363,7 @@ module Textbringer
         len = columns * (lines - 1) / 2 * 3
         s = @buffer.substring(@buffer.point, @buffer.point + len).scrub("")
       end
+      return if !s.valid_encoding?
       re_str = syntax_table.map { |name, re|
         "(?<#{name}>#{re})"
       }.join("|")
@@ -677,6 +677,9 @@ module Textbringer
     end
 
     def escape(s)
+      if !s.valid_encoding?
+        s = s.b
+      end
       if @buffer.binary?
         s.gsub(/[\0-\b\v-\x1f\x7f]/) { |c|
           "^" + (c.ord ^ 0x40).chr

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-18 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -259,9 +259,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: An Emacs-like text editor
 test_files: []
-has_rdoc: