textbringer 11 → 12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a4d3643869a923b01642fd4faecfdf36a530822193049c6d05458bd62afeb94
-  data.tar.gz: 5e04d0bcfbfc5e20143ca5fe06669001f563eede4ae75c52b6200101dcc4be7d
+  metadata.gz: 04d0f8e23504a6d3ae1ce1ccc4cf1ca4c8308525cd61356d22e50631474408bc
+  data.tar.gz: a16eefeef6df621bf2272a4437b1321c999b7ffd3f0cf7f1353d0a41baabd7b6
 SHA512:
-  metadata.gz: 4001fb9d0e71fce380ab475782730bac8ca3a4bf663dd70b1d86d9292b83c3228ecf63632d7359b80408e248c1a413131a30fbc3ff2a3d47cece701bffb3bfb0
-  data.tar.gz: 02cd15438c13cdb52bd5e6f34199aa12f8840349f71ad33b6e61fdeefad543a41b9d9167ce02439bda78605dce6d290e1c95f27563c8647094547d4ef8a20704
+  metadata.gz: f03f8d34e41b099d3b9dcaecbb1fa40b3e9c9f3c43a7aba7917dcfe8a7cccbd1dec97599c46e657839af70d8abf67681f339d5ba97f6abb308e76fe1ffbd93f0
+  data.tar.gz: 643f15490cc3ce708c8b6aced38b1249b7c4074a6a5fcb9c7fd927ee1493778fdefd9c9f393a968630e89a85823e13deb036c481691651b02580b2bc150a1a14

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'weekly'

data/.github/workflows/push_gem.yml

@@ -24,7 +24,7 @@ jobs:
     steps:
       # Set up
       - name: Harden Runner
-        uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
         with:
           egress-policy: audit
 

data/lib/textbringer/buffer.rb

@@ -1089,6 +1089,185 @@ module Textbringer
       insert_for_yank(KILL_RING.rotate(1))
     end
 
+    def rectangle_boundaries(s = @point, e = mark)
+      s, e = Buffer.region_boundaries(s, e)
+      save_excursion do
+        goto_char(s)
+        start_line = @current_line
+        beginning_of_line
+        start_col = display_width(substring(@point, s)) + 1
+        goto_char(e)
+        end_line = @current_line
+        beginning_of_line
+        end_col = display_width(substring(@point, e)) + 1
+
+        # Ensure start_col <= end_col
+        if start_col > end_col
+          start_col, end_col = end_col, start_col
+        end
+        [start_line, start_col, end_line, end_col]
+      end
+    end
+
+    def extract_rectangle(s = @point, e = mark)
+      start_line, start_col, end_line, end_col = rectangle_boundaries(s, e)
+      lines = []
+      rectangle_width = end_col - start_col
+
+      save_excursion do
+        goto_line(start_line)
+        (start_line..end_line).each do |line_num|
+          beginning_of_line
+          line_start = @point
+
+          # Move to start column
+          col = 1
+          while col < start_col && !end_of_line?
+            forward_char
+            col = 1 + display_width(substring(line_start, @point))
+          end
+          start_pos = @point
+
+          # If we haven't reached start_col, the line is too short
+          if col < start_col
+            # Line is shorter than start column, extract all spaces
+            lines << " " * rectangle_width
+          else
+            # Move to end column
+            while col < end_col && !end_of_line?
+              forward_char
+              col = 1 + display_width(substring(line_start, @point))
+            end
+            end_pos = @point
+
+            # Extract the rectangle text for this line
+            if end_pos > start_pos
+              extracted = substring(start_pos, end_pos)
+              # Pad with spaces if the extracted text is shorter than rectangle width
+              extracted_width = display_width(extracted)
+              if extracted_width < rectangle_width
+                extracted += " " * (rectangle_width - extracted_width)
+              end
+              lines << extracted
+            else
+              lines << " " * rectangle_width
+            end
+          end
+
+          # Move to next line
+          break if line_num == end_line
+          forward_line
+        end
+      end
+
+      lines
+    end
+
+    def copy_rectangle(s = @point, e = mark)
+      lines = extract_rectangle(s, e)
+      @@killed_rectangle = lines
+    end
+
+    def kill_rectangle(s = @point, e = mark)
+      copy_rectangle(s, e)
+      delete_rectangle(s, e)
+    end
+
+    def delete_rectangle(s = @point, e = mark)
+      check_read_only_flag
+      start_line, start_col, end_line, end_col = rectangle_boundaries(s, e)
+
+      save_excursion do
+        # Delete from bottom to top to avoid position shifts
+        (start_line..end_line).reverse_each do |line_num|
+          goto_line(line_num)
+          beginning_of_line
+          line_start = @point
+
+          # Move to start column
+          col = 1
+          while col < start_col && !end_of_line?
+            forward_char
+            col = 1 + display_width(substring(line_start, @point))
+          end
+          start_pos = @point
+
+          # Only delete if we're within the line bounds
+          if col >= start_col
+            # Move to end column
+            while col < end_col && !end_of_line?
+              forward_char
+              col = 1 + display_width(substring(line_start, @point))
+            end
+            end_pos = @point
+
+            # Delete the rectangle text for this line
+            if end_pos > start_pos
+              delete_region(start_pos, end_pos)
+            end
+          end
+        end
+      end
+    end
+
+    def yank_rectangle
+      raise "No rectangle in kill ring" if @@killed_rectangle.nil?
+      lines = @@killed_rectangle
+      start_line, start_col = get_line_and_column(@point)
+
+      save_excursion do
+        lines.each_with_index do |line, i|
+          goto_line(start_line + i)
+          beginning_of_line
+          line_start = @point
+
+          # Move to start column, extending line if necessary
+          col = 1
+          while col < start_col && !end_of_line?
+            forward_char
+            col = 1 + display_width(substring(line_start, @point))
+          end
+
+          # If line is shorter than start_col, extend it with spaces
+          if col < start_col
+            insert(" " * (start_col - col))
+          end
+
+          # Insert the rectangle line
+          insert(line)
+        end
+      end
+    end
+
+    def open_rectangle(s = @point, e = mark)
+      check_read_only_flag
+      start_line, start_col, end_line, end_col = rectangle_boundaries(s, e)
+      width = end_col - start_col
+
+      save_excursion do
+        (start_line..end_line).each do |line_num|
+          goto_line(line_num)
+          beginning_of_line
+          line_start = @point
+
+          # Move to start column, extending line if necessary
+          col = 1
+          while col < start_col && !end_of_line?
+            forward_char
+            col = 1 + display_width(substring(line_start, @point))
+          end
+
+          # If line is shorter than start_col, extend it with spaces
+          if col < start_col
+            insert(" " * (start_col - col))
+          end
+
+          # Insert spaces to create the rectangle
+          insert(" " * width)
+        end
+      end
+    end
+
     def undo
       undo_or_redo(:undo, @undo_stack, @redo_stack)
     end
@@ -1750,6 +1929,7 @@ module Textbringer
   end
 
   KILL_RING = Ring.new
+  @@killed_rectangle = nil
 
   class UndoableAction
     attr_accessor :version

data/lib/textbringer/commands/buffers.rb

@@ -129,6 +129,31 @@ module Textbringer
       Buffer.current.delete_region
     end
 
+    define_command(:kill_rectangle,
+                   doc: "Kill the text of the region-rectangle, saving its contents as the last killed rectangle.") do
+      Buffer.current.kill_rectangle
+    end
+
+    define_command(:copy_rectangle_as_kill,
+                   doc: "Save the text of the region-rectangle as the last killed rectangle.") do
+      Buffer.current.copy_rectangle
+    end
+
+    define_command(:delete_rectangle,
+                   doc: "Delete the text of the region-rectangle.") do
+      Buffer.current.delete_rectangle
+    end
+
+    define_command(:yank_rectangle,
+                   doc: "Yank the last killed rectangle with its upper left corner at point.") do
+      Buffer.current.yank_rectangle
+    end
+
+    define_command(:open_rectangle,
+                   doc: "Insert blank space to fill the space of the region-rectangle. This pushes the previous contents of the region-rectangle to the right.") do
+      Buffer.current.open_rectangle
+    end
+
     define_command(:transpose_chars,
                    doc: "Transpose characters.") do
       Buffer.current.transpose_chars

data/lib/textbringer/commands/server.rb

@@ -6,8 +6,8 @@ module Textbringer
                    doc: "Start Textbringer server.") do
       uri = CONFIG[:server_uri] ||
         "drbunix:" + File.expand_path("server.sock", "~/.textbringer")
-      options = { UNIXFileMode: 0600 }.merge(CONFIG[:server_options] || {})
-      DRb.start_service(uri, Server.new, options)
+      server = Server.new(uri)
+      server.start
     end
 
     define_command(:server_kill,
@@ -31,6 +31,56 @@ module Textbringer
   end
 
   class Server
+    def initialize(uri)
+      @uri = uri
+    end
+
+    def start
+      front = FrontObject.new
+      default_options = unix_domain? ? { UNIXFileMode: 0600 } : {}
+      options = default_options.merge(CONFIG[:server_options] || {})
+      begin
+        DRb.start_service(@uri, front, options)
+      rescue Errno::EADDRINUSE
+        if unix_domain? && !unix_domain_server_alive?
+          # Remove the socket file in case another server died unexpectedly before.
+          File.unlink(unix_domain_socket_path)
+          DRb.start_service(@uri, front, options)
+        else
+          raise ExistError, "There is an existing Textbringer server"
+        end
+      end
+    end
+
+    private
+
+    def unix_domain?
+      @uri.start_with?("drbunix:")
+    end
+
+    def unix_domain_socket_path
+      @uri.sub(/\Adrbunix:/, "")
+    end
+
+    def unix_domain_server_alive?
+      socket = Socket.new(:UNIX, :STREAM)
+      sockaddr = Socket.sockaddr_un(unix_domain_socket_path)
+      begin
+        socket.connect_nonblock(sockaddr)
+      rescue Errno::EINPROGRESS
+        return true
+      rescue Errno::ECONNREFUSED
+        return false
+      ensure
+        socket.close
+      end
+    end
+  end
+
+  class Server::ExistError < EditorError
+  end
+
+  class Server::FrontObject
     def eval(s)
       with_redisplay do
         Controller.current.instance_eval(s).inspect

data/lib/textbringer/keymap.rb

@@ -203,6 +203,11 @@ module Textbringer
   GLOBAL_MAP.define_key("\C-xri", :insert_register)
   GLOBAL_MAP.define_key("\C-xrn", :number_to_register)
   GLOBAL_MAP.define_key("\C-xr+", :increment_register)
+  GLOBAL_MAP.define_key("\C-xrk", :kill_rectangle)
+  GLOBAL_MAP.define_key("\C-xr\M-w", :copy_rectangle_as_kill)
+  GLOBAL_MAP.define_key("\C-xrd", :delete_rectangle)
+  GLOBAL_MAP.define_key("\C-xry", :yank_rectangle)
+  GLOBAL_MAP.define_key("\C-xro", :open_rectangle)
   GLOBAL_MAP.define_key("\C-x(", :start_keyboard_macro)
   GLOBAL_MAP.define_key(:f3, :start_keyboard_macro)
   GLOBAL_MAP.define_key("\C-x)", :end_keyboard_macro)

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "11"
+  VERSION = "12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: '11'
+  version: '12'
 platform: ruby
 authors:
 - Shugo Maeda
@@ -330,6 +330,7 @@ extra_rdoc_files: []
 files:
 - ".editorconfig"
 - ".gitattributes"
+- ".github/dependabot.yml"
 - ".github/workflows/macos.yml"
 - ".github/workflows/push_gem.yml"
 - ".github/workflows/ubuntu.yml"