Fix SCSS/CSS/SASS/HTML Color targeting

Author: facelessuser

CHANGES.md

@@ -1,5 +1,12 @@
 # ColorHelper
 
+## 6.7.0
+
+-   **NEW**: Rework HTML, CSS, SCSS, SASS handling. As syntax packages
+    have evolved, rework rules to better target colors, combining
+    handling under one rule `HTML/CSS`.
+-   **NEW**: Move handling for old, CSS3 syntax to its own rule.
+
 ## 6.6.0
 
 -   **NEW**: Upgrade to ColorAide 7.0.

color_helper.sublime-settings

@@ -354,23 +354,45 @@
     //
     //.- `enable`:         This can be used to disable a color rule entirely. Defaults to `true`.
     "color_rules": [
+        {
+            "name": "CSS3",
+            "base_scopes": [
+                "source.css"
+            ],
+            "syntax_files": [
+                "CSS3/CSS3"
+            ],
+            "color_class": "css-level-4",
+            "scanning": [
+                // https://packagecontrol.io/packages/CSS3
+                "support.constant.color.w3c-color-name.css",
+                "support.function.color-adjuster-rgb.css",
+                "constant.other.color.rgb-value.css",
+                "support.function.color.css",
+                "support.function.rgba.css",
+                "support.function.hsla.css",
+                "support.function.hwb.css",
+                "support.function.lab.css",
+                "support.function.lch.css"
+            ]
+        },
         {
             "name": "HTML/CSS",
             "base_scopes": [
                 "source.css",
+                "source.sass",
+                "source.scss",
                 "text.html"
             ],
             "color_class": "css-level-4",
             "scanning": [
-                // https://packagecontrol.io/packages/CSS3
-                "meta.declaration-list.css -support.type.property-name.css -comment -string",
-                // CSS, CSS in HTML etc. (based on: Sublime Default)
-                "meta.property-value.css -comment -string",
-                // CSS3, CSS3 in HTML etc. (based on: https://packagecontrol.io/packages/CSS3)
-                "meta.value.css -comment -string",
-                // HTML attributes (based on: Sublime Default)
-                "meta.tag.inline.any.html string.quoted -constant.character.entity.html",
-                "meta.tag.any.html meta.attribute-with-value.style.html"
+                // Sublime default CSS nand HTML. Covers SCSS, POSTCSS, and most of SASS
+                "support.constant.color.w3c.standard.css",
+                "support.constant.color.w3c.extended.css",
+                "support.function.color.css",
+                "constant.other.color.rgb-value.css, constant.other.color.rgba-value.css",
+                // https://packagecontrol.io/packages/SASS
+                "support.function.custom.sass"
             ]
         },
         {
@@ -426,62 +448,6 @@
                 "meta.css.sublime-color-scheme meta.property-value.css -comment -string.quoted.single.css -string.quoted.double.css"
             ]
         },
-        {
-            // Sass (based on: https://packagecontrol.io/packages/Sass)
-            "name": "Sass",
-            "syntax_files": ["Sass/Syntaxes/Sass", "Sass/Syntaxes/SCSS"],
-            "base_scopes": [
-                "source.sass",
-                "source.scss"
-            ],
-            "color_class": "css-level-4",
-            "scanning": [
-                "source.sass meta.property-value.css -comment -string -variable.declaration.sass",
-                "source.scss meta.property-value.css -comment -string -variable.declaration.sass",
-                "source.scss meta.declaration.value.scss -comment -string -variable.declaration.sass"
-            ]
-        },
-        {
-            // SCSS (based on https://packagecontrol.io/packages/SCSS)
-            "name": "SCSS",
-            "syntax_files": ["SCSS/SCSS"],
-            "base_scopes": [
-                "source.scss"
-            ],
-            "color_class": "css-level-4",
-            "scanning": [
-                "source.scss -comment -string"
-            ]
-        },
-        {
-            // SCSS (based on https://packagecontrol.io/packages/Syntax%20Highlighting%20for%20Sass)
-            "name": "Syntax Highlighting for Sass",
-            "syntax_files": [
-                "Syntax Highlighting for Sass/Syntaxes/SCSS",
-                "Syntax Highlighting for Sass/Syntaxes/Sass"
-            ],
-            "base_scopes": [
-                "source.scss",
-                "source.sass"
-            ],
-            "color_class": "css-level-4",
-            "scanning": [
-                "source.scss -comment -string -support.type.property-name -variable.declaration",
-                "source.sass -comment -string -support.type.property-name -variable.declaration"
-            ]
-        },
-        {
-            // Sass (based on: https://packagecontrol.io/packages/Syntax%20Highlighting%20for%20PostCSS)
-            "name": "PostCSS",
-            "syntax_files": ["Syntax Highlighting for PostCSS/Syntaxes/PostCSS"],
-            "base_scopes": [
-                "source.postcss"
-            ],
-            "color_class": "css-level-4",
-            "scanning": [
-                "source.postcss meta.property-list.css.postcss -comment -string"
-            ]
-        },
         {
             "name": "tmTheme",
             "color_trigger": "(?i)(?:\\b(?<![-#&$])[\\w]{3,}(?![(-])\\b|(?!<&)\\#)",

messages.json

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

messages/recent.md

@@ -10,6 +10,9 @@ A restart of Sublime Text is **strongly** encouraged.
 Please report any issues as we _might_ have missed some required updates  
 related to the upgrade to stable `coloraide`.
 
-## 6.6.0
+## 6.7.0
 
--   **NEW**: Upgrade to ColorAide 7.0.
+-   **NEW**: Rework HTML, CSS, SCSS, SASS handling. As syntax packages  
+    have evolved, rework rules to better target colors, combining  
+    handling under one rule `HTML/CSS`.
+-   **NEW**: Move handling for old, CSS3 syntax to its own rule.

support.py

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