From 82e8a065d7aa3b70ae9b486b542ea85c414838b6 Mon Sep 17 00:00:00 2001
From: deathaxe <deathaxe82@googlemail.com>
Date: Sun, 10 Mar 2024 18:41:41 +0100
Subject: [PATCH] [CSS] Improve language constant interpolation support

This commit adds interpolation support to

a) unquoted font family names
b) langaage ranges
c) unquoted urls
---
 CSS/CSS.sublime-syntax  | 23 +++++++++++++++++++----
 CSS/syntax_test_css.css |  7 +++++++
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/CSS/CSS.sublime-syntax b/CSS/CSS.sublime-syntax
index 23510b258c..989abffaea 100644
--- a/CSS/CSS.sublime-syntax
+++ b/CSS/CSS.sublime-syntax
@@ -49,6 +49,10 @@ variables:
   illegal_custom_ident_tokens: |-
     (?xi: auto | default | inherit | initial | none | unset )
 
+  # Constants
+  lang_range_begin: (?={{ident_start}}|\*)
+  unquoted_url_begin: (?={{ident_start}}|/)
+
   # Types
   # https://www.w3.org/TR/css3-values/#numeric-types
   # https://www.w3.org/TR/css-syntax-3/#number-token-diagram
@@ -3215,13 +3219,24 @@ contexts:
   # Font Family Names
   # https://drafts.csswg.org/css-fonts-3/#family-name-value
   font-family-names:
-    - match: '{{ident}}(?:\s+{{ident}}(?!\())*'
-      scope: meta.string.css string.unquoted.css
+    - match: '{{ident_begin}}'
+      push: font-family-name-body
+
+  font-family-name-body:
+    - meta_include_prototype: false
+    - meta_scope: meta.string.css string.unquoted.css
+    # allow unquoted space separated font names
+    - match: (?!\s+{{ident_start}}){{break}}
+      pop: 1
+    # function call ahead, skip font name
+    - match: (?=\s+{{ident}}\()
+      pop: 1
+    - match: '{{unicode}}'
 
   # Language Ranges
   # https://drafts.csswg.org/selectors-4/#language-range
   language-ranges:
-    - match: (?={{nmstart}}|\*)
+    - match: '{{lang_range_begin}}'
       push: language-range-content
 
   language-range-content:
@@ -3350,7 +3365,7 @@ contexts:
   # Unquoted URL token
   # https://drafts.csswg.org/css-syntax-3/#consume-a-url-token
   unquoted-urls:
-    - match: (?=[[:alnum:]/])
+    - match: '{{unquoted_url_begin}}'
       push: unquoted-url-body
 
   unquoted-url-body:
diff --git a/CSS/syntax_test_css.css b/CSS/syntax_test_css.css
index b0afd360c0..d847e2c9f2 100644
--- a/CSS/syntax_test_css.css
+++ b/CSS/syntax_test_css.css
@@ -2967,6 +2967,13 @@
     font: sans serif;
 /*        ^^^^^^^^^^ meta.string.css string.unquoted.css */
 
+    font: san\73 -\73 erif;
+/*        ^^^^^^^^^^^^^^^^ meta.string.css string.unquoted.css */
+
+    font: sans serif var(--name);
+/*        ^^^^^^^^^^ meta.string.css string.unquoted.css */
+/*                   ^^^^^^^^^^^ meta.function-call */
+
     font: inherit;
 /*        ^^^^^^^ support - string */