textbringer 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88862bef486e7b3ea0b5b2a410eae26b089b3180
-  data.tar.gz: cfa7d1c4ca4e19a7f7b648d783f0779ea9469678
+  metadata.gz: acc4214c3d7c5b5535435505b2504db1f80d46ba
+  data.tar.gz: e0ad741989368ad91ce5d2b5100896297d28a059
 SHA512:
-  metadata.gz: '0238827e2f2a54593d541dbbc621d135f9279d153e15120742efa6e775df74e8c0c95ed39366ec2e5833c5d8df0a16cc49279e48ed9c53bdff2e8684dd82d2ac'
-  data.tar.gz: 4d29f982b2c0f761fce5b607fc11a5081ed029e09f81a2ab43c8664f22535ddafa2346406bec655ccd67d32a824ee77f53c375bf026211c804f1b3c130168d17
+  metadata.gz: f4adfeefebf234a5329c2bfda93f8d9ffe4a83fc029a57579fa8e72d58802aa92be479949a1243f540047ad495efa6507dbbd1d1f61cd5c27e8e3f17225160f3
+  data.tar.gz: 8edab0edf73fbff79c8a16b62a9863a6aa5ee5867abbc494e9bb261c2885fc5e277ac9957731e80adf8806fbcfa15a8e11096094259f0e4ebf7390ba16e3a21e

data/.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+end_of_line = lf
+
+[*.rb]
+indent_style = space
+indent_size = 2
+

data/.travis.yml

@@ -7,6 +7,9 @@ cache: bundler
 script:
 - xvfb-run bundle exec rake test
 - bundle exec bundle-audit check --update
+env:
+  global:
+    UPLOAD_TO_CODECOV: 1
 notifications:
   email:
     on_success: never

data/CHANGES.md

@@ -1,3 +1,11 @@
+## 0.1.7
+
+* Support EditorConfig.
+* Add CONFIG[:ambiguos_east_asian_width].
+* Add C mode.
+* Add the *Completions* buffer.
+* Echo multi-character commands in the echo area.
+
 ## 0.1.6
 
 * Fix bugs of clipboard commands.

data/README.md

@@ -1,12 +1,13 @@
 # Textbringer
 
 [![Gem Version](https://badge.fury.io/rb/textbringer.svg)](https://badge.fury.io/rb/textbringer)
+[![Dependency Status](https://gemnasium.com/shugo/textbringer.svg)](https://gemnasium.com/shugo/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)
 [![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 a text
-editor.
+Textbringer is a member of a demon race that takes on the form of an Emacs-like
+text editor.
 
 ## Demo
 
@@ -30,27 +31,60 @@ minor versions.
 
 You can quit the editor by C-x C-c.
 
-## Configuration of terminal emulators
+## Configuration
 
-### xterm
+### Meta key
+
+You need the following configuration of terminal emulators to use meta key.
+
+#### xterm
 
 Add the following line to ~/.Xresources.
 
     XTerm*metaSendsEscape: true
 
-### mlterm
+#### mlterm
 
 Add the following lines to ~/.mlterm/main.
 
     mod_meta_key = alt
     mod_meta_mode = esc
-    col_size_of_width_a = 1
 
-### screen
+### East asian ambiguous width
+
+Add the following line to ~/.textbringer.rb to treat
+[ambiguous characters](http://unicode.org/reports/tr11/#Ambiguous)
+as fullwidth.
+
+    CONFIG[:east_asian_ambiguous_width] = 2
+
+You also need a LD_PRELOAD hack or a modified locale charmap because ncursesw
+uses wcwidth(3).
+
+* https://github.com/fumiyas/wcwidth-cjk
+* https://github.com/hamano/locale-eaw
+
+xterm, mlterm and screen have their own configuration options.
+
+#### xterm
+
+Add the following lines to ~/.Xresources.
+
+    xterm*utf8: 1
+    xterm*locale: true
+    xterm*cjkWidth: true
+
+#### mlterm
+
+Add the following line to ~/.mlterm/main.
+
+    col_size_of_width_a = 2
+
+#### screen
 
 Add the following line to ~/.screenrc.
 
-    cjkwidth off
+    cjkwidth on
 
 ## Development
 

data/appveyor.yml

@@ -4,10 +4,13 @@ install:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
   - gem install bundler --no-document
   - bundle install
+  - ps: Invoke-WebRequest -Uri http://curl.haxx.se/ca/cacert.pem -OutFile C:\projects\textbringer\cacert.pem
 build: off
 test_script:
   - rake
 deploy: off
 environment:
+  UPLOAD_TO_CODECOV: 1
+  SSL_CERT_FILE: C:\projects\textbringer\cacert.pem
   matrix:
     - ruby_version: "23-x64"

data/lib/textbringer.rb

@@ -19,5 +19,7 @@ require_relative "textbringer/mode"
 require_relative "textbringer/modes/fundamental_mode"
 require_relative "textbringer/modes/programming_mode"
 require_relative "textbringer/modes/ruby_mode"
+require_relative "textbringer/modes/c_mode"
 require_relative "textbringer/modes/backtrace_mode"
+require_relative "textbringer/modes/completion_list_mode"
 require_relative "textbringer/controller"

data/lib/textbringer/buffer.rb

@@ -158,8 +158,20 @@ module Textbringer
     end
 
     def self.display_width(s)
-      # ncurses seems to treat ambiguous east asian characters as narrow.
-      Unicode::DisplayWidth.of(s, 1)
+      Unicode::DisplayWidth.of(s, CONFIG[:east_asian_ambiguous_width])
+    end
+
+    def expand_tab(s)
+      # TOOD: Support multibyte characters
+      tw = self[:tab_width]
+      fmt = "A#{tw}"
+      s.b.gsub(/([^\t]{#{tw}})|([^\t]*)\t/n) {
+        [$+].pack(fmt)
+      }.force_encoding(Encoding::UTF_8)
+    end
+
+    def display_width(s)
+      Buffer.display_width(expand_tab(s))
     end
 
     # s might not be copied.
@@ -615,42 +627,22 @@ module Textbringer
     end
 
     def next_line(n = 1)
-      if @goal_column
-        column = @goal_column
-      else
-        prev_point = @point
-        beginning_of_line
-        column = Buffer.display_width(substring(@point, prev_point))
-      end
+      column = get_goal_column
       n.times do
         end_of_line
         forward_char
-        s = @point
-        while !end_of_line? &&
-            Buffer.display_width(substring(s, @point)) < column
-          forward_char
-        end
+        adjust_column(column)
       end
       @goal_column = column
     end
 
     def previous_line(n = 1)
-      if @goal_column
-        column = @goal_column
-      else
-        prev_point = @point
-        beginning_of_line
-        column = Buffer.display_width(substring(@point, prev_point))
-      end
+      column = get_goal_column
       n.times do
         beginning_of_line
         backward_char
         beginning_of_line
-        s = @point
-        while !end_of_line? &&
-            Buffer.display_width(substring(s, @point)) < column
-          forward_char
-        end
+        adjust_column(column)
       end
       @goal_column = column
     end
@@ -968,8 +960,12 @@ module Textbringer
     end
 
     def looking_at?(re)
-      # TODO: optimization
-      byteindex(true, re, @point) == @point
+      if re.is_a?(Regexp)
+        r = Regexp.new("\\G(?:#{re.source})", re.options)
+      else
+        r = "\\G(?:#{re})"
+      end
+      byteindex(true, r, @point) == @point
     end
 
     def byteindex(forward, re, pos)
@@ -1300,6 +1296,28 @@ module Textbringer
       end
     end
 
+    def get_goal_column
+      if @goal_column
+        @goal_column
+      else
+        prev_point = @point
+        beginning_of_line
+        display_width(substring(@point, prev_point))
+      end
+    end
+
+    def adjust_column(column)
+      s = @point
+      w = 0
+      while !end_of_line? &&
+          (w = display_width(substring(s, @point))) < column
+        forward_char
+      end
+      if w > column
+        backward_char
+      end
+    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

data/lib/textbringer/commands/buffers.rb

@@ -55,9 +55,7 @@ module Textbringer
     define_command(:self_insert) do |n = number_prefix_arg|
       c = Controller.current.last_key
       merge_undo = Controller.current.last_command == :self_insert
-      n.times do
-        Buffer.current.insert(c, merge_undo)
-      end
+      Buffer.current.insert(c * n, merge_undo)
     end
 
     define_command(:quoted_insert) do |n = number_prefix_arg|
@@ -65,9 +63,7 @@ module Textbringer
       if !c.is_a?(String)
         raise EditorError, "Invalid key"
       end
-      n.times do
-        Buffer.current.insert(c)
-      end
+      Buffer.current.insert(c * n)
     end
 
     define_command(:kill_line) do
@@ -90,12 +86,12 @@ module Textbringer
 
     define_command(:undo) do
       Buffer.current.undo
-      message("Undo!")
+      message("Undo!") unless Window.echo_area.current?
     end
 
     define_command(:redo) do
       Buffer.current.redo
-      message("Redo!")
+      message("Redo!") unless Window.echo_area.current?
     end
   end
 end

data/lib/textbringer/commands/clipboard.rb

@@ -5,7 +5,7 @@ require "clipboard"
 module Textbringer
   module Commands
     CLIPBOARD_AVAILABLE =
-      Clipboard.implementation.name != :Linux ||
+      Clipboard.implementation.name != "Clipboard::Linux" ||
       (ENV["DISPLAY"] && system("which xclip > /dev/null 2>&1"))
 
     if CLIPBOARD_AVAILABLE
@@ -14,6 +14,7 @@ module Textbringer
       GLOBAL_MAP.define_key(?\C-k, :clipboard_kill_line)
       GLOBAL_MAP.define_key("\ed", :clipboard_kill_word)
       GLOBAL_MAP.define_key("\C-y", :clipboard_yank)
+      GLOBAL_MAP.define_key("\ey", :clipboard_yank_pop)
     end
 
     define_command(:clipboard_copy_region) do
@@ -37,12 +38,17 @@ module Textbringer
     end
 
     define_command(:clipboard_yank) do
-      s = Clipboard.paste.encode(Encoding::UTF_8)
+      s = Clipboard.paste.encode(Encoding::UTF_8).gsub(/\r\n/, "\n")
       if !s.empty? && (KILL_RING.empty? || KILL_RING.current != s)
         KILL_RING.push(s)
       end
       yank
       Controller.current.this_command = :yank
     end
+
+    define_command(:clipboard_yank_pop) do
+      yank_pop
+      Clipboard.copy(KILL_RING.current)
+    end
   end
 end

data/lib/textbringer/commands/files.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
+require "editorconfig"
+
 module Textbringer
   module Commands
     define_command(:find_file) do
       |file_name = read_file_name("Find file: ")|
+      config = EditorConfig.load_file(file_name)
       buffer = Buffer.find_file(file_name)
       if buffer.new_file?
         message("New file")
@@ -20,6 +23,29 @@ module Textbringer
            m.interpreter_name_pattern =~ shebang)
       } || FundamentalMode
       send(mode.command_name)
+      if config.key?("charset")
+        Buffer.current.file_encoding = config["charset"]
+      end
+      if config.key?("end_of_line")
+        Buffer.current.file_format =
+          case config["end_of_line"]
+          when "lf"
+            :unix
+          when "crlf"
+            :dos
+          when "cr"
+            :mac
+          end
+      end
+      if config.key?("indent_style")
+        Buffer.current[:indent_tabs_mode] = config["indent_style"] == "tab"
+      end
+      if config.key?("indent_size")
+        Buffer.current[:indent_level] = config["indent_size"].to_i
+      end
+      if config.key?("tab_width")
+        Buffer.current[:tab_width] = config["tab_width"].to_i
+      end
     end
 
     define_command(:save_buffer) do

data/lib/textbringer/commands/misc.rb

@@ -77,15 +77,66 @@ module Textbringer
       raise Quit
     end
 
+    def update_completions(xs)
+      if xs.size > 1
+        if COMPLETION[:original_buffer].nil?
+          COMPLETION[:completions_window] = Window.windows[-2]
+          COMPLETION[:original_buffer] =
+            COMPLETION[:completions_window].buffer
+        end
+        completions = Buffer.find_or_new("*Completions*", undo_limit: 0)
+        if !completions.mode.is_a?(CompletionListMode)
+          completions.apply_mode(CompletionListMode)
+        end
+        completions.read_only = false
+        begin
+          completions.clear
+          xs.each do |x|
+            completions.insert(x + "\n")
+          end
+          COMPLETION[:completions_window].buffer = completions
+        ensure
+          completions.read_only = true
+        end
+      else
+        if COMPLETION[:original_buffer]
+          COMPLETION[:completions_window].buffer =
+            COMPLETION[:original_buffer]
+        end
+      end
+    end
+    private :update_completions
+
+    def complete_minibuffer_with_string(s)
+      minibuffer = Buffer.minibuffer
+      if s.start_with?(minibuffer.to_s)
+        minibuffer.insert(s[minibuffer.to_s.size..-1])
+      else
+        minibuffer.delete_region(minibuffer.point_min,
+                                 minibuffer.point_max)
+        minibuffer.insert(s)
+      end
+    end
+    private :complete_minibuffer_with_string
+
     define_command(:complete_minibuffer) do
       minibuffer = Buffer.minibuffer
       completion_proc = minibuffer[:completion_proc]
       if completion_proc
-        s = completion_proc.call(minibuffer.to_s)
+        xs = completion_proc.call(minibuffer.to_s)
+        update_completions(xs)
+        if xs.empty?
+          message("No match", sit_for: 1)
+          return
+        end
+        y, *ys = xs
+        s = y.size.downto(1).lazy.map { |i|
+          y[0, i]
+        }.find { |i|
+          ys.all? { |j| j.start_with?(i) }
+        }
         if s
-          minibuffer.delete_region(minibuffer.point_min,
-                                   minibuffer.point_max)
-          minibuffer.insert(s)
+          complete_minibuffer_with_string(s)
         end
       end
     end
@@ -184,18 +235,11 @@ module Textbringer
       Window.redisplay
       signals = [:INT, :TERM, :KILL]
       begin
-        if /mswin32|mingw32/ =~ RUBY_PLATFORM
-          opts = {}
-        else
-          opts = {pgroup: true}
-        end
+        opts = /mswin32|mingw32/ =~ RUBY_PLATFORM ? {} : {pgroup: true}
         Open3.popen2e(cmd, opts) do |input, output, wait_thread|
           input.close
           loop do
             status = output.wait_readable(0.5)
-            if status == false
-              break # EOF
-            end
             if status
               begin
                 s = output.read_nonblock(1024).force_encoding("utf-8").
@@ -228,8 +272,6 @@ module Textbringer
           elsif status.signaled?
             signame = Signal.signame(status.termsig)
             message("Process #{pid} was killed by #{signame}")
-          else
-            message("Process #{pid} exited")
           end
         end
       ensure