Remove restrictions on valid clamped numbers

ryboe · May 26, 2024 · a4e6487 · a4e6487
1 parent b0876df
commit a4e6487
Showing 1 changed file with 16 additions and 34 deletions.
diff --git a/CSS3.sublime-syntax b/CSS3.sublime-syntax
@@ -38,8 +38,6 @@ variables:
   number_non_neg: '\+?(?:\d+\.\d+|\.\d+|\d+)(?:{{exponent}})?'
   number_pos: '\+?(?:\d+\.\d*[1-9]\d*|\.\d*[1-9]\d*|[1-9]\d*)(?:{{exponent}})?'
   number_zero_to_100: '(?:\b100(?:\.0+)?|\b[1-9]\d(?:\.\d+)?|\b\d(?:\.\d+)?|\.\d+)'
-  number_zero_to_255: '\b(?:2[0-4]\d(?:\.0+)?|25[0-5](?:\.0+)?|1\d\d(?:\.\d+)?|[1-9]\d(?:\.\d+)?|\d(?:\.\d+)?)'
-  number_zero_to_one: '\+?(?:0(?:\.\d+)?|1(?:\.0+)?|\.\d+)\b(?!\.)'
   optional_min_max_prefix: '\b(?:min-|max-)?'
   optional_top_right_left_bottom: '(?:top-|right-|left-|bottom-)?'
   percentage_unit: '%'
@@ -89,8 +87,8 @@ contexts:
       scope: support.constant.property-value.css
 
   alpha-value:
-    - include: percentage-zero-to-100
-    - include: number-zero-to-one
+    - include: percentage
+    - include: number
 
   angle:
     - include: func-calc
@@ -2093,7 +2091,7 @@ contexts:
         - meta_scope: meta.function.cubic-bezier.css
         - include: end-func
         - include: func-var
-        - include: number-zero-to-one
+        - include: number
 
   func-device-cmyk:
     - match: \b(device-cmyk)(\()
@@ -2104,8 +2102,8 @@ contexts:
         - meta_scope: meta.function.device-cmyk.css
         - include: end-func
         - include: func-var
-        - include: percentage-zero-to-100
-        - include: number-zero-to-one
+        - include: percentage
+        - include: number
         - include: color
 
   # Additions to CSS Color 4
@@ -2272,7 +2270,7 @@ contexts:
           scope: support.constant.property-value.css
         - include: color
         - include: angle
-        - include: percentage-zero-to-100
+        - include: percentage
         - include: number  # matches part of <hue> and <alpha-value>
 
   func-hue:
@@ -2311,7 +2309,7 @@ contexts:
         - match: '\bfrom{{b}}'
           scope: support.constant.property-value.css
         - include: color
-        - include: percentage-zero-to-100
+        - include: percentage
         - include: angle
         - include: number  # matches part of <hue> and <alpha-value>
 
@@ -2387,7 +2385,7 @@ contexts:
         - match: '\bfrom{{b}}'
           scope: support.constant.property-value.css
         - include: color
-        - include: percentage-zero-to-100
+        - include: percentage
         - include: number  # matches part of <hue> and <alpha-value>
 
   # CSS Color Module Level 5
@@ -2403,7 +2401,7 @@ contexts:
         - match: '\bfrom{{b}}'
           scope: support.constant.property-value.css
         - include: color
-        - include: percentage-zero-to-100
+        - include: percentage
         - include: number  # matches part of <hue> and <alpha-value>
 
   func-leader:
@@ -3579,22 +3577,6 @@ contexts:
     - match: '{{number_pos}}'
       scope: constant.numeric.css
 
-  number-zero-to-one:
-    - include: func-calc
-    - include: func-min
-    - include: func-max
-    - include: func-clamp
-    - match: '{{number_zero_to_one}}'
-      scope: constant.numeric.css
-
-  number-zero-to-255:
-    - include: func-calc
-    - include: func-min
-    - include: func-max
-    - include: func-clamp
-    - match: '{{number_zero_to_255}}'
-      scope: constant.numeric.css
-
   numeric-figure-values:
     - match: '\b(?:oldstyle-nums|lining-nums){{b}}'
       scope: support.constant.property-value.css
@@ -6162,7 +6144,7 @@ contexts:
         - meta_content_scope: meta.property-value.fill-opacity.css
         - include: end-value
         - include: value-css-wide
-        - include: number-zero-to-one
+        - include: number
     - include: stray-paren-or-semicolon
 
   # CSS Fill and Stroke Module Level 3
@@ -8322,7 +8304,7 @@ contexts:
         - meta_content_scope: meta.property-value.opacity.css
         - include: end-value
         - include: value-css-wide
-        - include: number-zero-to-one
+        - include: number
     - include: stray-paren-or-semicolon
 
   # CSS Flexible Box Layout Module Level 1
@@ -9145,7 +9127,7 @@ contexts:
         - meta_content_scope: meta.property-value.shape-image-threshold.css
         - include: end-value
         - include: value-css-wide
-        - include: number-zero-to-one
+        - include: number
     - include: stray-paren-or-semicolon
 
   # CSS Round Display Level 1
@@ -9318,7 +9300,7 @@ contexts:
         - meta_content_scope: meta.property-value.stop-opacity.css
         - include: end-value
         - include: value-css-wide
-        - include: number-zero-to-one
+        - include: number
     - include: stray-paren-or-semicolon
 
   # string-set is defined in two specs:
@@ -9574,7 +9556,7 @@ contexts:
         - meta_content_scope: meta.property-value.stroke-opacity.css
         - include: end-value
         - include: value-css-wide
-        - include: number-zero-to-one
+        - include: number
     - include: stray-paren-or-semicolon
 
   # CSS Fill and Stroke Module Level 3
@@ -10895,8 +10877,8 @@ contexts:
   # Since <alpha-value> is used along with <rgb-component>, there's no point
   # creating a separate context.
   rgb-component:
-    - include: percentage-zero-to-100
-    - include: number-zero-to-255
+    - include: percentage
+    - include: number
 
   # A rule is a selector and a declaration list.
   # selector {