textbringer 12 → 13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04d0f8e23504a6d3ae1ce1ccc4cf1ca4c8308525cd61356d22e50631474408bc
-  data.tar.gz: a16eefeef6df621bf2272a4437b1321c999b7ffd3f0cf7f1353d0a41baabd7b6
+  metadata.gz: 2ebcccec1dcc4c9b2116dc02f0e4548d30f019c0da7fc1d0573f84cf08b8590d
+  data.tar.gz: 1f2b135717e1fde5ca8f13fdb9a967d5a7cad5aea6af83c040f35bec85c3bf23
 SHA512:
-  metadata.gz: f03f8d34e41b099d3b9dcaecbb1fa40b3e9c9f3c43a7aba7917dcfe8a7cccbd1dec97599c46e657839af70d8abf67681f339d5ba97f6abb308e76fe1ffbd93f0
-  data.tar.gz: 643f15490cc3ce708c8b6aced38b1249b7c4074a6a5fcb9c7fd927ee1493778fdefd9c9f393a968630e89a85823e13deb036c481691651b02580b2bc150a1a14
+  metadata.gz: a9a9ea8e0234c2fda07af756eb12e8acc53a7f0c3e9cee57276adb742bda13a896875f4b21334794737a55d6e7c7c07168baea74304336e687834f3e5ba4b5d2
+  data.tar.gz: 1c3a84fc349f0d68cd55498d6ae45d159f672b824c8307e89e30bd4eb68c70126de3c358a9255177c74230b747b6255dbdfd36182fe9d56b34927b8a88f60fbb

data/lib/textbringer/buffer.rb

@@ -550,6 +550,7 @@ module Textbringer
     end
 
     def goto_char(pos)
+      return pos if pos == @point
       if pos < 0 || pos > size
         raise RangeError, "Out of buffer"
       end
@@ -1089,17 +1090,19 @@ module Textbringer
       insert_for_yank(KILL_RING.rotate(1))
     end
 
+    # Returns start_line, start_col, end_line, and end_col of the rectangle region
+    # Note that start_col and end_col are 0-origin and width-based (neither 1-origin nor codepoint-based)
     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
+        start_col = display_width(substring(@point, s))
         goto_char(e)
         end_line = @current_line
         beginning_of_line
-        end_col = display_width(substring(@point, e)) + 1
+        end_col = display_width(substring(@point, e))
 
         # Ensure start_col <= end_col
         if start_col > end_col
@@ -1109,54 +1112,73 @@ module Textbringer
       end
     end
 
-    def extract_rectangle(s = @point, e = mark)
+    def apply_on_rectangle(s = @point, e = mark, reverse: false)
       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))
+        composite_edit do
+          if reverse
+            goto_line(end_line)
+          else
+            goto_line(start_line)
           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?
+          loop do
+            beginning_of_line
+            line_start = @point
+
+            # Move to start column
+            col = 0
+            while col < start_col && !end_of_line?
               forward_char
-              col = 1 + display_width(substring(line_start, @point))
+              col = 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
+
+            yield(start_col, end_col, col, line_start)
+
+            # Move to next line for forward iteration
+            if reverse
+              break if @current_line <= start_line
+              backward_line
             else
-              lines << " " * rectangle_width
+              break if @current_line >= end_line
+              forward_line
             end
           end
+        end
+      end
+    end
 
-          # Move to next line
-          break if line_num == end_line
-          forward_line
+    def extract_rectangle(s = @point, e = mark)
+      lines = []
+      apply_on_rectangle(s, e) do |start_col, end_col, col, line_start|
+        start_pos = @point
+        width = end_col - start_col
+
+        # 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 << " " * width
+        else
+          # Move to end column
+          while col < end_col && !end_of_line?
+            forward_char
+            col = 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 < width
+              extracted += " " * (width - extracted_width)
+            end
+            lines << extracted
+          else
+            lines << " " * width
+          end
         end
       end
 
@@ -1175,36 +1197,22 @@ module Textbringer
 
     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
+      apply_on_rectangle(s, e, reverse: true) do |start_col, end_col, col, line_start|
+        start_pos = @point
 
-          # Move to start column
-          col = 1
-          while col < start_col && !end_of_line?
+        # 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))
+            col = display_width(substring(line_start, @point))
           end
-          start_pos = @point
+          end_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
+          # Delete the rectangle text for this line
+          if end_pos > start_pos
+            delete_region(start_pos, end_pos)
           end
         end
       end
@@ -1213,19 +1221,23 @@ module Textbringer
     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
+      start_line = @current_line
+      start_point = @point
+      start_col = save_excursion {
+        beginning_of_line
+        display_width(substring(@point, start_point))
+      }
+      composite_edit 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
+          col = 0
           while col < start_col && !end_of_line?
             forward_char
-            col = 1 + display_width(substring(line_start, @point))
+            col = display_width(substring(line_start, @point))
           end
 
           # If line is shorter than start_col, extend it with spaces
@@ -1241,29 +1253,36 @@ module Textbringer
 
     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
-
+      s, e = Buffer.region_boundaries(s, e)
+      composite_edit do
+        apply_on_rectangle(s, e) do |start_col, end_col, col, line_start|
           # 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)
+          insert(" " * (end_col - start_col))
+        end
+        goto_char(s)
+      end
+    end
+
+    def clear_rectangle(s = @point, e = mark)
+      check_read_only_flag
+      apply_on_rectangle(s, e, reverse: true) do |start_col, end_col, col, line_start|
+        start_pos = @point
+        if col < start_col
+          insert(" " * (end_col - start_col))
+        else
+          while col < end_col && !end_of_line?
+            forward_char
+            col = display_width(substring(line_start, @point))
+          end
+          end_pos = @point
+
+          delete_region(start_pos, end_pos) if end_pos > start_pos
+          insert(" " * (end_col - start_col))
         end
       end
     end
@@ -1435,14 +1454,14 @@ module Textbringer
     end
 
     def composite_edit
+      location = @point
       @composite_edit_level += 1
       begin
         yield
       ensure
         @composite_edit_level -= 1
         if @composite_edit_level == 0 && !@composite_edit_actions.empty?
-          action = CompositeAction.new(self,
-                                       @composite_edit_actions.first.location)
+          action = CompositeAction.new(self, location)
           @composite_edit_actions.each do |i|
             action.add_action(i)
           end
@@ -2006,6 +2025,7 @@ module Textbringer
       @actions.reverse_each do |action|
         action.undo
       end
+      @buffer.goto_char(@location)
     end
 
     def redo

data/lib/textbringer/commands/buffers.rb

@@ -154,6 +154,11 @@ module Textbringer
       Buffer.current.open_rectangle
     end
 
+    define_command(:clear_rectangle,
+                   doc: "Clear the region-rectangle by replacing its contents with spaces.") do
+      Buffer.current.clear_rectangle
+    end
+
     define_command(:transpose_chars,
                    doc: "Transpose characters.") do
       Buffer.current.transpose_chars

data/lib/textbringer/keymap.rb

@@ -208,6 +208,7 @@ module Textbringer
   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-xrc", :clear_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 = "12"
+  VERSION = "13"
 end

data/textbringer.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'textbringer/version'
+require_relative 'lib/textbringer/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "textbringer"
@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/shugo/textbringer"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^((test|spec|features|logo)/|\.)}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: '12'
+  version: '13'
 platform: ruby
 authors:
 - Shugo Maeda
@@ -328,14 +328,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".editorconfig"
-- ".gitattributes"
-- ".github/dependabot.yml"
-- ".github/workflows/macos.yml"
-- ".github/workflows/push_gem.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
-- ".gitignore"
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
@@ -397,8 +389,6 @@ files:
 - lib/textbringer/version.rb
 - lib/textbringer/window.rb
 - lib/textbringer/window/fallback_characters.rb
-- logo/logo.jpg
-- logo/logo.png
 - screenshot.png
 - textbringer.gemspec
 homepage: https://github.com/shugo/textbringer

data/.editorconfig

@@ -1,12 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-
-[*.rb]
-indent_style = space
-indent_size = 2
-
-[lib/**.rb]
-trim_trailing_whitespace = true
-insert_final_newline = true

data/.gitattributes

@@ -1 +0,0 @@
-*.rb diff=ruby

data/.github/dependabot.yml

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

data/.github/workflows/macos.yml

@@ -1,23 +0,0 @@
-name: macos
-
-on: [push]
-
-jobs:
-  test:
-    runs-on: macos-latest
-    strategy:
-      matrix:
-        ruby: [ head, 3.4 ]
-    timeout-minutes: 10
-    env:
-      RUBYOPT: --enable-frozen-string-literal --debug-frozen-string-literal
-    steps:
-    - uses: actions/checkout@v4
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: |
-        bundle install
-    - name: Run test
-      run: bundle exec rake test

data/.github/workflows/push_gem.yml

@@ -1,54 +0,0 @@
-name: Publish gem to rubygems.org
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-permissions:
-  contents: read
-
-jobs:
-  push:
-    if: github.repository == 'shugo/textbringer'
-    runs-on: ubuntu-latest
-
-    environment:
-      name: rubygems.org
-      url: https://rubygems.org/gems/textbringer
-
-    permissions:
-      contents: write
-      id-token: write
-
-    steps:
-      # Set up
-      - name: Harden Runner
-        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@v4
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-          ruby-version: ruby
-
-      # Release
-      - name: Publish to RubyGems
-        uses: rubygems/release-gem@v1
-
-      - name: Create GitHub release
-        run: |
-          tag_name="$(git describe --tags --abbrev=0)"
-          gh release create "${tag_name}" --verify-tag --generate-notes
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Purge GitHub cache
-        shell: bash
-        run: |
-          urls=$(curl -sL "https://github.com/${{ github.repository_owner }}/${{ github.event.repository.name }}/tree/main" | grep -Eo "(http|https)://camo.githubusercontent.com[a-zA-Z0-9./?=_%:-]*")
-          while IFS= read -r url; do echo -e "\nPurge $url"; curl -X PURGE "$url"; done <<< "$urls"

data/.github/workflows/ubuntu.yml

@@ -1,24 +0,0 @@
-name: ubuntu
-
-on: [push]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: [ head, 3.4, 3.3, 3.2 ]
-    timeout-minutes: 10
-    env:
-      RUBYOPT: --enable-frozen-string-literal --debug-frozen-string-literal
-    steps:
-    - uses: actions/checkout@v4
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: |
-        sudo apt install libncursesw5-dev
-        bundle install
-    - name: Run test
-      run: xvfb-run bundle exec rake test

data/.github/workflows/windows.yml

@@ -1,22 +0,0 @@
-name: windows
-
-on: [push]
-
-jobs:
-  test:
-    runs-on: windows-latest
-    strategy:
-      matrix:
-        ruby: [ '3.4' ]
-    timeout-minutes: 10
-    env:
-      RUBYOPT: --enable-frozen-string-literal --debug-frozen-string-literal
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-    - name: Run test
-      run: bundle exec rake test

data/.gitignore

@@ -1,10 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/tags