fatty 0.99.8 → 0.99.8.2

data/lib/fatty/config_files/themes/dracula.yml

@@ -25,20 +25,16 @@ region:
   bg: "#bd93f9"
 
 good:
-  fg: "#50fa7b"
-  bg: "#282a36"
+  fg: "#25b13d"
 
 info:
-  fg: "#f8f8f2"
-  bg: "#282a36"
+  fg: "#5f9edd"
 
 warn:
-  fg: "#282a36"
-  bg: "#f1fa8c"
+  fg: "#b99527"
 
 error:
-  fg: "#f8f8f2"
-  bg: "#ff5555"
+  fg: "#e37d7d"
 
 pager_status:
   fg: "#282a36"

data/lib/fatty/config_files/themes/everforest_dark.yml

@@ -25,20 +25,16 @@ region:
   bg: "#7fbbb3"
 
 good:
-  fg: "#a7c080"
-  bg: "#2d353b"
+  fg: "#28bd41"
 
 info:
-  fg: "#d3c6aa"
-  bg: "#2d353b"
+  fg: "#74abe2"
 
 warn:
-  fg: "#2d353b"
-  bg: "#dbbc7f"
+  fg: "#caa22b"
 
 error:
-  fg: "#2d353b"
-  bg: "#e67e80"
+  fg: "#e78d8d"
 
 pager_status:
   fg: "#2d353b"

data/lib/fatty/config_files/themes/gruvbox_dark.yml

@@ -25,20 +25,16 @@ region:
   bg: "#fabd2f"
 
 good:
-  fg: "#b8bb26"
-  bg: "#282828"
+  fg: "#25b13d"
 
 info:
-  fg: "#ebdbb2"
-  bg: "#282828"
+  fg: "#5b9cdc"
 
 warn:
-  fg: "#282828"
-  bg: "#fabd2f"
+  fg: "#b99527"
 
 error:
-  fg: "#fbf1c7"
-  bg: "#cc241d"
+  fg: "#e27878"
 
 pager_status:
   fg: "#282828"

data/lib/fatty/config_files/themes/gruvbox_light.yml

@@ -25,20 +25,16 @@ region:
   bg: "#af3a03"
 
 good:
-  fg: "#79740e"
-  bg: "#fbf1c7"
+  fg: "#197628"
 
 info:
-  fg: "#3c3836"
-  bg: "#fbf1c7"
+  fg: "#2466a8"
 
 warn:
-  fg: "#282828"
-  bg: "#d79921"
+  fg: "#7a621a"
 
 error:
-  fg: "#fbf1c7"
-  bg: "#cc241d"
+  fg: "#c22929"
 
 pager_status:
   fg: "#fbf1c7"

data/lib/fatty/config_files/themes/mono.yml

@@ -25,23 +25,19 @@ region:
   bg: "#d7d7d7"
 
 good:
-  fg: "#ffffff"
-  bg: "#000000"
+  fg: "#1f9333"
   attrs: [bold]
 
 info:
-  fg: "#d7d7d7"
-  bg: "#000000"
+  fg: "#2d80d2"
 
 warn:
-  fg: "#000000"
-  bg: "#d7d7d7"
-  attrs: [bold]
+  fg: "#977a20"
+  attrs: [underline]
 
 error:
-  fg: "#ffffff"
-  bg: "#5f5f5f"
-  attrs: [bold]
+  fg: "#d94a4a"
+  attrs: [bold, underline]
 
 pager_status:
   fg: "#000000"

data/lib/fatty/config_files/themes/monokai.yml

@@ -25,20 +25,16 @@ region:
   bg: "#66d9ef"
 
 good:
-  fg: "#a6e22e"
-  bg: "#272822"
+  fg: "#25ad3b"
 
 info:
-  fg: "#f8f8f2"
-  bg: "#272822"
+  fg: "#5b9cdc"
 
 warn:
-  fg: "#272822"
-  bg: "#e6db74"
+  fg: "#b99527"
 
 error:
-  fg: "#f8f8f2"
-  bg: "#f92672"
+  fg: "#e27878"
 
 pager_status:
   fg: "#272822"

data/lib/fatty/config_files/themes/nordic.yml

@@ -23,21 +23,29 @@ region:
   fg: "#2e3440"
   bg: "#88c0d0"
 
+# good:
+#   fg: "#22ee00"
+
+# info:
+#   fg: "#33deff"
+
+# warn:
+#   fg: "#d78700"
+
+# error:
+#   fg: "#d700af"
+
 good:
-  fg: "green"
-  bg: "#2e3440"
+  fg: "#28bd41"
 
 info:
-  fg: "#d8dee9"
-  bg: "#2e3440"
+  fg: "#74abe2"
 
 warn:
-  fg: "#2e3440"
-  bg: "#ebcb8b"
+  fg: "#caa22b"
 
 error:
-  fg: "#eceff4"
-  bg: "#bf616a"
+  fg: "#e78d8d"
 
 pager_status:
   fg: "black"

data/lib/fatty/config_files/themes/onedark.yml

@@ -25,20 +25,16 @@ region:
   bg: "#61afef"
 
 good:
-  fg: "#98c379"
-  bg: "#282c34"
+  fg: "#26b53e"
 
 info:
-  fg: "#abb2bf"
-  bg: "#282c34"
+  fg: "#63a1de"
 
 warn:
-  fg: "#282c34"
-  bg: "#e5c07b"
+  fg: "#bd9828"
 
 error:
-  fg: "#282c34"
-  bg: "#e06c75"
+  fg: "#e48181"
 
 pager_status:
   fg: "#282c34"

data/lib/fatty/config_files/themes/solarized_dark.yml

@@ -24,20 +24,16 @@ region:
   bg: "#b58900"
 
 good:
-  fg: "green"
-  bg: "#002b36"
+  fg: "#25ad3b"
 
 info:
-  fg: "#839496"
-  bg: "#002b36"
+  fg: "#5b9cdc"
 
 warn:
-  fg: "#002b36"
-  bg: "#cb4b16"
+  fg: "#b59126"
 
 error:
-  fg: "#fdf6e3"
-  bg: "red"
+  fg: "#e27878"
 
 pager_status:
   fg: "black"

data/lib/fatty/config_files/themes/solarized_light.yml

@@ -25,20 +25,16 @@ region:
   bg: "#268bd2"
 
 good:
-  fg: "#859900"
-  bg: "#fdf6e3"
+  fg: "#1a7a2a"
 
 info:
-  fg: "#657b83"
-  bg: "#fdf6e3"
+  fg: "#256bb1"
 
 warn:
-  fg: "#073642"
-  bg: "#b58900"
+  fg: "#7e651b"
 
 error:
-  fg: "#fdf6e3"
-  bg: "#dc322f"
+  fg: "#ca2b2b"
 
 pager_status:
   fg: "#fdf6e3"

data/lib/fatty/config_files/themes/terminal.yml

@@ -27,24 +27,20 @@ region:
   bg: default
   attrs: [reverse]
 
-info:
-  fg: default
-  bg: default
-
 good:
-  fg: default
-  bg: default
+  fg: green
   attrs: [bold]
 
+info:
+  fg: blue
+
 warn:
-  fg: default
-  bg: default
-  attrs: [reverse]
+  fg: yellow
+  attrs: [bold]
 
 error:
-  fg: default
-  bg: default
-  attrs: [bold, reverse]
+  fg: red
+  attrs: [bold]
 
 pager_status:
   fg: default

data/lib/fatty/config_files/themes/tokyo_night.yml

@@ -25,20 +25,16 @@ region:
   bg: "#7aa2f7"
 
 good:
-  fg: "#9ece6a"
-  bg: "#1a1b26"
+  fg: "#22a037"
 
 info:
-  fg: "#c0caf5"
-  bg: "#1a1b26"
+  fg: "#468fd8"
 
 warn:
-  fg: "#1a1b26"
-  bg: "#e0af68"
+  fg: "#a88724"
 
 error:
-  fg: "#1a1b26"
-  bg: "#f7768e"
+  fg: "#df6868"
 
 pager_status:
   fg: "#1a1b26"

data/lib/fatty/config_files/themes/wordperfect.yml

@@ -26,21 +26,17 @@ region:
 
 good:
   fg: lightgreen
-  bg: navy
   attrs: [bold]
 
 info:
   fg: white
-  bg: navy
 
 warn:
   fg: orange
-  bg: navy
   attrs: [bold]
 
 error:
-  fg: white
-  bg: red
+  fg: red
   attrs: [bold]
 
 pager_status:

data/lib/fatty/log_formats/json.rb

@@ -5,7 +5,7 @@ module Fatty
     class JsonFormatter < ::Logger::Formatter
       def call(level, time, progname, msg)
         rec = {
-          t: time.utc.iso8601(6),
+          t: time.getlocal.iso8601(6),
           sev: level,
           prog: progname
         }

data/lib/fatty/log_formats/text.rb

@@ -27,8 +27,7 @@ module Fatty
   module Logger
     class TextFormatter < ::Logger::Formatter
       def call(level, time, progname, msg)
-        ts = time.utc.iso8601(6)
-
+        ts = time.getlocal.iso8601(6)
         body =
           case msg
           when Hash

data/lib/fatty/output_buffer.rb

@@ -2,6 +2,8 @@
 
 module Fatty
   class OutputBuffer
+    Fragment = Data.define(:text, :role)
+
     DEFAULT_MAX_LINES = 10_000
 
     attr_reader :lines
@@ -9,15 +11,25 @@ module Fatty
 
     def initialize(max_lines: DEFAULT_MAX_LINES)
       @lines = []
+      @fragments = []
       @scroll = 0
       @max_lines = Integer(max_lines)
       @line_open = false
     end
 
+    def clear
+      @lines.clear
+      @fragments.clear
+      @scroll = 0
+      @line_open = false
+      nil
+    end
+
+
     # Append text to the output buffer. Text may contain complete lines,
     # partial lines, or both. Returns the number of lines trimmed.  The
     # Terminal can use this to adjust the Viewport.
-    def append(text)
+    def append(text, role: nil)
       ntrimmed = 0
       str = text.to_s
       return ntrimmed if str.empty?
@@ -30,13 +42,17 @@ module Fatty
             ntrimmed += append_new_line("")
           end
         elsif !part.empty?
-          ntrimmed += append_fragment(part)
+          ntrimmed += append_fragment(part, role: role)
         end
       end
 
       ntrimmed
     end
 
+    def fragments_for(index)
+      @fragments[index] || []
+    end
+
     def visible_lines(height)
       start = [@lines.length - height - @scroll, 0].max
       @lines[start, height] || []
@@ -54,27 +70,46 @@ module Fatty
 
     # simplecov:disable
 
-    def append_fragment(fragment)
+    def append_fragment(fragment, role:)
       ntrimmed = 0
       if @line_open && @lines.any?
         @lines[-1] = "#{@lines[-1]}#{fragment}".freeze
+        append_fragment_metadata(@fragments[-1], fragment, role)
       else
-        ntrimmed += append_new_line(fragment)
+        ntrimmed += append_new_line(fragment, role: role)
         @line_open = true
       end
       ntrimmed
     end
 
-    def append_new_line(line)
+    def append_new_line(line, role: nil)
       ntrimmed = 0
 
       if @lines.length >= @max_lines
         @lines.shift
+        @fragments.shift
         ntrimmed = 1
       end
 
       @lines << line.to_s.dup.freeze
+      @fragments << []
+      append_fragment_metadata(@fragments[-1], line, role) unless line.to_s.empty?
       ntrimmed
     end
+
+    def append_fragment_metadata(fragments, text, role)
+      if fragments.any? && fragments[-1].role == role
+        previous = fragments[-1]
+        fragments[-1] = Fragment.new(
+          text: "#{previous.text}#{text}".freeze,
+          role: role,
+        )
+      else
+        fragments << Fragment.new(
+          text: text.to_s.dup.freeze,
+          role: role,
+        )
+      end
+    end
   end
 end

data/lib/fatty/renderer/curses.rb

@@ -522,11 +522,13 @@ module Fatty
           start_y = 0 if start_y < 0
 
           (start_y...height).each do |y|
+            visible_line = lines[y]
             draw_output_row(
               win,
-              line: lines[y],
+              line: visible_line.text,
+              fragments: visible_line.fragments,
               y: y,
-              abs_line: viewport.top + y,
+              abs_line: visible_line.number - 1,
               highlights: highlights,
             )
           end
@@ -535,11 +537,13 @@ module Fatty
           count = height if count > height
 
           (0...count).each do |y|
+            visible_line = lines[y]
             draw_output_row(
               win,
-              line: lines[y],
+              line: visible_line.text,
+              fragments: visible_line.fragments,
               y: y,
-              abs_line: viewport.top + y,
+              abs_line: visible_line.number - 1,
               highlights: highlights,
             )
           end
@@ -618,6 +622,7 @@ module Fatty
           draw_output_row(
             win,
             line: visible_line.text,
+            fragments: visible_line.fragments,
             y: y,
             abs_line: visible_line.number - 1,
             highlights: highlights,
@@ -628,7 +633,7 @@ module Fatty
         stage_window(win)
       end
 
-      def draw_output_row(win, line:, y:, abs_line:, highlights:, line_number: nil, line_number_width: nil)
+      def draw_output_row(win, line:, fragments: nil, y:, abs_line:, highlights:, line_number: nil, line_number_width: nil)
         base_attr = pair_attr(:output, fallback: ::Curses::A_NORMAL)
         line_number_attr = base_attr | ::Curses::A_DIM
         hi_attr = pair_attr(:match_current, fallback: ::Curses::A_REVERSE)
@@ -656,9 +661,7 @@ module Fatty
           [from.to_i, to.to_i, attr]
         end
 
-        slices = build_line_slices(line.to_s, ranges: curses_ranges) do |style|
-          ansi_style_attr(style, fallback: base_attr)
-        end
+        slices = output_slices(line, fragments: fragments, ranges: curses_ranges, base_attr: base_attr)
         render_slices(win, slices)
         win.clrtoeol
       end
@@ -729,6 +732,55 @@ module Fatty
         slices
       end
 
+      def output_slices(line, fragments:, ranges:, base_attr:)
+        fragments = Array(fragments)
+        return build_line_slices(line.to_s, ranges: ranges) { |style|
+          ansi_style_attr(style, fallback: base_attr)
+        } if fragments.empty?
+
+        slices = []
+        offset = 0
+
+        fragments.each do |fragment|
+          role = fragment.role
+          role = :output unless role && palette[role]
+
+          fragment_attr = pair_attr(role, fallback: base_attr)
+          text = fragment.text.to_s
+          fragment_end = offset + Fatty::Ansi.plain_text(text).length
+
+          fragment_ranges =
+            Array(ranges).filter_map do |from, to, attr|
+            clipped_from = [from, offset].max
+            clipped_to = [to, fragment_end].min
+            next unless clipped_from < clipped_to
+
+            [
+              clipped_from - offset,
+              clipped_to - offset,
+              attr,
+            ]
+          end
+
+          fragment_slices =
+            build_line_slices(text, ranges: fragment_ranges) do |style|
+            ansi_style_attr(
+              style,
+              fallback: fragment_attr,
+              fallback_role: role,
+            )
+          end
+
+          fragment_slices.each do |attr, slice_text|
+            emit_slice(slices, attr, slice_text)
+          end
+
+          offset = fragment_end
+        end
+
+        slices
+      end
+
       def render_slices(win, slices)
         Array(slices).each do |attr, text|
           win.attrset(attr)

data/lib/fatty/renderer/truecolor.rb

@@ -523,7 +523,13 @@ module Fatty
             }
           end
 
-          segments.concat(output_segments(text, ranges: ranges))
+          segments.concat(
+            output_segments(
+              text,
+              fragments: visible_line&.fragments,
+              ranges: ranges,
+            ),
+          )
           queue_ansi_segments_line(
             row: rect.row + y,
             col: rect.col,
@@ -549,18 +555,48 @@ module Fatty
         end
       end
 
-      def output_segments(line, ranges:)
-        plain = Fatty::Ansi.plain_text(line.to_s)
+      def output_segments(line, fragments:, ranges:)
+        fragments = Array(fragments)
         base_segments = []
 
-        Fatty::Ansi.segment(line.to_s).each do |text, style|
-          base_segments << {
-            text: text.to_s,
-            role: :output,
-            style: style,
-          }
+        if fragments.empty?
+          Fatty.debug(
+            "output fragment role=:output spec=#{palette[:output].inspect}",
+            tag: :render,
+          )
+          Fatty::Ansi.segment(line.to_s).each do |text, style|
+            base_segments << {
+              text: text.to_s,
+              role: :output,
+              style: style,
+            }
+          end
+        else
+          fragments.each do |fragment|
+            role = fragment.role
+            role = :output unless role && palette[role]
+
+            Fatty.debug(
+              "output fragment role=#{role.inspect} spec=#{palette[role].inspect}",
+              tag: :render,
+            )
+            Fatty::Ansi.segment(fragment.text.to_s).each do |text, style|
+              base_segments << {
+                text: text.to_s,
+                role: role,
+                style: style,
+              }
+            end
+          end
         end
-        apply_highlight_ranges_to_segments(base_segments, plain:, ranges:)
+
+        plain = base_segments.map { |segment| segment[:text] }.join
+
+        apply_highlight_ranges_to_segments(
+          base_segments,
+          plain: plain,
+          ranges: ranges,
+        )
       end
 
       def apply_highlight_ranges_to_segments(segments, plain:, ranges:)