Merge branch 'upstream_master' into dev

Author: CodeByZach

CHANGES.md

@@ -1,5 +1,22 @@
 # ColorHelper
 
+## 4.1.1
+
+- **FIX**: Fix palette update logic that would not properly format the  
+  version.
+
+## 4.1.0
+
+- **NEW**: Add minimal color support in Sublime's built-in GraphViz  
+  syntax files. Colors are currently limited to hex RGB/RGBA and color  
+  names outside of HTML and full CSS support inside HTML. Support is  
+  experimental, and if false positives are a problem, the rule can be  
+  disabled in the settings.
+- **NEW**: Don't default `tmtheme` custom class output to X11 names,  
+  default to hex codes instead.
+- **FIX**: Fix some additional custom class issues related to latest  
+  `coloraide` update.
+
 ## 4.0.1
 
 - **FIX**: Fix built-in custom color class match return. This caused files  

ColorHelper.sublime-settings

@@ -206,7 +206,7 @@
             "class": "ColorHelper.custom.tmtheme.ColorSRGBX11",
             "filters": ["srgb"],
             "output": [
-                {"space": "srgb", "format": {"names": true}}
+                {"space": "srgb", "format": {}}
             ]
         },
         "argb": {
@@ -299,6 +299,34 @@
                 "meta.tag.any.html meta.attribute-with-value.style.html"
             ]
         },
+        {
+            // Setting is experimental, set "enable" to false if false positives are problematic.
+            //
+            // GraphViz provides limited scoping that limits our ability to identify exactly
+            // where colors will and will not appear. It also uses deprecated attributes
+            // in HTML snippets that do not style the colors with the CSS syntax as HTML normally
+            // does.
+            //
+            // All of this "could" lead to false positives. We do our best to limit scoping as
+            // much as reasonable. HSV support is currently limited due to the fact the syntax
+            // is very non-spefic (floats separated by commas or spaces) and is likely to cause
+            // the most false positives. If the GraphViz syntax were to scope colors with a
+            // special scope, or at least properties that are likely to contain colors, we
+            // could greatly reduce/elliminate false positives and add HSV support with more
+            // confidence.
+            "name": "Graphviz",
+            "base_scopes": [
+                "source.dot"
+            ],
+            "color_class": [
+                {"class": "tmtheme", "scopes": "meta.attributes.dot -text.html.basic"},
+                {"class": "css-level-4", "scopes": "text.html.basic"}
+            ],
+            "scanning": [
+                "source.dot meta.attributes.dot -text.html.basic",
+                "meta.attribute-with-value.html meta.string.html"
+            ]
+        },
         {
             "name": "PackageDev Sublime Schemes/Theme",
             "syntax_files": [

ch_util.py

@@ -328,7 +328,7 @@ def _get_palettes(window=None):
         data = window.project_data()
         if data is None:
             data = {
-                'color_helper_palettes_format': '.'.join(PALETTE_FMT),
+                'color_helper_palettes_format': '.'.join(str(x) for x in PALETTE_FMT),
                 'color_helper_palettes': []
             }
         color_palettes = data.get('color_helper_palettes', [])
@@ -340,14 +340,14 @@ def _get_palettes(window=None):
                         p['colors'] = update_colors_1_0(p['colors'])
                     data['color_helper_palettes'] = color_palettes
                     fmt = (1, 0)
-                    data['color_helper_palettes_format'] = '.'.join(fmt)
+                    data['color_helper_palettes_format'] = '.'.join(str(x) for x in fmt)
                     window.set_project_data(data)
                 if fmt != PALETTE_FMT and coloraide_version >= COLOR_FMT_2_0:
                     if fmt == (1, 0):
                         for p in color_palettes:
                             p['colors'] = update_colors_2_0(p['colors'])
                         data['color_helper_palettes'] = color_palettes
-                        data['color_helper_palettes_format'] = '.'.join(PALETTE_FMT)
+                        data['color_helper_palettes_format'] = '.'.join(str(x) for x in PALETTE_FMT)
                         window.set_project_data(data)
 
         palettes = data

custom/ahex.py

@@ -65,7 +65,7 @@ def to_string(
 
         # Always fit hex
         method = None if not isinstance(fit, str) else fit
-        coords = util.no_nan(parent.fit(method=method).coords())
+        coords = util.no_nans(parent.fit(method=method).coords())
         if show_alpha:
             value = template.format(
                 int(util.round_half_up(a * 255.0)),

custom/ass_abgr.py

@@ -61,7 +61,7 @@ def to_string(self, parent, *, options=None, alpha=None, precision=None, fit=Tru
 
         # Always fit hex
         method = None if not isinstance(fit, str) else fit
-        coords = util.no_nan(parent.fit(method=method).coords())
+        coords = util.no_nans(parent.fit(method=method).coords())
         if show_alpha:
             value = template.format(
                 int(util.round_half_up(a * 255.0)),

custom/hex_0x.py

@@ -64,7 +64,7 @@ def to_string(
             template = template.upper()
 
         method = None if not isinstance(fit, str) else fit
-        coords = util.no_nan(parent.fit(method=method).coords())
+        coords = util.no_nans(parent.fit(method=method).coords())
         if show_alpha:
             value = template.format(
                 int(util.round_half_up(coords[0] * 255.0)),

custom/tmtheme.py

@@ -689,7 +689,7 @@ class SRGBX11(SRGB):
             # Hex syntax
             \#(?:{hex}{{6}}(?:{hex}{{2}})?|{hex}{{3}}(?:{hex})?)\b |
             # Names
-            \b(?<!\#)[a-z]{{3,}}(?!\()\b
+            \b(?<!\#)[a-z][a-z0-9]{{2,}}(?!\()\b
         )
         """.format(**parse.COLOR_PARTS)
     )
@@ -707,7 +707,7 @@ def to_string(
         hex_upper = options.get("upper", False)
         compress = options.get("compress", False)
         method = None if not isinstance(fit, str) else fit
-        coords = util.no_nan(parent.fit(method=method).coords())
+        coords = util.no_nans(parent.fit(method=method).coords())
 
         template = "#{:02x}{:02x}{:02x}{:02x}" if alpha else "#{:02x}{:02x}{:02x}"
         if hex_upper:
@@ -759,7 +759,7 @@ def match(cls, string, start=0, fullmatch=True):
         if m is not None and (not fullmatch or m.end(0) == len(string)):
             string = string[m.start(0):m.end(0)].lower()
             if not string.startswith("#"):
-                string = name2hex(string[m.start(0):m.end(0)])
+                string = name2hex(string)
             if string is not None:
                 return cls.split_channels(string), m.end(0)
         return None

messages.json

@@ -1,4 +1,4 @@
 {
     "install": "messages/install.md",
-    "4.0.0": "messages/recent.md"
+    "4.1.0": "messages/recent.md"
 }

messages/recent.md

@@ -1,4 +1,4 @@
-# ColorHelper 4.0.0
+# ColorHelper 4.1.0
 
 New release!
 
@@ -7,23 +7,14 @@ prior releases.
 
 Restart of Sublime Text may be required.
 
-## 4.0.0
+## 4.1.0
 
-> **BREAKING CHANGE**
-> If you have defined custom colors rules and specifically reference `xyz`  
-> rules should be updated to refer to `xyz` as `xyz-d65`.
-
-- **NEW**: Update to latest `coloraide` which provides minor bug fixes.  
-  As the new version now includes type annotations, ColorHelper now  
-  requires the `typing` dependency until it can be migrated to use Python  
-  3.8. Typing refactor did moderately affect custom color classes.
-- **NEW**: `xyz` is now known as `xyz-d65` in the settings file.  
-  If you have custom rules that override or add `xyz`, please update  
-  the rules to reference `xyz-d65` instead.
-- **NEW**: Gamut mapping now uses Oklch instead of CIE LCH per CSS recnet  
-  specifications changes to the CSS Level 4 specification.
-- **NEW**: Expose sRGB Linear color space per the CSS specification.
-- **FIX**: Fix `blend` and `blenda` regression in emulation of Sublime's  
-  ColorMod implementation.
-- **FIX**: ColorPicker should not show colors maps with opacity in the  
-  color map square.
+- **NEW**: Add minimal color support in Sublime's built-in GraphViz  
+  syntax files. Colors are currently limited to hex RGB/RGBA and color  
+  names outside of HTML and full CSS support inside HTML. Support is  
+  experimental, and if false positives are a problem, the rule can be  
+  disabled in the settings.
+- **NEW**: Don't default `tmtheme` custom class output to X11 names,  
+  default to hex codes instead.
+- **FIX**: Fix some additional custom class issues related to latest  
+  `coloraide` update.

support.py

@@ -5,7 +5,7 @@
 import webbrowser
 import re
 
-__version__ = "4.0.1"
+__version__ = "4.1.1"
 __pc_name__ = 'ColorHelper'
 
 CSS = '''