doing 2.1.61 → 2.1.62

data/docs/doc/top-level-namespace.html

@@ -216,7 +216,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Jun 29 05:57:08 2022 by
+  Generated on Fri Jul  1 10:30:16 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>

data/doing.rdoc

@@ -5,7 +5,7 @@ record of what you've been doing, complete with tag-based time tracking. The
 command line tool allows you to add entries, annotate with tags and notes, and
 view your entries with myriad options, with a focus on a "natural" language syntax.
 
-v2.1.61
+v2.1.62
 
 === Global Options
 === --config_file arg

data/lib/doing/colors.rb

@@ -4,6 +4,7 @@
 module Doing
   # Terminal output color functions.
   module Color
+    ESCAPE_REGEX = /(?<=\[)(?:(?:(?:[349]|10)[0-9]|[0-9])?;?)+(?=m)/.freeze
     # All available color names. Available as methods and string extensions.
     #
     # @example Use a color as a method. Color reset will be added to end of string.
@@ -125,6 +126,62 @@ module Doing
       def normalize_color
         gsub(/_/, '').sub(/bright/i, 'bold').sub(/bgbold/, 'boldbg')
       end
+
+      # Get the calculated ANSI color at the end of the
+      # string
+      #
+      # @return     ANSI escape sequence to match color
+      #
+      def last_color_code
+        m = scan(ESCAPE_REGEX)
+
+        em = ['0']
+        fg = nil
+        bg = nil
+        rgbf = nil
+        rgbb = nil
+
+        m.each do |c|
+          case c
+          when '0'
+            em = ['0']
+            fg, bg, rgbf, rgbb = nil
+          when /^[34]8/
+            case c
+            when /^3/
+              fg = nil
+              rgbf = c
+            when /^4/
+              bg = nil
+              rgbb = c
+            end
+          else
+            c.split(/;/).each do |i|
+              x = i.to_i
+              if x <= 9
+                em << x
+              elsif x >= 30 && x <= 39
+                rgbf = nil
+                fg = x
+              elsif x >= 40 && x <= 49
+                rgbb = nil
+                bg = x
+              elsif x >= 90 && x <= 97
+                rgbf = nil
+                fg = x
+              elsif x >= 100 && x <= 107
+                rgbb = nil
+                bg = x
+              end
+            end
+          end
+        end
+
+        escape = "\e[#{em.join(';')}m"
+        escape += "\e[#{rgbb}m" if rgbb
+        escape += "\e[#{rgbf}m" if rgbf
+        escape + "\e[#{[fg, bg].delete_if(&:nil?).join(';')}m"
+      end
     end
 
     class << self

data/lib/doing/string/highlight.rb

@@ -17,14 +17,9 @@ module Doing
     ##
     def highlight_tags(color = 'yellow', last_color: nil)
       unless last_color
-        escapes = scan(/(\e\[[\d;]+m)[^\e]+@/)
         color = color.split(' ') unless color.is_a?(Array)
         tag_color = color.each_with_object([]) { |c, arr| arr << Doing::Color.send(c) }.join('')
-        last_color = if escapes.good?
-                       (escapes.count > 1 ? escapes[-2..-1] : [escapes[-1]]).map { |v| v[0] }.join('')
-                     else
-                       Doing::Color.default
-                     end
+        last_color = last_color_code
       end
       gsub(/(\s|m)(@[^ ("']+)/, "\\1#{tag_color}\\2#{last_color}")
     end
@@ -54,7 +49,11 @@ module Doing
         qs.concat(query[:should]) if query[:should]
         qs.each do |s|
           rx = Regexp.new(s.wildcard_to_rx, ignore_case(s, case_type))
-          out.gsub!(rx) { |m| m.bgyellow.black }
+          out.gsub!(rx) do
+            m = Regexp.last_match
+            last = m.pre_match.last_color_code
+            "#{m[0].bgyellow.black}#{last}"
+          end
         end
       end
       out

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.61'
+  VERSION = '2.1.62'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.61
+  version: 2.1.62
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-29 00:00:00.000000000 Z
+date: 2022-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-markup