fatty 0.99.0 → 0.99.3

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

@@ -0,0 +1,140 @@
+name: onedark
+inherit: null
+markdown_code_theme: github_dark
+
+output:
+  fg: "#abb2bf"
+  bg: "#282c34"
+
+input:
+  fg: "#abb2bf"
+  bg: "#3a3f4b"
+  attrs: [bold]
+
+input_suggestion:
+  fg: "#5c6370"
+  bg: "#3a3f4b"
+  attrs: [dim]
+
+cursor:
+  fg: "#282c34"
+  bg: "#c678dd"
+
+region:
+  fg: "#282c34"
+  bg: "#61afef"
+
+good:
+  fg: "#98c379"
+  bg: "#282c34"
+
+info:
+  fg: "#abb2bf"
+  bg: "#282c34"
+
+warn:
+  fg: "#282c34"
+  bg: "#e5c07b"
+
+error:
+  fg: "#282c34"
+  bg: "#e06c75"
+
+pager_status:
+  fg: "#282c34"
+  bg: "#98c379"
+
+search_input:
+  fg: "#282c34"
+  bg: "#56b6c2"
+
+match_current:
+  fg: "#282c34"
+  bg: "#e5c07b"
+
+match_other:
+  fg: "#282c34"
+  bg: "#c678dd"
+
+popup:
+  fg: "#abb2bf"
+  bg: "#3a3f4b"
+
+popup_input:
+  fg: "#abb2bf"
+  bg: "#21252b"
+
+popup_counts:
+  fg: "#282c34"
+  bg: "#abb2bf"
+
+popup_selection:
+  fg: "#282c34"
+  bg: "#61afef"
+
+popup_frame:
+  fg: "#56b6c2"
+  bg: "#3a3f4b"
+  border: single
+  corners: rounded
+
+markdown_h1:
+  fg: "#c678dd"
+  bg: "#282c34"
+  attrs: [bold]
+
+markdown_h2:
+  fg: "#61afef"
+  bg: "#282c34"
+  attrs: [bold]
+
+markdown_h3:
+  fg: "#98c379"
+  bg: "#282c34"
+  attrs: [bold]
+
+markdown_code:
+  fg: "#98c379"
+  bg: "#3a3f4b"
+
+markdown_code_gutter:
+  fg: "#5c6370"
+  bg: "#3a3f4b"
+  attrs: [dim]
+
+markdown_strong:
+  fg: "#dcdfe4"
+  bg: "#282c34"
+  attrs: [bold]
+
+markdown_emphasis:
+  fg: "#abb2bf"
+  bg: "#282c34"
+  attrs: [italic]
+
+markdown_link:
+  fg: "#61afef"
+  bg: "#282c34"
+  attrs: [underline]
+
+markdown_url:
+  fg: "#56b6c2"
+  bg: "#282c34"
+
+markdown_quote_gutter:
+  fg: "#5c6370"
+  bg: "#282c34"
+
+markdown_highlight:
+  fg: "#282c34"
+  bg: "#e5c07b"
+
+markdown_table_header:
+  fg: "#dcdfe4"
+  bg: "#3a3f4b"
+  attrs: [bold]
+
+markdown_hrule:
+  fg: "#5c6370"
+  bg: "#282c34"
+  attrs: [dim]

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

@@ -1,5 +1,6 @@
 name: solarized_dark
 inherit: null
+markdown_code_theme: solarized_dark
 
 output:
   fg: "#839496"

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

@@ -0,0 +1,140 @@
+name: solarized_light
+inherit: null
+markdown_code_theme: github
+
+output:
+  fg: "#657b83"
+  bg: "#fdf6e3"
+
+input:
+  fg: "#073642"
+  bg: "#eee8d5"
+  attrs: [bold]
+
+input_suggestion:
+  fg: "#93a1a1"
+  bg: "#eee8d5"
+  attrs: [dim]
+
+cursor:
+  fg: "#fdf6e3"
+  bg: "#268bd2"
+
+region:
+  fg: "#fdf6e3"
+  bg: "#268bd2"
+
+good:
+  fg: "#859900"
+  bg: "#fdf6e3"
+
+info:
+  fg: "#657b83"
+  bg: "#fdf6e3"
+
+warn:
+  fg: "#073642"
+  bg: "#b58900"
+
+error:
+  fg: "#fdf6e3"
+  bg: "#dc322f"
+
+pager_status:
+  fg: "#fdf6e3"
+  bg: "#859900"
+
+search_input:
+  fg: "#fdf6e3"
+  bg: "#268bd2"
+
+match_current:
+  fg: "#073642"
+  bg: "#b58900"
+
+match_other:
+  fg: "#073642"
+  bg: "#93a1a1"
+
+popup:
+  fg: "#657b83"
+  bg: "#eee8d5"
+
+popup_input:
+  fg: "#073642"
+  bg: "#fdf6e3"
+
+popup_counts:
+  fg: "#fdf6e3"
+  bg: "#586e75"
+
+popup_selection:
+  fg: "#fdf6e3"
+  bg: "#268bd2"
+
+popup_frame:
+  fg: "#268bd2"
+  bg: "#eee8d5"
+  border: single
+  corners: rounded
+
+markdown_h1:
+  fg: "#2aa198"
+  bg: "#fdf6e3"
+  attrs: [bold]
+
+markdown_h2:
+  fg: "#268bd2"
+  bg: "#fdf6e3"
+  attrs: [bold]
+
+markdown_h3:
+  fg: "#859900"
+  bg: "#fdf6e3"
+  attrs: [bold]
+
+markdown_code:
+  fg: "#859900"
+  bg: "#eee8d5"
+
+markdown_code_gutter:
+  fg: "#93a1a1"
+  bg: "#eee8d5"
+  attrs: [dim]
+
+markdown_strong:
+  fg: "#073642"
+  bg: "#fdf6e3"
+  attrs: [bold]
+
+markdown_emphasis:
+  fg: "#657b83"
+  bg: "#fdf6e3"
+  attrs: [italic]
+
+markdown_link:
+  fg: "#268bd2"
+  bg: "#fdf6e3"
+  attrs: [underline]
+
+markdown_url:
+  fg: "#2aa198"
+  bg: "#fdf6e3"
+
+markdown_quote_gutter:
+  fg: "#93a1a1"
+  bg: "#fdf6e3"
+
+markdown_highlight:
+  fg: "#073642"
+  bg: "#b58900"
+
+markdown_table_header:
+  fg: "#073642"
+  bg: "#eee8d5"
+  attrs: [bold]
+
+markdown_hrule:
+  fg: "#93a1a1"
+  bg: "#fdf6e3"
+  attrs: [dim]

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

@@ -1,4 +1,6 @@
 # lib/fatty/config_files/themes/terminal.yml
+
+# This theme is meant to inherit whatever color scheme the invoking terminal uses.
 name: terminal
 inherit: null
 
@@ -88,3 +90,68 @@ popup_counts:
   fg: default
   bg: default
   attrs: [bold]
+
+markdown_h1:
+  fg: default
+  bg: default
+  attrs: [bold]
+
+markdown_h2:
+  fg: default
+  bg: default
+  attrs: [bold]
+
+markdown_h3:
+  fg: default
+  bg: default
+  attrs: [bold]
+
+markdown_code:
+  fg: default
+  bg: default
+  attrs: [reverse]
+
+markdown_code_gutter:
+  fg: default
+  bg: default
+  attrs: [dim]
+
+markdown_strong:
+  fg: default
+  bg: default
+  attrs: [bold]
+
+markdown_emphasis:
+  fg: default
+  bg: default
+  attrs: [italic]
+
+markdown_link:
+  fg: default
+  bg: default
+  attrs: [underline]
+
+markdown_url:
+  fg: default
+  bg: default
+  attrs: [underline]
+
+markdown_quote_gutter:
+  fg: default
+  bg: default
+  attrs: [dim]
+
+markdown_highlight:
+  fg: default
+  bg: default
+  attrs: [reverse]
+
+markdown_table_header:
+  fg: default
+  bg: default
+  attrs: [bold]
+
+markdown_hrule:
+  fg: default
+  bg: default
+  attrs: [dim]

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

@@ -0,0 +1,140 @@
+name: tokyo_night
+inherit: null
+markdown_code_theme: github_dark
+
+output:
+  fg: "#c0caf5"
+  bg: "#1a1b26"
+
+input:
+  fg: "#c0caf5"
+  bg: "#24283b"
+  attrs: [bold]
+
+input_suggestion:
+  fg: "#565f89"
+  bg: "#24283b"
+  attrs: [dim]
+
+cursor:
+  fg: "#1a1b26"
+  bg: "#bb9af7"
+
+region:
+  fg: "#1a1b26"
+  bg: "#7aa2f7"
+
+good:
+  fg: "#9ece6a"
+  bg: "#1a1b26"
+
+info:
+  fg: "#c0caf5"
+  bg: "#1a1b26"
+
+warn:
+  fg: "#1a1b26"
+  bg: "#e0af68"
+
+error:
+  fg: "#1a1b26"
+  bg: "#f7768e"
+
+pager_status:
+  fg: "#1a1b26"
+  bg: "#9ece6a"
+
+search_input:
+  fg: "#1a1b26"
+  bg: "#7dcfff"
+
+match_current:
+  fg: "#1a1b26"
+  bg: "#e0af68"
+
+match_other:
+  fg: "#1a1b26"
+  bg: "#bb9af7"
+
+popup:
+  fg: "#c0caf5"
+  bg: "#24283b"
+
+popup_input:
+  fg: "#c0caf5"
+  bg: "#16161e"
+
+popup_counts:
+  fg: "#1a1b26"
+  bg: "#c0caf5"
+
+popup_selection:
+  fg: "#1a1b26"
+  bg: "#7aa2f7"
+
+popup_frame:
+  fg: "#7dcfff"
+  bg: "#24283b"
+  border: single
+  corners: rounded
+
+markdown_h1:
+  fg: "#bb9af7"
+  bg: "#1a1b26"
+  attrs: [bold]
+
+markdown_h2:
+  fg: "#7aa2f7"
+  bg: "#1a1b26"
+  attrs: [bold]
+
+markdown_h3:
+  fg: "#9ece6a"
+  bg: "#1a1b26"
+  attrs: [bold]
+
+markdown_code:
+  fg: "#9ece6a"
+  bg: "#24283b"
+
+markdown_code_gutter:
+  fg: "#565f89"
+  bg: "#24283b"
+  attrs: [dim]
+
+markdown_strong:
+  fg: "#c0caf5"
+  bg: "#1a1b26"
+  attrs: [bold]
+
+markdown_emphasis:
+  fg: "#c0caf5"
+  bg: "#1a1b26"
+  attrs: [italic]
+
+markdown_link:
+  fg: "#7aa2f7"
+  bg: "#1a1b26"
+  attrs: [underline]
+
+markdown_url:
+  fg: "#73daca"
+  bg: "#1a1b26"
+
+markdown_quote_gutter:
+  fg: "#565f89"
+  bg: "#1a1b26"
+
+markdown_highlight:
+  fg: "#1a1b26"
+  bg: "#e0af68"
+
+markdown_table_header:
+  fg: "#c0caf5"
+  bg: "#24283b"
+  attrs: [bold]
+
+markdown_hrule:
+  fg: "#414868"
+  bg: "#1a1b26"
+  attrs: [dim]

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

@@ -1,5 +1,6 @@
 name: wordperfect
 inherit: null
+markdown_code_theme: github_dark
 
 output:
   fg: white
@@ -11,8 +12,9 @@ input:
   attrs: [bold]
 
 input_suggestion:
-  fg: lightgray
+  fg: lightblue
   bg: navy
+  attrs: [dim]
 
 cursor:
   fg: white
@@ -23,35 +25,40 @@ region:
   bg: yellow
 
 good:
-  fg: green
+  fg: lightgreen
   bg: navy
+  attrs: [bold]
 
 info:
-  fg: black
+  fg: white
   bg: navy
 
 warn:
-  fg: black
-  bg: magenta
+  fg: orange
+  bg: navy
+  attrs: [bold]
 
 error:
   fg: white
   bg: red
+  attrs: [bold]
 
 pager_status:
   fg: black
   bg: lightgreen
+  attrs: [bold]
 
 search_input:
   fg: black
   bg: cyan
 
 match_current:
-  fg: black
+  fg: white
   bg: red
+  attrs: [bold]
 
 match_other:
-  fg: grey
+  fg: black
   bg: pink
 
 popup:
@@ -61,17 +68,81 @@ popup:
 popup_input:
   fg: white
   bg: navy
+  attrs: [bold]
 
 popup_counts:
   fg: navy
   bg: red
+  attrs: [bold]
 
 popup_selection:
   fg: navy
   bg: yellow
+  attrs: [bold]
 
 popup_frame:
-  fg: navy
-  bg: yellow
+  fg: yellow
+  bg: navy
   border: single
   corners: rounded
+
+markdown_h1:
+  fg: red
+  bg: yellow
+  attrs: [bold]
+
+markdown_h2:
+  fg: black
+  bg: pink
+  attrs: [bold]
+
+markdown_h3:
+  fg: lightgreen
+  bg: navy
+  attrs: [bold]
+
+markdown_code:
+  fg: orange
+  bg: navy
+
+markdown_code_gutter:
+  fg: lightblue
+  bg: navy
+  attrs: [dim]
+
+markdown_strong:
+  fg: white
+  bg: navy
+  attrs: [bold]
+
+markdown_emphasis:
+  fg: white
+  bg: navy
+  attrs: [underline]
+
+markdown_link:
+  fg: cyan
+  bg: navy
+  attrs: [underline]
+
+markdown_url:
+  fg: lightblue
+  bg: navy
+
+markdown_quote_gutter:
+  fg: bisque
+  bg: navy
+
+markdown_highlight:
+  fg: navy
+  bg: yellow
+
+markdown_table_header:
+  fg: navy
+  bg: yellow
+  attrs: [bold]
+
+markdown_hrule:
+  fg: lightblue
+  bg: navy
+  attrs: [dim]

data/lib/fatty/core_ext/hash.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Fatty
+  module CoreExt
+    module Hash
+      refine ::Hash do
+        def deep_merge(other)
+          merge(other) do |_key, old_value, new_value|
+            if old_value.is_a?(::Hash) && new_value.is_a?(::Hash)
+              old_value.deep_merge(new_value)
+            else
+              new_value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fatty/core_ext/string.rb

@@ -2,20 +2,27 @@
 
 # These can be used to add "roles" to strings so that they can be styled
 # according to the theme.
-class String
-  def fatty_good
-    { text: self, role: :good }
-  end
 
-  def fatty_info
-    { text: self, role: :info }
-  end
+module Fatty
+  module CoreExt
+    module String
+      refine ::String do
+        def fatty_good
+          { text: self, role: :good }
+        end
 
-  def fatty_warn
-    { text: self, role: :warn }
-  end
+        def fatty_info
+          { text: self, role: :info }
+        end
+
+        def fatty_warn
+          { text: self, role: :warn }
+        end
 
-  def fatty_error
-    { text: self, role: :error }
+        def fatty_error
+          { text: self, role: :error }
+        end
+      end
+    end
   end
 end

data/lib/fatty/core_ext.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 
 require_relative "core_ext/string"
+require_relative "core_ext/hash"