Update to ColorAide 2.9 (#256)

* Update to ColorAide 2.9

* Fix some issues with blend and contrast tool

* Update color palettes

Author: facelessuser

CHANGES.md

@@ -1,5 +1,10 @@
 # ColorHelper
 
+## 6.3.0
+
+- **NEW**: Upgrade to ColorAide 2.9.
+- **FIX**: Fix some issues with blend and contrast tool.
+
 ## 6.2.2
 
 - **FIX**: Remove regression fix that was fixing a false issue.

ch_tool_blend.py

@@ -242,7 +242,7 @@ def run(
         """Run command."""
 
         self.base = util.get_base_color()
-        colors = evaluate(color_helper_blend_mode, self.base)
+        colors = evaluate(self.base, color_helper_blend_mode)
         color = None
         if colors:
             color = colors[-1]

ch_tool_contrast.py

@@ -226,20 +226,16 @@ def preview(self, text):
                     colors[1].convert('srgb').clip().to_string(**util.COMMA)
                 )
             return sublime.Html(style + html)
-        except Exception as e:
-            print('huh?')
-            print(e)
+        except Exception:
             return sublime.Html(mdpopups.md2html(self.view, DEF_RATIO.format(style)))
 
     def validate(self, color):
         """Validate."""
 
         try:
-            colors = evaluate(self.base, color)
+            colors = evaluate(self.base, color, self.gamut_map)
             return len(colors) > 0
-        except Exception as e:
-            print('what?')
-            print(e)
+        except Exception:
             return False
 
 
@@ -251,8 +247,9 @@ def run(
     ):
         """Run command."""
 
+        self.setup_gamut_style()
         self.base = util.get_base_color()
-        colors = evaluate(self.base, color_helper_contrast_ratio)
+        colors = evaluate(self.base, color_helper_contrast_ratio, self.gamut_map)
         color = None
         if colors:
             color = colors[0]

ch_util.py

@@ -56,7 +56,8 @@ class Color(Base):
 UPDATE_COLORS = RE_COLOR_MATCH
 COLOR_FMT_1_0 = (0, 1, 0, 'alpha', 19)
 COLOR_FMT_2_0 = (0, 3, 0, 'final')
-PALETTE_FMT = (2, 0)
+COLOR_FMT_2_9 = (2, 9, 0, 'final')
+PALETTE_FMT = (3, 0)
 
 RE_COLOR_START = r"""(?xi)
 (?:
@@ -298,6 +299,23 @@ def get_scope(view, rules, skip_sel_check=False):
     return scopes
 
 
+def update_colors_3_0(colors):
+    """Update colors for version 3.0."""
+
+    base = get_base_color()
+    new_colors = []
+    for c in colors:
+        try:
+            m = UPDATE_COLORS.match(c)
+            if m:
+                new_colors.append(base(m.group(0)).to_string(**COLOR_SERIALIZE))
+            else:
+                new_colors.append(c)
+        except Exception:
+            pass
+    return new_colors
+
+
 def update_colors_2_0(colors):
     """Update colors for version 2.0."""
 
@@ -356,6 +374,19 @@ def update_colors_1_0(colors):
     return new_colors
 
 
+def update_format(palettes, version, callback):
+    """Update the format."""
+
+    favs = callback(palettes.get('favorites', []))
+    palettes.set('favorites', favs)
+    all_pallets = palettes.get('palettes', [])
+    for p in all_pallets:
+        p['colors'] = callback(p['colors'])
+    palettes.set('palettes', all_pallets)
+    palettes.set('__format__', version)
+    sublime.save_settings(PALETTE_CONFIG)
+
+
 def _get_palettes(window=None):
     """Get palettes."""
 
@@ -364,25 +395,17 @@ def _get_palettes(window=None):
         fmt = tuple([int(x) for x in palettes.get('__format__', '0.0').split('.')])
         if fmt != PALETTE_FMT and coloraide_version >= COLOR_FMT_1_0:
             if fmt == (0, 0):
-                favs = update_colors_1_0(palettes.get('favorites', []))
-                palettes.set('favorites', favs)
-                all_pallets = palettes.get('palettes', [])
-                for p in all_pallets:
-                    p['colors'] = update_colors_1_0(p['colors'])
-                palettes.set('palettes', all_pallets)
-                palettes.set('__format__', '1.0')
-                sublime.save_settings(PALETTE_CONFIG)
+                update_format(palettes, '1.0', update_colors_1_0)
                 fmt = (1, 0)
         if fmt != PALETTE_FMT and coloraide_version >= COLOR_FMT_2_0:
             if fmt == (1, 0):
-                favs = update_colors_2_0(palettes.get('favorites', []))
-                palettes.set('favorites', favs)
-                all_pallets = palettes.get('palettes', [])
-                for p in all_pallets:
-                    p['colors'] = update_colors_1_0(p['colors'])
-                palettes.set('palettes', all_pallets)
-                palettes.set('__format__', '2.0')
-                sublime.save_settings(PALETTE_CONFIG)
+                update_format(palettes, '2.0', update_colors_2_0)
+                fmt = (2, 0)
+        if fmt != PALETTE_FMT and coloraide_version >= COLOR_FMT_2_9:
+            if fmt == (2, 0):
+                update_format(palettes, '3.0', update_colors_3_0)
+                fmt = (3, 0)
+
     else:
         data = window.project_data()
         if data is None:

lib/coloraide/__meta__.py

@@ -192,5 +192,5 @@ def parse_version(ver: str) -> Version:
     return Version(major, minor, micro, release, pre, post, dev)
 
 
-__version_info__ = Version(2, 4, 0, "final")
+__version_info__ = Version(2, 9, 0, "final")
 __version__ = __version_info__._get_canonical()