fatty 0.99.0 → 0.99.3

data/lib/fatty/help.rb

@@ -1,37 +1,9 @@
 # frozen_string_literal: true
 
-# require "redcarpet"
-# require_relative "ansi_renderer"
-
-# module Fatty
-#   module Help
-#     def self.path
-#       File.expand_path("config_files/help.md", __dir__)
-#     end
-
-#     def self.render(width: 80)
-#       renderer = Fatty::AnsiRenderer.new(width: width)
-#       markdown = Redcarpet::Markdown.new(
-#         renderer,
-#         tables: true,
-#         fenced_code_blocks: true,
-#         autolink: true,
-#       )
-#       markdown.render(text)
-#     end
-
-#     def self.text
-#       File.read(path)
-#     end
-#   end
-# end
-
-# frozen_string_literal: true
-
 module Fatty
   module Help
     def self.path
-      File.expand_path("config_files/help.md", __dir__)
+      File.expand_path("../../help/help.md", __dir__)
     end
 
     def self.text

data/lib/fatty/history/entry.rb

@@ -55,6 +55,8 @@ module Fatty
         nil
       end
 
+      # simplecov:disable
+
       private_class_method :parse_stamp
 
       private

data/lib/fatty/history.rb

@@ -25,10 +25,10 @@ module Fatty
       @cursors = {}
 
       if @path
-        Fatty.info("History loaded from #{@path}")
+        Fatty.info("History loaded from #{@path}", tag: :config)
         load
       else
-        Fatty.info("In-memory History only: no path")
+        Fatty.info("In-memory History only: no path", tag: :config)
       end
     end
 
@@ -47,10 +47,6 @@ module Fatty
       @instances = {}
     end
 
-    def self.default
-      for_path(:default)
-    end
-
     ###################################################################################
     # Accessing History items from a consuming application
     ###################################################################################
@@ -164,19 +160,24 @@ module Fatty
       cursor[:scratch] = nil
     end
 
-    def suggest_for(*kinds, prefix:, ctx: nil)
+    def suggestions_for(*kinds, prefix:, ctx: nil, limit: nil)
       text = prefix.to_s
-      return if text.empty?
+      return [] if text.empty?
 
       wanted_ctx = normalize_ctx(ctx)
 
-      unless wanted_ctx.empty?
-        local = entries_for(*kinds, ctx: wanted_ctx, prefix: text)
-        return local.last.text unless local.empty?
-      end
+      rows =
+        if wanted_ctx.empty?
+          entries_for(*kinds, prefix: text)
+        else
+          local = entries_for(*kinds, ctx: wanted_ctx, prefix: text)
+          global = entries_for(*kinds, prefix: text)
+          local + global
+        end
 
-      global = entries_for(*kinds, prefix: text)
-      global.last&.text
+      rows = rows.reverse.map(&:text).uniq
+      rows = rows.first(limit) if limit
+      rows
     end
 
     def self.normalize_ctx(ctx)
@@ -189,6 +190,8 @@ module Fatty
 
     private
 
+    # simplecov:disable
+
     def normalize_kinds(*kinds)
       kinds.flatten.map(&:to_sym).uniq.sort
     end

data/lib/fatty/input_buffer.rb

@@ -35,22 +35,19 @@ module Fatty
     include Actionable
 
     attr_reader :mark, :kill_ring, :undo_stack
-    attr_accessor :text, :cursor, :word_re, :virtual_suffix
+    attr_accessor :text, :cursor, :word_char_re, :virtual_suffix
 
-    DEFAULT_WORD_CHARS = "[[:alnum:]_]"
+    DEFAULT_WORD_CHAR_RE = "[[:alnum:]_]"
 
-    def initialize(word_chars: DEFAULT_WORD_CHARS, word_re: nil, undo_limit: 1_000, kill_ring_max: 60)
+    def initialize(word_char_re: DEFAULT_WORD_CHAR_RE, undo_limit: 1_000, kill_ring_max: 60)
       @text = +""
       @virtual_suffix = +""
       @cursor = 0
       @mark = nil
-      @word_re =
-        if word_re
-          word_re
-        else
-          # word_chars is a fragment like "[[:alnum:]_]" or "[[:alnum:]_-]"
-          Regexp.new(word_chars)
-        end
+      # word_char_re is a fragment like "[[:alnum:]_]" or "[[:alnum:]_-]"
+      # meant to match a single charachter that should be considered a part of
+      # a word for purposes of cursor movement.
+      @word_char_re = normalize_word_char_re(word_char_re)
       @undo_limit = undo_limit
       @undo_stack = []
       @redo_stack = []
@@ -289,7 +286,7 @@ module Fatty
     desc "Delete the character before the cursor"
     action :delete_char_backward do |count: 1|
       if region_active?
-        delete_region
+        kill_region
       else
         n = normalize_count(count)
         return if @cursor.zero?
@@ -309,7 +306,7 @@ module Fatty
     desc "Delete count characters after the cursor"
     action :delete_char_forward do |count: 1|
       if region_active?
-        delete_region
+        kill_region
       else
         n = normalize_count(count)
         return if @cursor == text.length
@@ -352,56 +349,66 @@ module Fatty
       killed
     end
 
-    desc "Kill count words after the cursor and return the deleted string"
+    desc "Kill count words after the cursor, or kill the active region"
     action :kill_word_forward do |count: 1|
-      n = normalize_count(count)
-      return "" if eol?
+      if region_active?
+        kill_region
+      else
+        n = normalize_count(count)
+        return "" if eol?
 
-      deleted = ""
-      with_undo do
-        start = cursor
-        finish = start
-        repeat(n) do
-          break if finish >= text.length
+        deleted = ""
+        with_undo do
+          start = cursor
+          finish = start
+
+          repeat(n) do
+            break if finish >= text.length
 
-          span = word_span_forward(finish)
-          break if span.begin == span.end
+            span = word_span_forward(finish)
+            break if span.begin == span.end
+
+            finish = span.end
+          end
 
-          finish = span.end
+          deleted = delete_range(start...finish)
+          @cursor = start
+          push_kill(deleted)
+          @last_action = :kill
         end
 
-        deleted = delete_range(start...finish)
-        @cursor = start
-        push_kill(deleted)
-        @last_action = :kill
+        deleted
       end
-      deleted
     end
 
     desc "Kill count words before the cursor and return the deleted string"
     action :kill_word_backward do |count: 1|
-      n = normalize_count(count)
-      return "" if bol?
+      if region_active?
+        kill_region
+      else
+        n = normalize_count(count)
+        return "" if bol?
 
-      deleted = ""
-      with_undo do
-        finish = cursor
-        start = finish
-        repeat(n) do
-          break if start <= 0
+        deleted = ""
+        with_undo do
+          finish = cursor
+          start = finish
+          repeat(n) do
+            break if start <= 0
 
-          span = word_span_backward(start)
-          break if span.begin == span.end
+            span = word_span_backward(start)
+            break if span.begin == span.end
 
-          start = span.begin
-        end
+            start = span.begin
+          end
 
-        deleted = delete_range(start...finish)
-        @cursor = start
-        push_kill(deleted)
-        @last_action = :kill
+          deleted = delete_range(start...finish)
+          @cursor = start
+          push_kill(deleted)
+          @last_action = :kill
+        end
+        deleted
       end
-      deleted
     end
 
     desc "Transpose the two characters around point."
@@ -707,6 +714,23 @@ module Fatty
 
     private
 
+    # simplecov:disable
+
+    def normalize_word_char_re(value)
+      case value
+      when Regexp
+        value
+      when String
+        value = value.strip
+        if value.start_with?("/") && value.end_with?("/") && value.length >= 2
+          value[1...-1]
+        else
+          value
+        end
+        Regexp.new(value)
+      end
+    end
+
     def move_word_right_once
       break_undo_chain!
       chars = virtual_text.chars
@@ -992,7 +1016,7 @@ module Fatty
     end
 
     def word_char?(ch)
-      @word_re.match?(ch)
+      @word_char_re.match?(ch)
     end
   end
 end